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

r172 - in branches/2.3.8-reverse: . src/main/java/org/codelutin/rss
by echatellier＠users.nuiton.org 30 Nov '09

30 Nov '09

Author: echatellier Date: 2009-11-30 12:27:43 +0100 (Mon, 30 Nov 2009) New Revision: 172 Modified: branches/2.3.8-reverse/ branches/2.3.8-reverse/changelog branches/2.3.8-reverse/pom.xml branches/2.3.8-reverse/src/main/java/org/codelutin/rss/FeedEntryComparator.java branches/2.3.8-reverse/src/main/java/org/codelutin/rss/RSSIOUtil.java Log: Add code for reverse order of feed entries Property changes on: branches/2.3.8-reverse ___________________________________________________________________ Modified: svn:ignore - lutinrss.iws target profiles.xml lutinrss.ipr target/* nbactions.xml + lutinrss.iws target profiles.xml lutinrss.ipr target/* nbactions.xml .settings .classpath .project Modified: branches/2.3.8-reverse/changelog =================================================================== --- branches/2.3.8-reverse/changelog 2009-11-30 11:18:10 UTC (rev 171) +++ branches/2.3.8-reverse/changelog 2009-11-30 11:27:43 UTC (rev 172) @@ -1,3 +1,6 @@ +ver-2.3.8-reverse chatellier + * rss items reverse order version + ver-2.3.8 chemit 200810XX * 20081008 [chemit] using license LGPL v3 * 20081008 [chemit] Using lutinpluginproject 3.0 Modified: branches/2.3.8-reverse/pom.xml =================================================================== --- branches/2.3.8-reverse/pom.xml 2009-11-30 11:18:10 UTC (rev 171) +++ branches/2.3.8-reverse/pom.xml 2009-11-30 11:27:43 UTC (rev 172) @@ -157,4 +157,17 @@ <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/lutinrss/tags/2…</url> </scm> + <repositories> + <repository> + <id>labs.repository</id> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>labs.plugin.repository</id> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + </pluginRepository> + </pluginRepositories> </project> \ No newline at end of file Modified: branches/2.3.8-reverse/src/main/java/org/codelutin/rss/FeedEntryComparator.java =================================================================== --- branches/2.3.8-reverse/src/main/java/org/codelutin/rss/FeedEntryComparator.java 2009-11-30 11:18:10 UTC (rev 171) +++ branches/2.3.8-reverse/src/main/java/org/codelutin/rss/FeedEntryComparator.java 2009-11-30 11:27:43 UTC (rev 172) @@ -32,7 +32,8 @@ public class FeedEntryComparator implements Comparator<SyndEntry> { public int compare(SyndEntry o1, SyndEntry o2) { - return o1.getPublishedDate().compareTo(o2.getPublishedDate()); + // reverse order version + return o2.getPublishedDate().compareTo(o1.getPublishedDate()); } } Modified: branches/2.3.8-reverse/src/main/java/org/codelutin/rss/RSSIOUtil.java =================================================================== --- branches/2.3.8-reverse/src/main/java/org/codelutin/rss/RSSIOUtil.java 2009-11-30 11:18:10 UTC (rev 171) +++ branches/2.3.8-reverse/src/main/java/org/codelutin/rss/RSSIOUtil.java 2009-11-30 11:27:43 UTC (rev 172) @@ -112,15 +112,18 @@ @SuppressWarnings({"unchecked"}) protected static SyndFeed addItemToFeed(SyndFeed feed, SyndEntry item, int nbEntries, Map<Field, Object> values) throws IOException, IllegalArgumentException, FeedException, ParseException { List<SyndEntry> entries = feed.getEntries(); + + entries.add(item); + if (!entries.isEmpty()) { // always sort by publication date java.util.Collections.sort(entries, new FeedEntryComparator()); // keep only nbEntries -1 entries - while (entries.size() > nbEntries - 1) { - entries.remove(0); + while (entries.size() > nbEntries) { + entries.remove(entries.size() -1); } } - entries.add(item); + if (log.isDebugEnabled()) { log.debug("new item " + item); }

1 0

r171 - in branches: . 2.3.8-reverse
by echatellier＠users.nuiton.org 30 Nov '09

30 Nov '09

Author: echatellier Date: 2009-11-30 12:18:10 +0100 (Mon, 30 Nov 2009) New Revision: 171 Added: branches/2.3.8-reverse/ Log: Make branches for reverse order rss items Property changes on: branches/2.3.8-reverse ___________________________________________________________________ Added: svn:ignore + lutinrss.iws target profiles.xml lutinrss.ipr target/* nbactions.xml Added: svn:mergeinfo +

1 0

r170 - trunk/src/main/java/org/nuiton/rss
by echatellier＠users.nuiton.org 30 Nov '09

30 Nov '09

Author: echatellier Date: 2009-11-30 12:06:43 +0100 (Mon, 30 Nov 2009) New Revision: 170 Modified: trunk/src/main/java/org/nuiton/rss/RSSGenerator.java Log: Must display 24 date format (or am/pm) Modified: trunk/src/main/java/org/nuiton/rss/RSSGenerator.java =================================================================== --- trunk/src/main/java/org/nuiton/rss/RSSGenerator.java 2009-11-30 08:53:51 UTC (rev 169) +++ trunk/src/main/java/org/nuiton/rss/RSSGenerator.java 2009-11-30 11:06:43 UTC (rev 170) @@ -52,7 +52,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static final Log log = LogFactory.getLog(RSSGenerator.class); /** date formater use to save date in feed and entries */ - public static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); + public static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); /** *

1 0

r169 - in trunk: . src/test src/test/resources
by echatellier＠users.nuiton.org 30 Nov '09

30 Nov '09

Author: echatellier Date: 2009-11-30 09:53:51 +0100 (Mon, 30 Nov 2009) New Revision: 169 Added: trunk/src/test/resources/ trunk/src/test/resources/log4j.properties Modified: trunk/pom.xml Log: Add log4j (test) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-26 18:22:33 UTC (rev 168) +++ trunk/pom.xml 2009-11-30 08:53:51 UTC (rev 169) @@ -25,6 +25,12 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> @@ -47,6 +53,12 @@ <artifactId>rome</artifactId> <version>1.0</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> Added: trunk/src/test/resources/log4j.properties =================================================================== --- trunk/src/test/resources/log4j.properties (rev 0) +++ trunk/src/test/resources/log4j.properties 2009-11-30 08:53:51 UTC (rev 169) @@ -0,0 +1,7 @@ +# Global logging configuration +log4j.rootLogger=DEBUG, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n

1 0

r168 - trunk/src/test/java/org/nuiton/rss
by echatellier＠users.nuiton.org 26 Nov '09

26 Nov '09

Author: echatellier Date: 2009-11-26 19:22:33 +0100 (Thu, 26 Nov 2009) New Revision: 168 Modified: trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java Log: Qu'est ce que c'est que ce log ... Modified: trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2009-11-26 18:22:10 UTC (rev 167) +++ trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2009-11-26 18:22:33 UTC (rev 168) @@ -82,8 +82,8 @@ SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); - if (RSSGenerator.log.isDebugEnabled()) { - RSSGenerator.log.debug(feed); + if (log.isDebugEnabled()) { + log.debug(feed); } Assert.assertEquals(feed.getFeedType(), helper.getFormat().getType());

1 0

r167 - trunk/src/test/java/org/nuiton/rss
by echatellier＠users.nuiton.org 26 Nov '09

26 Nov '09

Author: echatellier Date: 2009-11-26 19:22:10 +0100 (Thu, 26 Nov 2009) New Revision: 167 Modified: trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java Log: Qu'est ce que c'est que ce log ... Modified: trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2009-11-26 18:04:15 UTC (rev 166) +++ trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2009-11-26 18:22:10 UTC (rev 167) @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -42,6 +44,8 @@ */ public class RSSGeneratorHelperTest { + private static Log log = LogFactory.getLog(RSSGeneratorHelperTest.class); + static RSSGenerator helper; static File f; @@ -67,7 +71,9 @@ values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); Assert.assertFalse(f.exists()); - RSSGenerator.log.info("feedFile : " + f); + if (log.isInfoEnabled()) { + log.info("feedFile : " + f); + } helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); // no lock Assert.assertFalse(helper.getWriteFileLock(f).exists()); @@ -129,8 +135,8 @@ List entries = feed.getEntries(); Assert.assertEquals(1, entries.size()); - if (RSSGenerator.log.isDebugEnabled()) { - RSSGenerator.log.debug(feed); + if (log.isDebugEnabled()) { + log.debug(feed); } SyndEntry entry = (SyndEntry) entries.get(0);

