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

[Lutinweb-commits] r23 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org April 25, 2008

April 25, 2008

Author: tchemit Date: 2008-04-25 20:35:56 +0000 (Fri, 25 Apr 2008) New Revision: 23 Modified: trunk/lutinrss/ Log: svn ignore Property changes on: trunk/lutinrss ___________________________________________________________________ Name: svn:ignore - target profiles.xml nbactions.xml + target target/* profiles.xml nbactions.xml

1 0

[Lutinweb-commits] r22 - trunk/lutinrss/src/main/java/org/codelutin/rss
by bpoussin＠users.labs.libre-entreprise.org April 25, 2008

April 25, 2008

Author: bpoussin Date: 2008-04-25 11:51:33 +0000 (Fri, 25 Apr 2008) New Revision: 22 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java Log: - ajout du forceReload Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-04-25 11:49:51 UTC (rev 21) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-04-25 11:51:33 UTC (rev 22) @@ -48,6 +48,10 @@ this.url = url; } + public long getLastRetrived() { + return lastRetrived; + } + public URL getUrl() { return url; } Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-25 11:49:51 UTC (rev 21) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-25 11:51:33 UTC (rev 22) @@ -43,7 +43,7 @@ * Le code JavaScript a utilise dans les pages clientes */ protected String js = - "function rssinclude(feedName, iddiv, nbItem, feedRepr) {\n" + + "function rssinclude(feedName, iddiv, nbItem, feedRepr, forceReload) {\n" + " var serlvetUrl = \"%1$s\";\n" + " var div = document.getElementById(iddiv);\n" + " var xhr = null;\n" + @@ -66,6 +66,11 @@ " var url = serlvetUrl + \"?feedName=\" + escape(feedName);"+ " if (!!nbItem) {url += \"&nbItem=\" + escape(nbItem);}"+ " if (!!feedRepr) {url += \"&feedRepr=\" + escape(feedRepr);}"+ + " if (forceReload) {\n" + + " forceReload = \"true\";\n" + + " } else {\n" + + " forceReload = \"false\";\n" + + " }\n" + " xhr.open(\"GET\", url, true);\n" + " xhr.onreadystatechange = function() {\n" + " if(xhr.readyState == 4) {\n" + @@ -132,9 +137,8 @@ try { String feedRepr = request.getParameter("feedRepr"); Integer nbItem = convertToInt(request.getParameter("nbItem")); - String t = request.getParameter("resolv"); - Boolean resolv = t!=null && "true".equals(t); - out.println(rss.getHTML(feedName, feedRepr, nbItem,resolv)); + boolean forceReload = "true".equalsIgnoreCase(request.getParameter("forceReload")); + out.println(rss.getHTML(feedName, feedRepr, nbItem, resolv)); } finally { out.close(); }

1 0

[Lutinweb-commits] r21 - trunk/lutinrss/src/main/java/org/codelutin/rss
by bpoussin＠users.labs.libre-entreprise.org April 25, 2008

April 25, 2008

