Author: fdesbois Date: 2009-11-03 19:07:36 +0100 (Tue, 03 Nov 2009) New Revision: 2673 Added: trunk/src/site/site_fr.xml Removed: trunk/src/site/site.xml Modified: trunk/callao-service/pom.xml trunk/pom.xml Log: - Suppress topia-soa dependency - Change site.xml name Modified: trunk/callao-service/pom.xml =================================================================== --- trunk/callao-service/pom.xml 2009-11-02 04:28:10 UTC (rev 2672) +++ trunk/callao-service/pom.xml 2009-11-03 18:07:36 UTC (rev 2673) @@ -24,12 +24,6 @@ <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> </dependency> - -<!-- <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-soa</artifactId> - </dependency>--> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -57,62 +51,6 @@ </resource> </resources> <plugins> - - <!-- Plug in Topia --> - <!--<plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <phase>process-sources</phase> - Configuration of model generator - <configuration> - <addCompileDirectory>true</addCompileDirectory> - <srcDirZuml>../callao-entity/src/main/xmi/</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.ServiceInterfaceGenerator</templates> - <destDirGen>${maven.gen.dir}/java</destDirGen> - <fullPackagePath>org.chorem.callao.service</fullPackagePath> - <defaultPackage>org.chorem.callao.service</defaultPackage> - <extractedPackages>org.chorem.callao.service</extractedPackages> - <zargoResources> - <input>../callao-entity/src/main/xmi/</input> - <output>target/generated-sources/xmi</output> - </zargoResources> - - </configuration> - - - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-soa</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-java5</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies - - </plugin>--> </plugins> </build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 04:28:10 UTC (rev 2672) +++ trunk/pom.xml 2009-11-03 18:07:36 UTC (rev 2673) @@ -45,12 +45,6 @@ <version>1.1</version> </dependency> - <!-- <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-soa</artifactId> - <version>${topia.version}</version> - </dependency>--> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -145,18 +139,6 @@ <artifactId>topia-persistence</artifactId> <version>${topia.version}</version> </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-soa</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-java5</artifactId> - </exclusion> - </exclusions> - </dependency> </dependencies> </plugin> <plugin> Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-11-02 04:28:10 UTC (rev 2672) +++ trunk/src/site/site.xml 2009-11-03 18:07:36 UTC (rev 2673) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="Callao"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - <menu name="Callao" inherit="top"> - <item name="News" href="news.html" /> - <item name="Présentation" href="callao.html"/> - <item name="RoadMap" href="roadmap.html"/> - <item name="Téléchargements" href="http://chorem.org/projects/list_files/callao" /> - <item name="Lexique comptable" href="lexique.html" /> - <item name="Contacts" href="contact.html" /> - </menu> - <menu name="Développeur" inherit="top"> - <item name="Développement" href="developpement.html"/> - <item name="Cas d'utilisation" href="usecases.html"/> - <item name="Diagramme de classes" href="classes.html"/> - <item name="Dépôt SVN" href="http://svn.chorem.org/svn/callao"/> - </menu> - <menu name="Utilisateur" inherit="top" > - <item name="How To" href="howto.html" /> - </menu> - <menu ref="reports"/> - </body> - -</project> Copied: trunk/src/site/site_fr.xml (from rev 2672, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2009-11-03 18:07:36 UTC (rev 2673) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="Callao"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <menu name="Callao" inherit="top"> + <item name="News" href="news.html" /> + <item name="Présentation" href="callao.html"/> + <item name="RoadMap" href="roadmap.html"/> + <item name="Téléchargements" href="http://chorem.org/projects/list_files/callao" /> + <item name="Lexique comptable" href="lexique.html" /> + <item name="Contacts" href="contact.html" /> + </menu> + <menu name="Développeur" inherit="top"> + <item name="Développement" href="developpement.html"/> + <item name="Cas d'utilisation" href="usecases.html"/> + <item name="Diagramme de classes" href="classes.html"/> + <item name="Dépôt SVN" href="http://svn.chorem.org/svn/callao"/> + </menu> + <menu name="Utilisateur" inherit="top" > + <item name="How To" href="howto.html" /> + </menu> + <menu ref="reports"/> + </body> + +</project> Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:mergeinfo +