1 0

r166 - trunk
by echatellier＠users.nuiton.org 26 Nov '09

26 Nov '09

Author: echatellier Date: 2009-11-26 19:04:15 +0100 (Thu, 26 Nov 2009) New Revision: 166 Modified: trunk/ Log: svn ignore Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - *.iws target profiles.xml *.ipr *.iml target/* nbactions.xml + *.iws target profiles.xml *.ipr *.iml target/* nbactions.xml .settings .classpath .project

1 0

r165 - in trunk: . src/main/resources/fckeditor src/main/webapp src/site/rst
by echatellier＠users.nuiton.org 26 Nov '09

26 Nov '09

Author: echatellier Date: 2009-11-26 19:03:10 +0100 (Thu, 26 Nov 2009) New Revision: 165 Modified: trunk/pom.xml trunk/src/main/resources/fckeditor/myfckconfig.js trunk/src/main/webapp/index.html trunk/src/main/webapp/rssinclude.js trunk/src/main/webapp/testFck.html trunk/src/site/rst/index.rst Log: Move name from lutinrss to nuitonrss. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-26 17:54:19 UTC (rev 164) +++ trunk/pom.xml 2009-11-26 18:03:10 UTC (rev 165) @@ -116,8 +116,7 @@ <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> -  - <webappDirectory>target/lutinrss</webappDirectory> + <webappDirectory>target/nuitonrss</webappDirectory> </configuration> </plugin> Modified: trunk/src/main/resources/fckeditor/myfckconfig.js =================================================================== --- trunk/src/main/resources/fckeditor/myfckconfig.js 2009-11-26 17:54:19 UTC (rev 164) +++ trunk/src/main/resources/fckeditor/myfckconfig.js 2009-11-26 18:03:10 UTC (rev 165) @@ -50,13 +50,13 @@ FCKConfig.RssCanEditFeed = false; // url to render a feed -FCKConfig.RssRenderURL = '/lutinrss-2.1/RSSServlet&feedName=' ; +FCKConfig.RssRenderURL = '/nuitonrss-2.4/RSSServlet&feedName=' ; // url to obtain rssinclude script -FCKConfig.RssScriptURL = '/lutinrss-2.1/RSSServlet' ; +FCKConfig.RssScriptURL = '/nuitonrss-2.4/RSSServlet' ; // url to obtain known feeds as a list of html options -FCKConfig.RssKnownFeedsURL = '/lutinrss-2.1/feeds.txt' ; +FCKConfig.RssKnownFeedsURL = '/nuitonrss-2.4/feeds.txt' ; // url to create a new feed FCKConfig.RssAddURL = ''; Modified: trunk/src/main/webapp/index.html =================================================================== --- trunk/src/main/webapp/index.html 2009-11-26 17:54:19 UTC (rev 164) +++ trunk/src/main/webapp/index.html 2009-11-26 18:03:10 UTC (rev 165) @@ -10,7 +10,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body> - <h1>LutinRSS tests index</h1> + <h1>NuitonRSS tests index</h1> <ul> <li><a href="testRender.html" target="render">Test de rendu</a></li> <li><a href="testGenerator.html" target="generator">Test de génération de flux</a></li> Modified: trunk/src/main/webapp/rssinclude.js =================================================================== --- trunk/src/main/webapp/rssinclude.js 2009-11-26 17:54:19 UTC (rev 164) +++ trunk/src/main/webapp/rssinclude.js 2009-11-26 18:03:10 UTC (rev 165) @@ -2,7 +2,7 @@ // mettre background a false est utile lorsque l'on appelle la methode // depuis une fenetre que l'on ferme ensuite //var serlvetUrl = "%1$1"; - var serlvetUrl = "http://localhost:8083/lutinrss-2.0/RSSServlet"; + var serlvetUrl = "http://localhost:8083/nuitonrss-2.4/RSSServlet"; win = window; var xhr = null; var error=null; Modified: trunk/src/main/webapp/testFck.html =================================================================== --- trunk/src/main/webapp/testFck.html 2009-11-26 17:54:19 UTC (rev 164) +++ trunk/src/main/webapp/testFck.html 2009-11-26 18:03:10 UTC (rev 165) @@ -26,7 +26,7 @@ //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://formats-ouverts.org/rss.php\" nbitem=\"4\" feedrepr=\"indat-natd\" \">RSS http://formats-ouverts.org/rss.php (items:4)</div><br/>"; //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://www.h2database.com/html/newsfeed-rss.xml\" nbitem=\"5\" feedRepr=\"indat-natd\" \">RSS http://www.h2database.com/html/newsfeed-rss.xml (items:5)</div><br/>"; //content+="<div contenteditable='false' name=\"rssinclude\" class=\"rssinclude\" feedname=\"http://www.opensi.org/news.rss\" nbitem=\"6\" feedrepr=\"indat-natd\" \">RSS http://www.opensi.org/news.rss (items:6)</div>"; - content += "<s"+"cript src=\"/lutinrss-2.1/RSSServlet\"></scri"+"pt><hr/><p>content...</p>"; + content += "<s"+"cript src=\"/nuitonrss-2.4/RSSServlet\"></scri"+"pt><hr/><p>content...</p>"; oFCKeditor.Value = content; oFCKeditor.Create() ; --> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2009-11-26 17:54:19 UTC (rev 164) +++ trunk/src/site/rst/index.rst 2009-11-26 18:03:10 UTC (rev 165) @@ -8,7 +8,7 @@ A faire ... -<script src="lutinrss.js"> +<script src="nuitonrss.js"> rss("rss1", "url", max, login, password) </script> <div id="rss1"></div>

1 0

r164 - trunk
by echatellier＠users.nuiton.org 26 Nov '09

26 Nov '09

Author: echatellier Date: 2009-11-26 18:54:19 +0100 (Thu, 26 Nov 2009) New Revision: 164 Modified: trunk/pom.xml Log: Update jdom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-26 17:27:19 UTC (rev 163) +++ trunk/pom.xml 2009-11-26 17:54:19 UTC (rev 164) @@ -37,9 +37,9 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>jdom</groupId> + <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> - <version>1.0</version> + <version>1.1</version> <scope>compile</scope> </dependency> <dependency>

1 0

r163 - trunk
by echatellier＠users.nuiton.org 26 Nov '09

26 Nov '09

Author: echatellier Date: 2009-11-26 18:27:19 +0100 (Thu, 26 Nov 2009) New Revision: 163 Modified: trunk/pom.xml Log: Fix xsd Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-26 17:25:13 UTC (rev 162) +++ trunk/pom.xml 2009-11-26 17:27:19 UTC (rev 163) @@ -1,5 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>

1 0