Author: bpoussin Date: 2008-04-25 11:49:51 +0000 (Fri, 25 Apr 2008) New Revision: 21 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java Log: - ajout forceReload - ajout appel du resolv lors du timeout Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-25 07:33:18 UTC (rev 20) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-25 11:49:51 UTC (rev 21) @@ -84,10 +84,10 @@ * @param forceResolv un flag pour forcer la resolution * @return le code html representant le feed */ - public String getHTML(String feedName, String representation, Integer nbItem,boolean forceResolv) { + public String getHTML(String feedName, String representation, Integer nbItem, boolean forceReload) { try { - FeedData feed = (FeedData) feeds.get(feedName); - if (feed == null || forceResolv) { + FeedData feed = (FeedData) feeds.get(feedName); + if (forceReload || feed == null || feed.getLastRetrived() + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) { feed = resolver.resolv(feedName); if (feed==null) { log.warn("could not find feed for "+feedName);

1 0

[Lutinweb-commits] r20 - in trunk/lutinrss: . src/main/webapp src/test/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org April 25, 2008

April 25, 2008

Author: tchemit Date: 2008-04-25 07:33:18 +0000 (Fri, 25 Apr 2008) New Revision: 20 Modified: trunk/lutinrss/ trunk/lutinrss/src/main/webapp/ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java Log: utilisation RSSConfigInitializer + introduction parametre resolv pour forcer la resolution Property changes on: trunk/lutinrss ___________________________________________________________________ Name: svn:ignore - target + target profiles.xml nbactions.xml Property changes on: trunk/lutinrss/src/main/webapp ___________________________________________________________________ Name: svn:ignore + META-INF Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java 2008-04-25 07:32:20 UTC (rev 19) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java 2008-04-25 07:33:18 UTC (rev 20) @@ -71,16 +71,16 @@ int nbItem = -1; RSSHelper instance = new RSSHelper(); String expResult = ""; - String result = instance.getHTML(feedName, feedRepr, nbItem); + String result = instance.getHTML(feedName, feedRepr, nbItem,false); System.out.println("***" + result); - result = instance.getHTML(feedName, feedRepr, nbItem); + result = instance.getHTML(feedName, feedRepr, nbItem,false); System.out.println("***" + result); Thread.sleep(2000); - result = instance.getHTML(feedName, feedRepr, nbItem); + result = instance.getHTML(feedName, feedRepr, nbItem,false); System.out.println("***" + result); - result = instance.getHTML(feedName, feedRepr, nbItem); + result = instance.getHTML(feedName, feedRepr, nbItem,false); System.out.println("***" + result); // assertEquals(expResult, result); // TODO review the generated test code and remove the default call to fail.

1 0

[Lutinweb-commits] r19 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org April 25, 2008

April 25, 2008

Author: tchemit Date: 2008-04-25 07:32:20 +0000 (Fri, 25 Apr 2008) New Revision: 19 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java Log: utilisation RSSConfigInitializer + introduction parametre resolv pour forcer la resolution Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-25 07:31:11 UTC (rev 18) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-04-25 07:32:20 UTC (rev 19) @@ -2,11 +2,8 @@ import java.io.*; -import java.util.logging.Level; -import java.util.logging.Logger; 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; @@ -39,10 +36,6 @@ 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 transient RSSHelper rss; @@ -92,13 +85,17 @@ public void init(ServletConfig config,boolean initRssConfig) throws ServletException { try { super.init(config); - if (initRssConfig) { - + if (initRssConfig) { // init depuis la config de servlet - initRssConfig(config); + new RSSConfig.RSSConfigInitializer<ServletConfig>() { + @Override + protected String getConfigValue(ServletConfig config, String fullConfigName) { + return config.getInitParameter(fullConfigName); + } + }.init(config); // instanciate rss avec les implanatation par defaut - initDefaultRssHelper(); + rss = RSSHelper.newDefaultInstance(); } } catch (Exception eee) { log.warn("Can't configure Servlet", eee); @@ -134,51 +131,16 @@ PrintWriter out = response.getWriter(); try { String feedRepr = request.getParameter("feedRepr"); - Integer nbItem = convertToInt(request.getParameter("nbItem")); - out.println(getHTML(feedName, feedRepr, nbItem)); + Integer nbItem = convertToInt(request.getParameter("nbItem")); + String t = request.getParameter("resolv"); + Boolean resolv = t!=null && "true".equals(t); + out.println(rss.getHTML(feedName, feedRepr, nbItem,resolv)); } 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 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 {

1 0

[Lutinweb-commits] r18 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org April 25, 2008

April 25, 2008

Author: tchemit Date: 2008-04-25 07:31:11 +0000 (Fri, 25 Apr 2008) New Revision: 18 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java Log: ajout de la class RSSConfigInitializer qui permet d'initialiser RSSConfig de mani?\195?\168re dynamique Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-04-25 07:30:28 UTC (rev 17) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-04-25 07:31:11 UTC (rev 18) @@ -1,17 +1,27 @@ package org.codelutin.rss; +import org.apache.commons.beanutils.BeanUtils; + /** * * @author poussin */ public class RSSConfig { + /** + * 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"; + /** 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_NB_ITEM = -1; + public static int DEFAULT_NB_ITEM = 7; + 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) { @@ -34,4 +44,44 @@ RSSConfig.DEFAULT_RESOLVER_CLASS = DEFAULT_RESOLVER_CLASS; } + /** + * + * @param T la classe sources de la configuration + */ + public static abstract class RSSConfigInitializer<T> { + + /** + * + * @param config l'object source contenant les configs + * @param fullConfigName le nom complet de la propriete recherchee + * @return la valeur de la propriete ou null si non trouve + */ + protected abstract String getConfigValue(T config, String fullConfigName); + + /** + * Initialise RSSConfig. + * @param config l'object de configuration + */ + public void init(T config) { + String prefixConfig = getConfigValue(config, CONFIGURATION_PREFIX_PROPERTY); + prefixConfig = prefixConfig == null ? "" : prefixConfig.trim(); + RSSConfig instance = new RSSConfig(); + loadConfig(config, instance, prefixConfig, "TIME_FORCE_RETRIEVED"); + loadConfig(config, instance, prefixConfig, "DEFAULT_RENDERER_CONFIG"); + loadConfig(config, instance, prefixConfig, "DEFAULT_NB_ITEM"); + loadConfig(config, instance, prefixConfig, "DEFAULT_RENDERER_CLASS"); + loadConfig(config, instance, prefixConfig, "DEFAULT_RESOLVER_CLASS"); + } + + protected void loadConfig(T config, RSSConfig instance, String prefix, String configName) { + String value = getConfigValue(config, prefix + configName); + if (value != null && !"".equals(value)) { + try { + BeanUtils.setProperty(instance, configName, value); + } catch (Exception ex) { + throw new IllegalStateException("could not load property " + configName + " from config " + config + " for reason : " + ex.getMessage()); + } + } + } + } }

1 0

[Lutinweb-commits] r17 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org April 25, 2008

April 25, 2008

Author: tchemit Date: 2008-04-25 07:30:28 +0000 (Fri, 25 Apr 2008) New Revision: 17 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java Log: ajout methode newDefaultInstance pour obtenir une nouvelle instance de RssHelper avec les implanations trouvees dans RSSConfig Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-24 13:06:57 UTC (rev 16) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSHelper.java 2008-04-25 07:30:28 UTC (rev 17) @@ -21,6 +21,19 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(RSSHelper.class); + + /** + * + * @return une nouvelle instance de RssHelper en utilisant les implantations + * definies dans RSSConfig. + * @throws java.lang.Exception pour tout pb lors de l'instanciation des objects + */ + public static RSSHelper newDefaultInstance() throws Exception { + FeedURLResolver r = RSSConfig.DEFAULT_RESOLVER_CLASS.newInstance(); + FeedRenderer rr = RSSConfig.DEFAULT_RENDERER_CLASS.newInstance(); + RSSHelper helper = new RSSHelper(r,rr); + return helper; + } /** La classe permettant de resoudre les urls */ protected FeedURLResolver resolver = null; @@ -57,20 +70,29 @@ public FeedURLResolver getResolver() { return resolver; } - + + public void removeFeed(String feedName) { + feeds.remove(feedName); + } + /** * Permet de recuperer un certain nombre d'item du feed demande * * @param feedName nom du feed souhaite, l'url sera resolu avec le FeedURLResolver * @param representation indique les champs en sortie souhaites (ex: n-nt) * @param nbItem le nombre d'item du feed souhaite + * @param forceResolv un flag pour forcer la resolution * @return le code html representant le feed */ - public String getHTML(String feedName, String representation, Integer nbItem) { + public String getHTML(String feedName, String representation, Integer nbItem,boolean forceResolv) { try { FeedData feed = (FeedData) feeds.get(feedName); - if (feed == null) { + if (feed == null || forceResolv) { feed = resolver.resolv(feedName); + if (feed==null) { + log.warn("could not find feed for "+feedName); + return "<span class='feed-error'>No feed found for " + feedName + "</span>"; + } feeds.put(feedName, feed); }

1 0

[Lutinweb-commits] r16 - trunk/lutinrss/src/main/webapp
by tchemit＠users.labs.libre-entreprise.org April 24, 2008

April 24, 2008

Author: tchemit Date: 2008-04-24 13:06:57 +0000 (Thu, 24 Apr 2008) New Revision: 16 Modified: trunk/lutinrss/src/main/webapp/test.html Log: empty tag + title Modified: trunk/lutinrss/src/main/webapp/test.html =================================================================== --- trunk/lutinrss/src/main/webapp/test.html 2008-04-24 13:06:13 UTC (rev 15) +++ trunk/lutinrss/src/main/webapp/test.html 2008-04-24 13:06:57 UTC (rev 16) @@ -6,7 +6,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title></title> + <title>Page de test rss</title> <style type="text/css"> div {border: solid black;} </style> @@ -15,12 +15,12 @@ </head> <body> <h1>Test RSS</h1> - <div id="lmi"></div> - <div id="lemonde"></div> - <div id="developpez"></div> - <div id="formatouvert"></div> - <div id="h2"></div> - <div id="opensi"></div> + <div id="lmi"/> + <div id="lemonde"/> + <div id="developpez"/> + <div id="formatouvert"/> + <div id="h2"/> + <div id="opensi"/> <script> rssinclude("http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml", "lmi", 5, "indat-natd");

1 0

[Lutinweb-commits] r15 - trunk/lutinrss
by tchemit＠users.labs.libre-entreprise.org April 24, 2008

April 24, 2008

Author: tchemit Date: 2008-04-24 13:06:13 +0000 (Thu, 24 Apr 2008) New Revision: 15 Modified: trunk/lutinrss/pom.xml Log: ajout du repository dans le pom pour permettre le deployement sans avoir le repo dans son settings... Modified: trunk/lutinrss/pom.xml =================================================================== --- trunk/lutinrss/pom.xml 2008-04-24 12:59:55 UTC (rev 14) +++ trunk/lutinrss/pom.xml 2008-04-24 13:06:13 UTC (rev 15) @@ -18,6 +18,11 @@ <id>labs</id> <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/</url> </site> + <repository> + <id>labs</id> + <url>scp://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> + </repository> + </distributionManagement>  @@ -154,12 +159,12 @@ <maven.compile.source>1.5</maven.compile.source> <maven.compile.target>1.5</maven.compile.target> </properties> - <pluginRepositories> +  </profile> </profiles>

1 0

[Lutinweb-commits] r14 - trunk/lutinrss/src/test/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org April 24, 2008

April 24, 2008

Author: tchemit Date: 2008-04-24 12:59:55 +0000 (Thu, 24 Apr 2008) New Revision: 14 Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java Log: suppression test qui ne fonctionne pas pourle moment Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java 2008-04-24 12:59:01 UTC (rev 13) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSTest.java 2008-04-24 12:59:55 UTC (rev 14) @@ -61,8 +61,10 @@ /** * Test of getHTML method, of class RSSHelper. + * TODO do the test, for the moment, do not launch it... + * @throws Exception if any pb */ - public void testGetHTML() throws Exception { + public void _testGetHTML() throws Exception { System.out.println("getHTML"); String feedName = "http://localhost/rss/rss_1.0.xml"; String feedRepr = "n-ndat";

1 0