- Nuiton-rss-commits - mailman.cloud.codelutin.com

[Lutinweb-commits] r13 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:59:01 +0000 (Thu, 24 Apr 2008) New Revision: 13 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java Log: permettre de configurer le prefix des clef de configuration. suppression des traitements des cas limites sur les param?\195?\168tres, ce n'est pas de la responsabilit?\195?\169 de la servlet Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-24 12:48:52 UTC (rev 12) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-24 12:59:01 UTC (rev 13) @@ -1,8 +1,9 @@ package org.codelutin.rss; import java.io.*; -import java.net.*; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.servlet.*; import javax.servlet.http.*; import org.apache.commons.beanutils.BeanUtils; @@ -38,9 +39,13 @@ private static final Log log = LogFactory.getLog(RSSServlet.class); /** + * la propriete de configuration qui definit le prefix a jouter pour scruter la configuration + */ + protected static final String CONFIGURATION_PREFIX_PROPERTY= RSSServlet.class.getSimpleName()+"_configuration_prefix"; + /** * L'objet permettant de recupérer la representation HTML d'un feed */ - protected RSSHelper rss; + protected transient RSSHelper rss; /** * Le code JavaScript a utilise dans les pages clientes */ @@ -57,14 +62,17 @@ " div.innerHTML = \"<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>\";\n" + " return;\n" + " }\n" + - " if (!nbItem) {\n" + - " nbItem = -1;\n" + - " }\n" + - " if (!feedRepr) {\n" + - " feedRepr = \"\";\n" + - " }\n" + - " var param = \"feedName=\" + escape(feedName) + \"&nbItem=\" + escape(nbItem) + \"&feedRepr=\" + escape(feedRepr);\n" + - " var url = serlvetUrl + \"?\" + param;\n" + + //" if (!nbItem) {\n" + + //" nbItem = null;\n" + + //" }\n" + + //" if (!feedRepr) {\n" + + //" feedRepr = \"\";\n" + + //" }\n" + + //" var param = \"feedName=\" + escape(feedName) + \"&nbItem=\" + escape(nbItem) + \"&feedRepr=\" + escape(feedRepr);\n" + + //" var url = serlvetUrl + \"?\" + param;\n" + + " var url = serlvetUrl + \"?feedName=\" + escape(feedName);"+ + " if (!!nbItem) {url += \"&nbItem=\" + escape(nbItem);}"+ + " if (!!feedRepr) {url += \"&feedRepr=\" + escape(feedRepr);}"+ " xhr.open(\"GET\", url, true);\n" + " xhr.onreadystatechange = function() {\n" + " if(xhr.readyState == 4) {\n" + @@ -73,38 +81,42 @@ " }\n" + " xhr.send(null);\n" + "}\n"; + private static final long serialVersionUID = 1L; + @Override public void init(ServletConfig config) throws ServletException { + init(config,true); + } + + public void init(ServletConfig config,boolean initRssConfig) throws ServletException { try { super.init(config); - loadConfig(config, "TIME_FORCE_RETRIEVED"); - loadConfig(config, "DEFAULT_RENDERER_CONFIG"); - loadConfig(config, "DEFAULT_NBITEM"); - loadConfig(config, "DEFAULT_RENDERER_CLASS"); - loadConfig(config, "DEFAULT_RESOLVER_CLASS"); - rss = new RSSHelper( - (FeedURLResolver) RSSConfig.DEFAULT_RESOLVER_CLASS.newInstance(), - (FeedRenderer) RSSConfig.DEFAULT_RENDERER_CLASS.newInstance()); + if (initRssConfig) { + + // init depuis la config de servlet + initRssConfig(config); + + // instanciate rss avec les implanatation par defaut + initDefaultRssHelper(); + } } catch (Exception eee) { log.warn("Can't configure Servlet", eee); + if (eee instanceof ServletException) { + throw (ServletException)eee; + } throw new ServletException("Can't configure Servlet", eee); } } - - protected void loadConfig(ServletConfig config, String configName) throws Exception { - String value = config.getInitParameter(configName); - if (value != null && !"".equals(value)) { - BeanUtils.setProperty(new RSSConfig(), configName, value); - } - } /** * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. * @param request servlet request * @param response servlet response + * @throws java.io.IOException TODO + * @throws ServletException TODO */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) + public void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String feedName = request.getParameter("feedName"); if (feedName == null || "".equals(feedName)) { @@ -121,22 +133,54 @@ response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); try { - String feedRepr = request.getParameter("feedRepr"); - if (null == feedRepr || "".equals(feedRepr)) { - feedRepr = "n-ndat"; - } - int nbItem = convertToInt(request.getParameter("nbItem")); - - out.println(rss.getHTML(feedName, feedRepr, nbItem)); - + String feedRepr = request.getParameter("feedRepr"); + Integer nbItem = convertToInt(request.getParameter("nbItem")); + out.println(getHTML(feedName, feedRepr, nbItem)); } finally { out.close(); } } } + + protected void initDefaultRssHelper() throws ServletException { + try { + rss = new RSSHelper(RSSConfig.DEFAULT_RESOLVER_CLASS.newInstance(), + RSSConfig.DEFAULT_RENDERER_CLASS.newInstance()); + } catch (Exception ex) { + log.warn("Can't configure rsshelper", ex); + throw new ServletException("Can't configure rsshelper", ex); + } + } + + protected void initRssConfig(ServletConfig config) throws Exception { + // recherche de la propriete RSSServlet_configuration_prefix + String prefixConfig = config.getInitParameter(CONFIGURATION_PREFIX_PROPERTY); + prefixConfig = prefixConfig==null?"":prefixConfig.trim(); + loadConfig(config, prefixConfig,"TIME_FORCE_RETRIEVED"); + loadConfig(config, prefixConfig,"DEFAULT_RENDERER_CONFIG"); + loadConfig(config, prefixConfig,"DEFAULT_NB_ITEM"); + loadConfig(config, prefixConfig,"DEFAULT_RENDERER_CLASS"); + loadConfig(config, prefixConfig,"DEFAULT_RESOLVER_CLASS"); + } - protected int convertToInt(String parameter) { - int result = -1; + protected void loadConfig(ServletConfig config,String prefix, String configName) throws Exception { + String value = config.getInitParameter(prefix+configName); + loadConfig(configName,value); + } + + protected void loadConfig(String configName,String value ) throws Exception { + if (value != null && !"".equals(value)) { + log.info("key: "+configName+", value:"+value); + BeanUtils.setProperty(new RSSConfig(), configName, value); + } + } + + protected String getHTML(String feedName,String feedRepr,Integer nbItems) { + return rss.getHTML(feedName, feedRepr, nbItems); + } + + protected Integer convertToInt(String parameter) { + Integer result = null; try { result = Integer.parseInt(parameter); } catch(Exception eee) {

