Author: tchemit Date: 2009-05-16 20:27:40 +0000 (Sat, 16 May 2009) New Revision: 130 Added: nuiton-rss/trunk/changelog.txt nuiton-rss/trunk/src/main/java/org/nuiton/ nuiton-rss/trunk/src/site/rst/ nuiton-rss/trunk/src/site/rst/Todo.rst nuiton-rss/trunk/src/site/rst/index.rst nuiton-rss/trunk/src/test/java/org/nuiton/ Removed: nuiton-rss/trunk/changelog nuiton-rss/trunk/src/main/java/org/codelutin/ nuiton-rss/trunk/src/site/fr/ nuiton-rss/trunk/src/test/java/org/codelutin/ Modified: nuiton-rss/trunk/pom.xml nuiton-rss/trunk/src/main/java/org/nuiton/rss/BaseServlet.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/ConfigInitializer.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedData.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedEntryComparator.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedRenderer.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedRendererConfig.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedType.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedURLResolver.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/Field.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/HTMLCleaner.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSConfig.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGenerator.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSHelper.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSIOUtil.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSServlet.java nuiton-rss/trunk/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java nuiton-rss/trunk/src/main/resources/log4j.properties nuiton-rss/trunk/src/main/webapp/WEB-INF/web.xml nuiton-rss/trunk/src/site/site.xml nuiton-rss/trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java nuiton-rss/trunk/src/test/java/org/nuiton/rss/RSSTest.java Log: migrate to nuiton Deleted: nuiton-rss/trunk/changelog =================================================================== --- nuiton-rss/trunk/changelog 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/changelog 2009-05-16 20:27:40 UTC (rev 130) @@ -1,5 +0,0 @@ -ver-2.3.8 chemit 200810XX - * 20081008 [chemit] using license LGPL v3 - * 20081008 [chemit] Using lutinpluginproject 3.0 - * 20081008 [chemit] begin of site - * 20081008 [chemit] use now the groupId org.codelutin Copied: nuiton-rss/trunk/changelog.txt (from rev 129, nuiton-rss/trunk/changelog) =================================================================== --- nuiton-rss/trunk/changelog.txt (rev 0) +++ nuiton-rss/trunk/changelog.txt 2009-05-16 20:27:40 UTC (rev 130) @@ -0,0 +1,9 @@ +2.4.0 chemit + + * migrate to nuiton (package changed to org.nuiton) + +ver-2.3.8 chemit 200810XX + * 20081008 [chemit] using license LGPL v3 + * 20081008 [chemit] Using lutinpluginproject 3.0 + * 20081008 [chemit] begin of site + * 20081008 [chemit] use now the groupId org.codelutin Property changes on: nuiton-rss/trunk/changelog.txt ___________________________________________________________________ Name: svn:mergeinfo + Modified: nuiton-rss/trunk/pom.xml =================================================================== --- nuiton-rss/trunk/pom.xml 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/pom.xml 2009-05-16 20:27:40 UTC (rev 130) @@ -1,3 +1,4 @@ + <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> @@ -6,14 +7,16 @@ <!-- *** POM Relationships *************************************** --> <!-- ************************************************************* --> <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.0</version> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>lutinrss</artifactId> + <artifactId>nuiton-rss</artifactId> + <version>2.4.0-SNAPSHOT</version> <dependencies> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -45,6 +48,13 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> + <scope>test</scope> + </dependency> + <!--Provided--> <dependency> <groupId>javax.servlet</groupId> @@ -57,8 +67,7 @@ <!-- ************************************************************* --> <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <name>LutinRSS</name> - <version>2.3.9-SNAPSHOT</version> + <name>Nuiton-RSS</name> <description>Servlet pouvant etre appeler depuis du JS pour recuperer un flux RSS </description> @@ -70,11 +79,9 @@ <packaging>war</packaging> <properties> - <!-- id du projet du labs --> - <labs.id>41</labs.id> - <!-- nom du projet sur le labs --> - <labs.project>lutinweb</labs.project> + <!-- a supprimer des qu'on pourra deployer les sites sur nuiton --> + <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/lutinweb/htdocs</site.deploy.url> </properties> @@ -82,15 +89,6 @@ <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <link>http://java.sun.com/javase/6/docs/api/index.html</link> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <configuration> <outputDirectory>${project.build.directory}/lib</outputDirectory> @@ -98,16 +96,7 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> <executions> <execution> <goals> @@ -117,45 +106,111 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> - <configuration> + + + + </plugins> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.1</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.1</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/deps.xml</descriptor> + <descriptor>src/main/assembly/full.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> <!--warName>lutinrss</warName--> - <webappDirectory>target/lutinrss</webappDirectory> - </configuration> - </plugin> + <webappDirectory>target/lutinrss</webappDirectory> + </configuration> + </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> - </plugins> + </plugins> + </pluginManagement> </build> <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> + + <!--Nuiton Repository : pourra etre supprimer lorsqu'on sera sur central --> + <repositories> + <repository> + <id>nuiton-repository</id> + <name>NuitonRepository</name> + <url>${repository.home.url}</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> </project> Copied: nuiton-rss/trunk/src/main/java/org/nuiton (from rev 129, nuiton-rss/trunk/src/main/java/org/codelutin) Property changes on: nuiton-rss/trunk/src/main/java/org/nuiton ___________________________________________________________________ Name: svn:mergeinfo + Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/BaseServlet.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/BaseServlet.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/BaseServlet.java 2009-05-16 20:27:40 UTC (rev 130) @@ -16,7 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.rss; +package org.nuiton.rss; import java.io.*; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/ConfigInitializer.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/ConfigInitializer.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/ConfigInitializer.java 2009-05-16 20:27:40 UTC (rev 130) @@ -20,7 +20,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import org.apache.commons.beanutils.BeanUtils; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedData.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/FeedData.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedData.java 2009-05-16 20:27:40 UTC (rev 130) @@ -16,7 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndFeed; import java.net.URL; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedEntryComparator.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/FeedEntryComparator.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedEntryComparator.java 2009-05-16 20:27:40 UTC (rev 130) @@ -20,7 +20,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndEntry; import java.util.Comparator; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/FeedHTMLRenderer.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedHTMLRenderer.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedRenderer.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/FeedRenderer.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedRenderer.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedRendererConfig.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/FeedRendererConfig.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedRendererConfig.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import java.util.ArrayList; import java.util.List; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedType.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/FeedType.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedType.java 2009-05-16 20:27:40 UTC (rev 130) @@ -20,7 +20,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; /** * Enumeration of known feed's type. Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedURLResolver.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/FeedURLResolver.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/FeedURLResolver.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import java.net.MalformedURLException; import java.net.URL; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/Field.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/Field.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/Field.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; /** * Enumeration des champs disponibles pour le renderer Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/HTMLCleaner.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/HTMLCleaner.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/HTMLCleaner.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; /** * Permet de nettoyer une chaine avant incorporation dans du HTML Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/HTMLScriptCleaner.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/HTMLScriptCleaner.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import java.util.regex.Pattern; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSConfig.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/RSSConfig.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSConfig.java 2009-05-16 20:27:40 UTC (rev 130) @@ -16,7 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.rss; +package org.nuiton.rss; /** * Default configuration for {@link RSSHelper}. Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGenerator.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/RSSGenerator.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGenerator.java 2009-05-16 20:27:40 UTC (rev 130) @@ -20,7 +20,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/RSSGeneratorConfig.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGeneratorConfig.java 2009-05-16 20:27:40 UTC (rev 130) @@ -16,7 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.rss; +package org.nuiton.rss; /** * Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/RSSGeneratorServlet.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSGeneratorServlet.java 2009-05-16 20:27:40 UTC (rev 130) @@ -16,7 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndFeed; import com.sun.syndication.io.FeedException; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSHelper.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/RSSHelper.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSHelper.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSIOUtil.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/RSSIOUtil.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSIOUtil.java 2009-05-16 20:27:40 UTC (rev 130) @@ -16,7 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndCategory; import com.sun.syndication.feed.synd.SyndCategoryImpl; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSServlet.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/RSSServlet.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/RSSServlet.java 2009-05-16 20:27:40 UTC (rev 130) @@ -16,7 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -package org.codelutin.rss; +package org.nuiton.rss; import java.io.*; Modified: nuiton-rss/trunk/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java =================================================================== --- nuiton-rss/trunk/src/main/java/org/codelutin/rss/SimpleFeedURLResolver.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/java/org/nuiton/rss/SimpleFeedURLResolver.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import java.net.MalformedURLException; import java.net.URL; Modified: nuiton-rss/trunk/src/main/resources/log4j.properties =================================================================== --- nuiton-rss/trunk/src/main/resources/log4j.properties 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/resources/log4j.properties 2009-05-16 20:27:40 UTC (rev 130) @@ -6,4 +6,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n #log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X # package level -log4j.logger.org.codelutin.rss=INFO +log4j.logger.org.nuiton.rss=INFO Modified: nuiton-rss/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- nuiton-rss/trunk/src/main/webapp/WEB-INF/web.xml 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/main/webapp/WEB-INF/web.xml 2009-05-16 20:27:40 UTC (rev 130) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -9,7 +9,7 @@ <servlet> <servlet-name>RSSServlet</servlet-name> - <servlet-class>org.codelutin.rss.RSSServlet</servlet-class> + <servlet-class>org.nuiton.rss.RSSServlet</servlet-class> </servlet> <servlet-mapping> <servlet-name>RSSServlet</servlet-name> @@ -17,7 +17,7 @@ </servlet-mapping> <servlet> <servlet-name>RSSGeneratorServlet</servlet-name> - <servlet-class>org.codelutin.rss.RSSGeneratorServlet</servlet-class> + <servlet-class>org.nuiton.rss.RSSGeneratorServlet</servlet-class> </servlet> <servlet-mapping> <servlet-name>RSSGeneratorServlet</servlet-name> Copied: nuiton-rss/trunk/src/site/rst/Todo.rst (from rev 129, nuiton-rss/trunk/src/site/fr/rst/Todo.rst) =================================================================== --- nuiton-rss/trunk/src/site/rst/Todo.rst (rev 0) +++ nuiton-rss/trunk/src/site/rst/Todo.rst 2009-05-16 20:27:40 UTC (rev 130) @@ -0,0 +1,5 @@ +==== +TODO +==== + +Reste a faire ? \ No newline at end of file Property changes on: nuiton-rss/trunk/src/site/rst/Todo.rst ___________________________________________________________________ Name: svn:mergeinfo + Copied: nuiton-rss/trunk/src/site/rst/index.rst (from rev 129, nuiton-rss/trunk/src/site/fr/rst/index.rst) =================================================================== --- nuiton-rss/trunk/src/site/rst/index.rst (rev 0) +++ nuiton-rss/trunk/src/site/rst/index.rst 2009-05-16 20:27:40 UTC (rev 130) @@ -0,0 +1,18 @@ +RSS Servlet/Ajax +================ + +.. contents:: + +Utilisation +=========== + +A faire ... + +<script src="lutinrss.js"> +rss("rss1", "url", max, login, password) +</script> +<div id="rss1"></div> + +- si pas de fichier html pour l'url demandée ou plus vielle que N + - récupération de de l'url et sauvegarde en html +- renvoi du html Property changes on: nuiton-rss/trunk/src/site/rst/index.rst ___________________________________________________________________ Name: svn:mergeinfo + Modified: nuiton-rss/trunk/src/site/site.xml =================================================================== --- nuiton-rss/trunk/src/site/site.xml 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/site/site.xml 2009-05-16 20:27:40 UTC (rev 130) @@ -6,11 +6,12 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2</version> + <version>0.2.3</version> </skin> <bannerLeft> <name>${project.name}</name> + <href>index.html</href> </bannerLeft> <bannerRight> @@ -18,7 +19,6 @@ <href>${project.organization.url}</href> </bannerRight> - <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"/> @@ -29,22 +29,25 @@ <body> <links> <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Nuiton" href="http://www.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com/"/> </links> - <menu ref="parent"/> - <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> </menu> <menu name="Téléchargement"> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" - name="la dernière version sur le repository maven"/> - <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" - name="Voir toutes les versions sur le repository maven"/> - <item href="https://labs.libre-entreprise.org/frs/download.php/686/lutinrss-2.3.8-bin.zi..." - name="la dernière release (au format zip)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item href="${repository.home.url}/org/nuiton/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + 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"> Copied: nuiton-rss/trunk/src/test/java/org/nuiton (from rev 129, nuiton-rss/trunk/src/test/java/org/codelutin) Property changes on: nuiton-rss/trunk/src/test/java/org/nuiton ___________________________________________________________________ Name: svn:mergeinfo + Modified: nuiton-rss/trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java =================================================================== --- nuiton-rss/trunk/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2009-05-16 20:27:40 UTC (rev 130) @@ -20,7 +20,7 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndCategory; import com.sun.syndication.feed.synd.SyndEntry; @@ -85,7 +85,7 @@ assertEquals(feed.getTitle(), values.get(Field.NAME)); assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); assertEquals(feed.getAuthor(), values.get(Field.AUTHOR)); - List cats = (List) values.get(Field.CATEGORY); + List<?> cats = (List<?>) values.get(Field.CATEGORY); for (Object o : feed.getCategories()) { SyndCategory cat = (SyndCategory) o; assertTrue(cats.contains(cat.getName())); Modified: nuiton-rss/trunk/src/test/java/org/nuiton/rss/RSSTest.java =================================================================== --- nuiton-rss/trunk/src/test/java/org/codelutin/rss/RSSTest.java 2009-05-16 20:03:57 UTC (rev 129) +++ nuiton-rss/trunk/src/test/java/org/nuiton/rss/RSSTest.java 2009-05-16 20:27:40 UTC (rev 130) @@ -21,7 +21,7 @@ * and open the template in the editor. */ -package org.codelutin.rss; +package org.nuiton.rss; import java.util.ArrayList; import java.util.List;