Author: tchemit Date: 2008-10-20 22:17:03 +0000 (Mon, 20 Oct 2008) New Revision: 1160 Modified: topia-service/trunk/pom.xml topia-service/trunk/src/site/site_fr.xml Log: mise ?\195?\160 jour du pom, reformatage ?\195?\160 MA sauce, mise a jour dependance lutingenerator. mise ?\195?\160 jour du site avec les dernieres ameliorations. TODO : il serait bien que les tests passent de nouveau Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-10-20 22:12:16 UTC (rev 1159) +++ topia-service/trunk/pom.xml 2008-10-20 22:17:03 UTC (rev 1160) @@ -2,85 +2,92 @@ <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"> - <!--The version of maven's project object model--> <modelVersion>4.0.0</modelVersion> - <!--lutinproject.xml--> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> <version>3.0</version> </parent> - <distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/topia/htdocs/topia-service</url> - </site> - </distributionManagement> - - <!--A unique name for this project--> <artifactId>topia-service</artifactId> - <name>ToPIA Service</name> - <!--ejb, jar, war...--> - <packaging>jar</packaging> + <dependencies> - <!--Version--> - <version>0.9-SNAPSHOT</version> + <!--Compile--> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> - <!--Description--> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>0.31</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>2.3.2</version> + <scope>compile</scope> + </dependency> + + <!--BD H2 pour le test--> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.0.79</version> + <scope>test</scope> + </dependency> + + </dependencies> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>ToPIA Service</name> + <version>0.9-SNAPSHOT</version> <description> ToPIA Service est une librairie de ToPIA pour la gestion de sercices. </description> <inceptionYear>2006</inceptionYear> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + <properties> <!-- id du projet du labs --> <labs.id>21</labs.id> - + <!-- nom du projet sur le labs --> <labs.project>topia</labs.project> - - <!-- do test --> + + <!-- topia version --> + <topia.version>2.0.27-SNAPSHOT</topia.version> + + <!-- Test FIXME : should be ok --> <maven.test.skip>true</maven.test.skip> </properties> - <!--Source control management--> - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - - <!--who the developers are for the project--> - <contributors> - <contributor> - <name>Ruchaud Julien</name> - <email>ruchaud@codelutin.com</email> - <timezone>+2</timezone> - <roles> - <role>Developpeur</role> - </roles> - </contributor> - - <contributor> - <name>Arnaud Thimel</name> - <email>thimel@codelutin.com</email> - <timezone>+2</timezone> - <roles> - <role>Developpeur</role> - </roles> - </contributor> - </contributors> - <build> - + <plugins> - <plugin> + + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.51-SNAPSHOT</version> + <version>0.60</version> <executions> <execution> <phase>process-sources</phase> @@ -95,11 +102,11 @@ <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>org.codelutin.topia</defaultPackage> <extractedPackages>org.codelutin.topia.tass</extractedPackages> - + <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> <copyOverwrite>true</copyOverwrite> - </configuration> + </configuration> <goals> <goal>zargo2xmi</goal> <goal>xmi2objectmodel</goal> @@ -112,51 +119,26 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.0.27-SNAPSHOT</version> + <version>${topia.version}</version> <scope>compile</scope> </dependency> </dependencies> </plugin> <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> + <artifactId>maven-javadoc-plugin</artifactId> </plugin> + </plugins> </build> - <!--Librairies--> - <dependencies> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> - <!--Compile--> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>2.0.27-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>0.31</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>2.3.2</version> - <scope>compile</scope> - </dependency> - - <!--BD H2 pour le test--> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.79</version> - <scope>test</scope> - </dependency> - - </dependencies> </project> Modified: topia-service/trunk/src/site/site_fr.xml =================================================================== --- topia-service/trunk/src/site/site_fr.xml 2008-10-20 22:12:16 UTC (rev 1159) +++ topia-service/trunk/src/site/site_fr.xml 2008-10-20 22:17:03 UTC (rev 1160) @@ -1,47 +1,62 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="ToPIA-Service"> - - <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2</version> - </skin> - - <bannerLeft> - <name>ToPIA Service</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> +<project name="${project.name}"> - <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> + <publishDate format="dd/MM/yyyy"/> - <body> - <links> - <item name="ToPIA" href="http://topia.labs.libre-entreprise.org/"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.1</version> + </skin> - <menu name="Utilisateur"> - <item href="/index.html" name="Accueil"></item> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/topia-ser..." name="Téléchargement"/> - </menu> + <bannerLeft> + <name>${project.name}</name> + <!--src>http://buix.labs.libre-entreprise.org/lutinjaxx/jaxx.png</src--> + <href>index.html</href> + </bannerLeft> - <menu name="Developpeur"> - <item name="Historique" href="/History.html"/> - <item name="Sécurité" href="/Security.html"/> - <item name="Recherche" href="/Search.html"/> - <item name="Migration" href="/Migration.html"/> - </menu> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> - ${reports} - - </body> + <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="ToPIA" href="http://topia.labs.libre-entreprise.org/topia"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="/index.html" name="Accueil"/> + <!--item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/topia-ser..." + name="Téléchargement"/--> + </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> + + <menu name="Developpeur"> + <item name="Historique" href="/History.html"/> + <item name="Sécurité" href="/Security.html"/> + <item name="Recherche" href="/Search.html"/> + <item name="Migration" href="/Migration.html"/> + </menu> + + <menu ref="reports"/> + + </body> </project>