1 0

[Lutinweb-commits] r12 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:48:52 +0000 (Thu, 24 Apr 2008) New Revision: 12 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java Log: ajout getter + unboxing Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-24 12:47:38 UTC (rev 11) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-24 12:48:52 UTC (rev 12) @@ -8,7 +8,6 @@ import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; import java.net.MalformedURLException; -import java.net.URL; import java.util.List; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; @@ -50,7 +49,15 @@ public void setRenderer(FeedRenderer renderer) { this.renderer = renderer; } - + + public FeedRenderer getRenderer() { + return renderer; + } + + public FeedURLResolver getResolver() { + return resolver; + } + /** * Permet de recuperer un certain nombre d'item du feed demande * @@ -61,27 +68,28 @@ */ public String getHTML(String feedName, String representation, Integer nbItem) { try { - FeedData feed = (FeedData) feeds.get(feedName); + FeedData feed = (FeedData) feeds.get(feedName); if (feed == null) { feed = resolver.resolv(feedName); feeds.put(feedName, feed); } - FeedRendererConfig c = null; + FeedRendererConfig c; if (representation != null) { c = new FeedRendererConfig(representation); } else { c = feed.getRendererConfig(); } - int nb = -1; + int nb; if (nbItem != null) { - nb = nbItem.intValue(); + nb = nbItem; } else { nb = feed.getNbItem(); } SyndFeed sf = feed.getFeed(); + //TODO Deal with NPE... if feed is null List syndEntries = sf.getEntries(); if (nb >= 0 && syndEntries.size() >= nb) { syndEntries = syndEntries.subList(syndEntries.size() - nb, syndEntries.size());

1 0

[Lutinweb-commits] r11 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:47:38 +0000 (Thu, 24 Apr 2008) New Revision: 11 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java Log: normalisation nom propri?\195?\169t?\195?\169 NB_ITEM et pas NBITEM + generic Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-04-24 12:47:17 UTC (rev 10) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-04-24 12:47:38 UTC (rev 11) @@ -9,10 +9,10 @@ /** Temps a partir duquel on reforce une recuperation */ public static long TIME_FORCE_RETRIEVED = 5 * 60 * 1000; public static FeedRendererConfig DEFAULT_RENDERER_CONFIG = new FeedRendererConfig("n-natd"); - public static int DEFAULT_NBITEM = -1; + public static int DEFAULT_NB_ITEM = -1; - public static Class DEFAULT_RENDERER_CLASS = FeedHTMLRenderer.class; - public static Class DEFAULT_RESOLVER_CLASS = SimpleFeedURLResolver.class; + public static Class<? extends FeedRenderer> DEFAULT_RENDERER_CLASS = FeedHTMLRenderer.class; + public static Class<? extends FeedURLResolver> DEFAULT_RESOLVER_CLASS = SimpleFeedURLResolver.class; public void setTIME_FORCE_RETRIEVED(long TIME_FORCE_RETRIEVED) { RSSConfig.TIME_FORCE_RETRIEVED = TIME_FORCE_RETRIEVED; @@ -23,14 +23,14 @@ } public void setDEFAULT_NBITEM(int DEFAULT_NBITEM) { - RSSConfig.DEFAULT_NBITEM = DEFAULT_NBITEM; + RSSConfig.DEFAULT_NB_ITEM = DEFAULT_NBITEM; } - public void setDEFAULT_RENDERER_CLASS(Class DEFAULT_RENDERER_CLASS) { + public void setDEFAULT_RENDERER_CLASS(Class<? extends FeedRenderer> DEFAULT_RENDERER_CLASS) { RSSConfig.DEFAULT_RENDERER_CLASS = DEFAULT_RENDERER_CLASS; } - public void setDEFAULT_RESOLVER_CLASS(Class DEFAULT_RESOLVER_CLASS) { + public void setDEFAULT_RESOLVER_CLASS(Class<? extends FeedURLResolver> DEFAULT_RESOLVER_CLASS) { RSSConfig.DEFAULT_RESOLVER_CLASS = DEFAULT_RESOLVER_CLASS; }

1 0

[Lutinweb-commits] r10 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:47:17 +0000 (Thu, 24 Apr 2008) New Revision: 10 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java Log: normalisation nom propri?\195?\169t?\195?\169 NB_ITEM et pas NBITEM Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java 2008-04-24 12:46:51 UTC (rev 9) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java 2008-04-24 12:47:17 UTC (rev 10) @@ -18,7 +18,7 @@ public FeedData resolv(String ask) throws MalformedURLException { URL url = new URL(ask); FeedData result = new FeedData(url); - result.setNbItem(RSSConfig.DEFAULT_NBITEM); + result.setNbItem(RSSConfig.DEFAULT_NB_ITEM); result.setRendererConfig(RSSConfig.DEFAULT_RENDERER_CONFIG); return result; }

1 0

[Lutinweb-commits] r9 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:46:51 +0000 (Thu, 24 Apr 2008) New Revision: 9 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java Log: attention le constructeur par defaut masquait le second constructeur... Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java 2008-04-24 12:45:38 UTC (rev 8) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java 2008-04-24 12:46:51 UTC (rev 9) @@ -70,18 +70,21 @@ itemProperties.put(Field.TIME, "publishedDate"); } + + public FeedHTMLRenderer() { + this(new HTMLCleaner[0]); + } + /** * Supprime tous les cleaners de code html - */ - public FeedHTMLRenderer() { + */ + public void clearCleaners() { + this.cleaners.clear(); } + /** * Ajoute un nouveau cleaner de code HTML */ - public void clearCleaners() { - this.cleaners.clear(); - } - public void addHTMLCleaner(HTMLCleaner cleaner) { cleaners.add(cleaner); }

1 0

[Lutinweb-commits] r8 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:45:38 +0000 (Thu, 24 Apr 2008) New Revision: 8 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedRendererConfig.java Log: utilisation m?\195?\169thode Field.valueOf Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedRendererConfig.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedRendererConfig.java 2008-04-24 12:45:10 UTC (rev 7) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedRendererConfig.java 2008-04-24 12:45:38 UTC (rev 8) @@ -44,7 +44,11 @@ protected List<Field> createList(String value) { List<Field> result = new ArrayList<Field>(); for (char c : value.toCharArray()) { - switch (c) { + Field field = Field.valueOf(c); + if (field!=null) { + result.add(field); + } + /*switch (c) { case 'n': result.add(Field.NAME); break; @@ -60,7 +64,7 @@ case 't': result.add(Field.TIME); break; - } + }*/ } return result; }

1 0

[Lutinweb-commits] r7 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:45:10 +0000 (Thu, 24 Apr 2008) New Revision: 7 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java Log: ajout d'une propri?\195?\169t?\195?\169 sur l'enumration (la repr?\195?\169sentation compacte) + ajout m?\195?\169thode de conversion valueOf ?\195?\160 partir d'un caract?\195?\168re de repr?\195?\169sentation Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java 2008-04-24 12:43:44 UTC (rev 6) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/Field.java 2008-04-24 12:45:10 UTC (rev 7) @@ -12,6 +12,34 @@ */ public enum Field { - NAME, IMAGE, DESCRIPTION, AUTHOR, TIME + NAME('n'), IMAGE('i'), DESCRIPTION('d'), AUTHOR('a'), TIME('t'); + + /** le caractere utilise pour la version compactee d'une configuration de renderer */ + private char c; + + Field(char c) { + this.c= c; + } + + public char getC() { + return c; + } + + public static Field valueOf(char c) { + for (Field field : values()) { + if (field.c==c){ + return field; + } + } + return null; + } + + public static Field[] getFeedFields() { + return new Field[]{NAME,IMAGE,DESCRIPTION,AUTHOR,TIME}; + } + + public static Field[] getItemFields() { + return new Field[]{NAME,DESCRIPTION,AUTHOR,TIME}; + } }

1 0

[Lutinweb-commits] r6 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:43:44 +0000 (Thu, 24 Apr 2008) New Revision: 6 Modified: trunk/lutinrss/pom.xml Log: ajout plugin de generation des sources + javadoc. ajout de plus de plugin de generation de jar (car pour la livraison lm il nous faut un jar, pas un war) Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-04-24 12:42:05 UTC (rev 5) +++ trunk/lutinrss/pom.xml 2008-04-24 12:43:44 UTC (rev 6) @@ -32,7 +32,7 @@ <version>1.0</version>  - <description>Servlet pouvant �tre appeler depuis du JS pour r�cup�rer un + <description>Servlet pouvant �tre appeler depuis du JS pour r�cup�rer un flux RSS</description> <inceptionYear>2008</inceptionYear> @@ -105,6 +105,41 @@ <target>1.5</target> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> @@ -122,12 +157,15 @@ <pluginRepositories> <pluginRepository> <id>codelutin-plugins</id> - <url> - http://lutinbuilder.labs.libre-entreprise.org/maven2 - </url> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> </pluginRepository> </pluginRepositories> </profile> </profiles> + <properties> + <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> + <netbeans.hint.useExternalMaven>true</netbeans.hint.useExternalMaven> + </properties> + </project>

1 0

[Lutinweb-commits] r5 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org 24 Apr '08

24 Apr '08

Author: tchemit Date: 2008-04-24 12:42:05 +0000 (Thu, 24 Apr 2008) New Revision: 5 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java Log: ajout constructeur pour ne pas ?\195?\160 avoir ?\195?\160 manipuler des FeedRendererConfig depuis l'ext?\195?\169rieur + javadoc Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-04-22 13:18:07 UTC (rev 4) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-04-24 12:42:05 UTC (rev 5) @@ -1,12 +1,10 @@ package org.codelutin.rss; -import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; import com.sun.syndication.io.SyndFeedInput; import com.sun.syndication.io.XmlReader; import java.net.URL; -import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,7 +37,13 @@ protected SyndFeed feed = null; protected long lastRetrived = 0; - + + public FeedData(URL url, int nbItem, String representation) { + this(url); + this.nbItem = nbItem; + this.rendererConfig = new FeedRendererConfig(representation); + } + public FeedData(URL url) { this.url = url; } @@ -67,7 +71,7 @@ /** * Retourne la representation HTML du RSS * - * @return + * @return la representation HTML du RSS */ public SyndFeed getFeed() { if (feed == null || lastRetrived + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) {

1 0

[Lutinweb-commits] r4 - in trunk/lutinrss: . src/main/java/org/codelutin/rss src/test/java/org/codelutin/rss
by bpoussin＠users.labs.libre-entreprise.org 22 Apr '08

22 Apr '08

Author: bpoussin Date: 2008-04-22 13:18:07 +0000 (Tue, 22 Apr 2008) New Revision: 4 Modified: trunk/lutinrss/ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java trunk/lutinrss/src/main/java/org/codelutin/rss/FeedURLResolver.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java trunk/lutinrss/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java Log: - ajout la possibilite de configurer la servlet dans le web.xml - choix des differentes class (renderer, resolver, ...) - le resolver permet maintenant de retourner un objet avec les configuration par defaut le nombre d'item et le renderer Property changes on: trunk/lutinrss ___________________________________________________________________ Name: svn:ignore + target Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-04-21 06:58:10 UTC (rev 3) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-04-22 13:18:07 UTC (rev 4) @@ -30,18 +30,43 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(FeedData.class); + /** url du feed */ protected URL url = null; + /** les champs que l'on souhaite visualiser pour le feed */ + protected FeedRendererConfig rendererConfig = null; + /** Le nombre d'item que l'on souhaite visualiser pour le feed */ + protected int nbItem = -1; + protected SyndFeed feed = null; protected long lastRetrived = 0; public FeedData(URL url) { this.url = url; } + + public URL getUrl() { + return url; + } + + public FeedRendererConfig getRendererConfig() { + return rendererConfig; + } + + public void setRendererConfig(FeedRendererConfig rendererConfig) { + this.rendererConfig = rendererConfig; + } + + public int getNbItem() { + return nbItem; + } + + public void setNbItem(int nbItem) { + this.nbItem = nbItem; + } /** * Retourne la representation HTML du RSS * - * @param nbItem le nombre d'item souhaite, si inferieur a 0, alors tous * @return */ public SyndFeed getFeed() { Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java 2008-04-21 06:58:10 UTC (rev 3) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java 2008-04-22 13:18:07 UTC (rev 4) @@ -31,7 +31,16 @@ protected EnumMap<Field, String> feedProperties = new EnumMap<Field, String>(Field.class); protected EnumMap<Field, String> itemProperties = new EnumMap<Field, String>(Field.class); + /** + * + * @param cleaners La liste des cleaners a utiliser par defaut. Si aucun + * cleaner n'est passer en argument HTMLScriptCleaner est automatiquement + * ajoute + */ public FeedHTMLRenderer(HTMLCleaner ... cleaners) { + if (cleaners.length == 0) { + addHTMLCleaner(new HTMLScriptCleaner()); + } for (HTMLCleaner cleaner : cleaners) { addHTMLCleaner(cleaner); } @@ -60,7 +69,19 @@ itemProperties.put(Field.AUTHOR, "author"); itemProperties.put(Field.TIME, "publishedDate"); } - + + /** + * Supprime tous les cleaners de code html + */ + public FeedHTMLRenderer() { + } + /** + * Ajoute un nouveau cleaner de code HTML + */ + public void clearCleaners() { + this.cleaners.clear(); + } + public void addHTMLCleaner(HTMLCleaner cleaner) { cleaners.add(cleaner); } Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedURLResolver.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedURLResolver.java 2008-04-21 06:58:10 UTC (rev 3) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedURLResolver.java 2008-04-22 13:18:07 UTC (rev 4) @@ -17,5 +17,5 @@ */ public interface FeedURLResolver { - public URL resolv(String ask) throws MalformedURLException; + public FeedData resolv(String ask) throws MalformedURLException; } Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-04-21 06:58:10 UTC (rev 3) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-04-22 13:18:07 UTC (rev 4) @@ -7,5 +7,31 @@ public class RSSConfig { /** Temps a partir duquel on reforce une recuperation */ - public static long TIME_FORCE_RETRIEVED = 1000; // 5 * 60 * 1000; + public static long TIME_FORCE_RETRIEVED = 5 * 60 * 1000; + public static FeedRendererConfig DEFAULT_RENDERER_CONFIG = new FeedRendererConfig("n-natd"); + public static int DEFAULT_NBITEM = -1; + + public static Class DEFAULT_RENDERER_CLASS = FeedHTMLRenderer.class; + public static Class DEFAULT_RESOLVER_CLASS = SimpleFeedURLResolver.class; + + public void setTIME_FORCE_RETRIEVED(long TIME_FORCE_RETRIEVED) { + RSSConfig.TIME_FORCE_RETRIEVED = TIME_FORCE_RETRIEVED; + } + + public void setDEFAULT_RENDERER_CONFIG(String DEFAULT_RENDERER_CONFIG) { + RSSConfig.DEFAULT_RENDERER_CONFIG = new FeedRendererConfig(DEFAULT_RENDERER_CONFIG); + } + + public void setDEFAULT_NBITEM(int DEFAULT_NBITEM) { + RSSConfig.DEFAULT_NBITEM = DEFAULT_NBITEM; + } + + public void setDEFAULT_RENDERER_CLASS(Class DEFAULT_RENDERER_CLASS) { + RSSConfig.DEFAULT_RENDERER_CLASS = DEFAULT_RENDERER_CLASS; + } + + public void setDEFAULT_RESOLVER_CLASS(Class DEFAULT_RESOLVER_CLASS) { + RSSConfig.DEFAULT_RESOLVER_CLASS = DEFAULT_RESOLVER_CLASS; + } + } Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-21 06:58:10 UTC (rev 3) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-22 13:18:07 UTC (rev 4) @@ -59,24 +59,35 @@ * @param nbItem le nombre d'item du feed souhaite * @return le code html representant le feed */ - public String getHTML(String feedName, String representation, int nbItem) { + public String getHTML(String feedName, String representation, Integer nbItem) { try { FeedData feed = (FeedData) feeds.get(feedName); if (feed == null) { - URL url = resolver.resolv(feedName); - feed = new FeedData(url); + feed = resolver.resolv(feedName); feeds.put(feedName, feed); } - + + FeedRendererConfig c = null; + if (representation != null) { + c = new FeedRendererConfig(representation); + } else { + c = feed.getRendererConfig(); + } + + int nb = -1; + if (nbItem != null) { + nb = nbItem.intValue(); + } else { + nb = feed.getNbItem(); + } + SyndFeed sf = feed.getFeed(); List syndEntries = sf.getEntries(); - if (nbItem >= 0 && syndEntries.size() >= nbItem) { - syndEntries = syndEntries.subList(syndEntries.size() - nbItem, syndEntries.size()); + if (nb >= 0 && syndEntries.size() >= nb) { + syndEntries = syndEntries.subList(syndEntries.size() - nb, syndEntries.size()); } SyndEntry [] items = (SyndEntry[])syndEntries.toArray(new SyndEntry[syndEntries.size()]); - FeedRendererConfig c = new FeedRendererConfig(representation); - String result = renderer.render(c, sf, items); return result; } catch (MalformedURLException eee) { Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-21 06:58:10 UTC (rev 3) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-22 13:18:07 UTC (rev 4) @@ -5,6 +5,7 @@ import javax.servlet.*; import javax.servlet.http.*; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -75,10 +76,29 @@ @Override public void init(ServletConfig config) throws ServletException { - super.init(config); - rss = new RSSHelper(); + try { + super.init(config); + loadConfig(config, "TIME_FORCE_RETRIEVED"); + loadConfig(config, "DEFAULT_RENDERER_CONFIG"); + loadConfig(config, "DEFAULT_NBITEM"); + loadConfig(config, "DEFAULT_RENDERER_CLASS"); + loadConfig(config, "DEFAULT_RESOLVER_CLASS"); + rss = new RSSHelper( + (FeedURLResolver) RSSConfig.DEFAULT_RESOLVER_CLASS.newInstance(), + (FeedRenderer) RSSConfig.DEFAULT_RENDERER_CLASS.newInstance()); + } catch (Exception eee) { + log.warn("Can't configure Servlet", eee); + throw new ServletException("Can't configure Servlet", eee); + } } + protected void loadConfig(ServletConfig config, String configName) throws Exception { + String value = config.getInitParameter(configName); + if (value != null && !"".equals(value)) { + BeanUtils.setProperty(new RSSConfig(), configName, value); + } + } + /** * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. * @param request servlet request Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java 2008-04-21 06:58:10 UTC (rev 3) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java 2008-04-22 13:18:07 UTC (rev 4) @@ -9,13 +9,17 @@ import java.net.URL; /** - * + * Par defaut retourne un FeedData ou la chaine passer est convertie en URL, + * le nombre d'item est positionne a -1 et le renderer a n-natd * @author poussin */ public class SimpleFeedURLResolver implements FeedURLResolver { - public URL resolv(String ask) throws MalformedURLException { - URL result = new URL(ask); + public FeedData resolv(String ask) throws MalformedURLException { + URL url = new URL(ask); + FeedData result = new FeedData(url); + result.setNbItem(RSSConfig.DEFAULT_NBITEM); + result.setRendererConfig(RSSConfig.DEFAULT_RENDERER_CONFIG); return result; } Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java 2008-04-21 06:58:10 UTC (rev 3) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java 2008-04-22 13:18:07 UTC (rev 4) @@ -21,6 +21,13 @@ } public void testBeanUtils() throws Exception { +// RSSConfig.class.getField("TIME_FORCE_RETRIEVED").set(null, 10); + System.out.println("TIME:" + RSSConfig.TIME_FORCE_RETRIEVED); + System.out.println("RENDER:" + RSSConfig.DEFAULT_RENDERER_CLASS); + BeanUtils.setProperty(new RSSConfig(), "TIME_FORCE_RETRIEVED", "10"); + BeanUtils.setProperty(new RSSConfig(), "DEFAULT_RENDERER_CLASS", FeedRenderer.class.getName()); + System.out.println("TIME:" + RSSConfig.TIME_FORCE_RETRIEVED); + System.out.println("RENDER:" + RSSConfig.DEFAULT_RENDERER_CLASS); assertEquals("java.lang.String", BeanUtils.getProperty("Object", "class.name")); }

1 0