Author: tchemit Date: 2008-08-12 22:56:14 +0000 (Tue, 12 Aug 2008) New Revision: 1014 Added: trunk/lutinutil/src/site/xdoc/fr/rst/abstract.rst Removed: trunk/lutinutil/src/site/xdoc/fr/rst/index.rst trunk/lutinutil/src/site/xdoc/navigation.xml Modified: trunk/lutinutil/changelog trunk/lutinutil/pom.xml trunk/lutinutil/src/site/site.xml Log: improve site (due to improve in lutinproject) Modified: trunk/lutinutil/changelog =================================================================== --- trunk/lutinutil/changelog 2008-08-12 17:35:52 UTC (rev 1013) +++ trunk/lutinutil/changelog 2008-08-12 22:56:14 UTC (rev 1014) @@ -1,3 +1,7 @@ +ver-0-31 chemit 2008???? + * utilisation de lutinproject 2.4 et nettoyage du pom + * reorganisation du site + ver-0-30 chemit 20080710 * passage en maven 2 layout directory * utilisation de lutinproject 2.3 Modified: trunk/lutinutil/pom.xml =================================================================== --- trunk/lutinutil/pom.xml 2008-08-12 17:35:52 UTC (rev 1013) +++ trunk/lutinutil/pom.xml 2008-08-12 22:56:14 UTC (rev 1014) @@ -9,12 +9,11 @@ <!-- ************************************************************* --> <parent> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.3</version> + <version>2.4</version> </parent> - <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> <dependencies> @@ -22,31 +21,31 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <dependency> <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> + <version>1.0</version> + <scope>compile</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-toolchain</artifactId> - </dependency> + </dependencies> @@ -70,85 +69,25 @@ <!-- id du projet du labs --> <labs.id>12</labs.id> - <labs.project>lutinutil</labs.project> + <!-- nom du projet sur le labs , il est egal a artifactId donc pas besoin de surcharger --> + <!--labs.project>${pom.artifactId}</labs.project--> + <!--username>tchemit</username--> - <!-- par defaut, mode non verbeux --> - <!--maven.verbose>false</maven.verbose--> - - <!-- compile with ? --> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - <maven.compile.encoding>UTF-8</maven.compile.encoding> - - <!-- Lists URL --> - <labs.lists>http://lists.labs.libre-entreprise.org/mailman/listinfo/lutinutil</labs.lists> - - <!-- maven will suffix with /${pom.artifactId} --> - <maven.scm.developerConnection>scm:svn:svn+ssh://${username}@${labs.host}/svnroot/lutinutil/trunk - </maven.scm.developerConnection> - - <!-- maven will suffix with /${pom.artifactId} --> - <maven.scm.connection>scm:svn:svn:anonymous@${labs.host}/svnroot/lutinutil/trunk</maven.scm.connection> - + <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore> </properties> - <profiles> - <profile> - <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <!-- test (par defaut, on ne les execute pas) --> - <maven.test.skip>true</maven.test.skip> - <maven.reports.generate>false</maven.reports.generate> - </properties> - </profile> - <profile> - <id>tests</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <!-- test (par defaut, on les execute) --> - <maven.test.skip>true</maven.test.skip> - <maven.reports.generate>false</maven.reports.generate> - </properties> - </profile> - <profile> - <id>site</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <!-- test (par defaut, on ne les execute pas) --> - <maven.test.skip>false</maven.test.skip> - <maven.reports.generate>true</maven.reports.generate> - </properties> - </profile> - </profiles> + <scm> + <url>${maven.scm.url}</url> + </scm> - <!--Tracking--> - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=12</url> - </issueManagement> <build> <plugins> + + <!-- i18n --> <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-i18n-plugin</artifactId> - <!--version>0.3-SNAPSHOT</version--> - <configuration> - <bundles> - <param>fr_FR</param> - <param>en_GB</param> - </bundles> - <src>${maven.src.dir}/main/resources/i18n</src> - <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> - <keysModifier>false</keysModifier> - <keepBackup>false</keepBackup> - </configuration> <executions> <execution> <phase>process-resources</phase> @@ -159,97 +98,30 @@ </execution> </executions> </plugin> - <!-- source --> + + <!-- jrst --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> + <groupId>lutinplugin</groupId> + <artifactId>maven-jrst-plugin</artifactId> + <configuration> + <!--outputEncoding>ISO-8859-1</outputEncoding--> + <!--inputEncoding>${maven.compile.encoding}</inputEncoding--> + <!--inputEncoding>ISO-8859-1</inputEncoding--> + </configuration> </plugin> - <!-- javadoc --> + <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> + <artifactId>maven-site-plugin</artifactId> <configuration> - <!--aggregate>true</aggregate--> - <encoding>${maven.compile.encoding}</encoding> + <!--outputEncoding>ISO-8859-1</outputEncoding--> + <!--inputEncoding>${maven.compile.encoding}</inputEncoding--> + <!--inputEncoding>ISO-8859-1</inputEncoding--> </configuration> + </plugin> + </plugins> </build> - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-toolchain</artifactId> - <version>1.0</version> - <scope>test</scope> - </dependency> - - <!-- Plugins --> - <dependency> - <groupId>lutinplugin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>0.4</version> - </dependency> - - </dependencies> - </dependencyManagement> - - - <!--distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/</url> - </site> - </distributionManagement--> - </project> Modified: trunk/lutinutil/src/site/site.xml =================================================================== --- trunk/lutinutil/src/site/site.xml 2008-08-12 17:35:52 UTC (rev 1013) +++ trunk/lutinutil/src/site/site.xml 2008-08-12 22:56:14 UTC (rev 1014) @@ -1,43 +1,52 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <project name="LutinUtil"> - <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> - - <bannerLeft> - <name>Lutin Util</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <skin> + <groupId>lutinlib</groupId> + <artifactId>lutin-site-skin</artifactId> + <version>0.1</version> + </skin> + <bannerLeft> + <name>Lutin Util</name> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <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"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </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://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> - <body> - <links> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/lutinutil/" name="T�l�chargement"/> - </menu> + <menu name="Utilisateur"> + <item name="Accueil" href="abstract.html"/> + <item name="Documentation" href="/LutinUtil.html"/> + </menu> - <menu name="D�veloppeur"> - <item name="A faire" href="Todo.html"/> - </menu> + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" + name="Télécharger la dernière version"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" + name="Voir toutes les versions"/> + </menu> - ${reports} + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + <item name="CommandLineArgumentApplication" href="/CommandLineArgumentApplication.html"/> + </menu> - </body> + <menu ref="reports"/> + + </body> </project> Copied: trunk/lutinutil/src/site/xdoc/fr/rst/abstract.rst (from rev 1013, trunk/lutinutil/src/site/xdoc/fr/rst/index.rst) =================================================================== (Binary files differ) Property changes on: trunk/lutinutil/src/site/xdoc/fr/rst/abstract.rst ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/lutinutil/src/site/xdoc/fr/rst/index.rst =================================================================== (Binary files differ) Deleted: trunk/lutinutil/src/site/xdoc/navigation.xml =================================================================== --- trunk/lutinutil/src/site/xdoc/navigation.xml 2008-08-12 17:35:52 UTC (rev 1013) +++ trunk/lutinutil/src/site/xdoc/navigation.xml 2008-08-12 22:56:14 UTC (rev 1014) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-15"?> - -<project name="Lutin Util"> - <title>Lutin Util</title> - <body> - <links> - <item href="http://labs.libre-entreprise.org/" name="Labs"></item> - <item href="http://www.codelutin.com/" name="Code Lutin"></item> - </links> - <menu name="Utilisateur"> - <item href="/LutinUtil.html" name="Documentation"></item> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven/lutinlib/jars/" name="T�l�chargement"></item> - </menu> - <menu name="Developpeur"> - <item href="/Todo.html" name="Todo"></item> - <item href="/Todo.html" name="Todo"></item> - </menu> - </body> -</project>