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

r159 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:46:12 +0100 (Mon, 02 Nov 2009) New Revision: 159 Modified: trunk/pom.xml Log: use mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:44:08 UTC (rev 158) +++ trunk/pom.xml 2009-11-02 03:46:12 UTC (rev 159) @@ -1,6 +1,6 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion>  @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>nuiton-rss</artifactId> @@ -112,7 +112,7 @@ <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> -  +  <webappDirectory>target/lutinrss</webappDirectory> </configuration> </plugin> @@ -193,5 +193,5 @@ </build> </profile> </profiles> - + </project>

1 0

r158 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:44:08 +0100 (Mon, 02 Nov 2009) New Revision: 158 Modified: trunk/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - lutinrss.iws target profiles.xml lutinrss.ipr target/* nbactions.xml + *.iws target profiles.xml *.ipr *.iml target/* nbactions.xml

1 0

r157 - trunk/src/main/java/org/nuiton/rss
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:33:09 +0100 (Mon, 02 Nov 2009) New Revision: 157 Modified: trunk/src/main/java/org/nuiton/rss/RSSHelper.java Log: reformat + improve code Modified: trunk/src/main/java/org/nuiton/rss/RSSHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/rss/RSSHelper.java 2009-10-11 11:27:51 UTC (rev 156) +++ trunk/src/main/java/org/nuiton/rss/RSSHelper.java 2009-11-02 03:33:09 UTC (rev 157) @@ -20,54 +20,57 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ - package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; -import java.net.MalformedURLException; -import java.util.List; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.net.MalformedURLException; +import java.util.List; + /** - * * @author poussin */ public class RSSHelper { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ static final Log log = LogFactory.getLog(RSSHelper.class); /** - * * @return une nouvelle instance de RssHelper en utilisant les implantations - * definies dans RSSConfig. + * 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); + FeedRenderer rr = RSSConfig.DEFAULT_RENDERER_CLASS.newInstance(); + RSSHelper helper = new RSSHelper(r, rr); return helper; } - - /** La classe permettant de resoudre les urls */ + + /** + * La classe permettant de resoudre les urls + */ protected FeedURLResolver resolver = null; - /** on utilise des soft reference pour eviter de trop utiliser la memoire - key: String, value: FeedData */ + /** + * on utilise des soft reference pour eviter de trop utiliser la memoire + * key: String, value: FeedData + */ protected ReferenceMap feeds = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); - protected FeedRenderer renderer = null; - + /** * Utilise un SimpleFeedURLResolver comme resolver de feed */ public RSSHelper() { this(new SimpleFeedURLResolver(), new FeedHTMLRenderer(new HTMLScriptCleaner())); } - + public RSSHelper(FeedURLResolver resolver, FeedRenderer renderer) { this.resolver = resolver; this.renderer = renderer; @@ -88,18 +91,18 @@ public FeedURLResolver getResolver() { return resolver; } - - public void removeFeed(String feedName) { + + 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 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 forceReload un flag pour forcer la relecture du feed + * @param nbItem le nombre d'item du feed souhaite + * @param forceReload un flag pour forcer la relecture du feed * @return le code html representant le feed */ public String getHTML(String feedName, String representation, Integer nbItem, boolean forceReload) { @@ -107,8 +110,8 @@ 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); + 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); @@ -120,22 +123,22 @@ } else { c = feed.getRendererConfig(); } - + int nb; if (nbItem != null) { nb = nbItem; } else { nb = feed.getNbItem(); } - + SyndFeed sf = feed.getFeed(); //TODO Deal with NPE... if feed is null - List syndEntries = sf.getEntries(); + List<?> syndEntries = sf.getEntries(); if (nb >= 0 && syndEntries.size() >= nb) { syndEntries = syndEntries.subList(syndEntries.size() - nb, syndEntries.size()); } - SyndEntry [] items = (SyndEntry[])syndEntries.toArray(new SyndEntry[syndEntries.size()]); - + SyndEntry[] items = syndEntries.toArray(new SyndEntry[syndEntries.size()]); + String result = renderer.render(c, sf, items); return result; } catch (MalformedURLException eee) {

1 0

r156 - trunk
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 13:27:51 +0200 (Sun, 11 Oct 2009) New Revision: 156 Modified: trunk/pom.xml Log: - use jrst.Version - use redmine.releaseFiles to collect files to send to redmine - bump junit, i18n and processor versions Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 16:51:20 UTC (rev 155) +++ trunk/pom.xml 2009-10-11 11:27:51 UTC (rev 156) @@ -51,7 +51,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency>

1 0

r155 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 18:51:20 +0200 (Sat, 10 Oct 2009) New Revision: 155 Modified: trunk/pom.xml Log: utilisation de mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-28 07:56:37 UTC (rev 154) +++ trunk/pom.xml 2009-10-10 16:51:20 UTC (rev 155) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.0</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId>

1 0

r154 - trunk/src/site
by echatellier＠users.nuiton.org 28 Aug '09

28 Aug '09

Author: echatellier Date: 2009-08-28 09:56:37 +0200 (Fri, 28 Aug 2009) New Revision: 154 Modified: trunk/src/site/site.xml Log: Fix site Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-28 07:56:08 UTC (rev 153) +++ trunk/src/site/site.xml 2009-08-28 07:56:37 UTC (rev 154) @@ -8,7 +8,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> </poweredBy>

1 0

r153 - trunk/src/site
by echatellier＠users.nuiton.org 28 Aug '09

28 Aug '09

Author: echatellier Date: 2009-08-28 09:56:08 +0200 (Fri, 28 Aug 2009) New Revision: 153 Modified: trunk/src/site/site.xml Log: Fix site Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-08-23 16:29:51 UTC (rev 152) +++ trunk/src/site/site.xml 2009-08-28 07:56:08 UTC (rev 153) @@ -8,7 +8,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://maven-site.nuiton.org" name="JRst" img="images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> </poweredBy> @@ -29,10 +29,6 @@ name="Javadoc (jar)"/> <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" name="Sources (jar)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-deps.zip" - name="Bundle sans sources (zip)"/> - <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-full.zip" - name="Bundle complêt (zip)"/> </menu> <menu name="Developpeur">

1 0

r152 - trunk
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 18:29:51 +0200 (Sun, 23 Aug 2009) New Revision: 152 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-23 16:29:48 UTC (rev 151) +++ trunk/pom.xml 2009-08-23 16:29:51 UTC (rev 152) @@ -13,7 +13,7 @@ </parent> <artifactId>nuiton-rss</artifactId> - <version>2.4.0</version> + <version>2.4.1-SNAPSHOT</version> <dependencies> @@ -150,9 +150,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-rss/tags/nuiton-rss-2.4.0</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-rss/tags/nuiton-rss-2.4.0</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-rss/tags/nuiton-rss-2.4.0</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-rss/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-rss/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-rss/trunk</url> </scm> <profiles>

1 0

r151 - in tags: . nuiton-rss-2.4.0
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 18:29:48 +0200 (Sun, 23 Aug 2009) New Revision: 151 Added: tags/nuiton-rss-2.4.0/ Log: [maven-scm] copy for tag nuiton-rss-2.4.0 Property changes on: tags/nuiton-rss-2.4.0 ___________________________________________________________________ Added: svn:ignore + lutinrss.iws target profiles.xml lutinrss.ipr target/* nbactions.xml Added: svn:mergeinfo +

1 0

r150 - trunk
by tchemit＠users.nuiton.org 23 Aug '09

23 Aug '09

Author: tchemit Date: 2009-08-23 18:29:40 +0200 (Sun, 23 Aug 2009) New Revision: 150 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release nuiton-rss-2.4.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-08-23 16:25:47 UTC (rev 149) +++ trunk/pom.xml 2009-08-23 16:29:40 UTC (rev 150) @@ -13,7 +13,7 @@ </parent> <artifactId>nuiton-rss</artifactId> - <version>2.4.0-rc-2-SNAPSHOT</version> + <version>2.4.0</version> <dependencies> @@ -150,9 +150,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-rss/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-rss/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-rss/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-rss/tags/nuiton-rss-2.4.0</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-rss/tags/nuiton-rss-2.4.0</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-rss/tags/nuiton-rss-2.4.0</url> </scm> <profiles>

1 0