Author: tchemit Date: 2009-02-09 19:41:35 +0000 (Mon, 09 Feb 2009) New Revision: 1347 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-ui/pom.xml Log: refactor poms (again!) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-09 15:56:49 UTC (rev 1346) +++ topia/trunk/pom.xml 2009-02-09 19:41:35 UTC (rev 1347) @@ -171,6 +171,9 @@ <xmlrpc.version>3.1</xmlrpc.version> <hibernate.version>3.3.1.GA</hibernate.version> <topia.version>${project.version}</topia.version> + + <!-- le repertoire de generation pour les tests --> + <test.gen.dir>${project.build.directory}/generated-test-sources</test.gen.dir> </properties> <build> @@ -205,6 +208,42 @@ </configuration> </plugin> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <inherited>true</inherited> + <configuration> + <srcDirZuml>src/test/xmi</srcDirZuml> + <srcXmiDest>${test.gen.dir}/xmi/</srcXmiDest> + <srcGenDest>${test.gen.dir}/models/</srcGenDest> + <destDirGen>${test.gen.dir}/java</destDirGen> + <!--includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <defaultPackage>org.codelutin.test</defaultPackage--> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>add-test-source</id> + <phase>process-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${test.gen.dir}/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-02-09 15:56:49 UTC (rev 1346) +++ topia/trunk/topia-persistence/pom.xml 2009-02-09 19:41:35 UTC (rev 1347) @@ -32,43 +32,31 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <!--version>3.2.1</version> - <scope>compile</scope--> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <!--version>3.3.1.GA</version> - <scope>compile</scope--> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> - <!--version>3.3.1.GA</version> - <scope>runtime</scope--> </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <!--version>3.4.GA</version> - <scope>runtime</scope--> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <!--version>1.5.2</version> - <scope>runtime</scope--> </dependency> <!-- BD H2 for testing --> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <!--version>1.1.104</version> - <scope>test</scope--> </dependency> </dependencies> @@ -86,7 +74,7 @@ <packaging>jar</packaging> <build> - + <testResources> <testResource> @@ -97,12 +85,12 @@ </testResource> <testResource> - <directory>${maven.gen.dir}/test-java</directory> + <directory>${test.gen.dir}/java</directory> <includes> <include>**/*.hbm.xml</include> </includes> </testResource> - + </testResources> <plugins> @@ -116,19 +104,9 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> <id>add-test-source</id> - <phase>process-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${maven.gen.dir}/test-java</source> - </sources> - </configuration> </execution> </executions> </plugin> @@ -142,15 +120,10 @@ <id>Test Generator</id> <phase>generate-test-sources</phase> <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/test-xmi/</srcXmiDest> - <fullPackagePath>org.codelutin.topia</fullPackagePath> - <extractedPackages>org.codelutin.topia</extractedPackages> - <!--Config generator--> - <srcGenDest>${maven.gen.dir}/test-objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>${maven.gen.dir}/test-java</destDirGen> + <fullPackagePath>org.codelutin.topia</fullPackagePath> + <extractedPackages>org.codelutin.topia</extractedPackages> <defaultPackage>org.codelutin.topia</defaultPackage> <extraClassPathDirectory>target/classes</extraClassPathDirectory> </configuration> @@ -160,7 +133,7 @@ <goal>generate</goal> </goals> </execution> - </executions> + </executions> </plugin> </plugins> </build> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-09 15:56:49 UTC (rev 1346) +++ topia/trunk/topia-ui/pom.xml 2009-02-09 19:41:35 UTC (rev 1347) @@ -25,7 +25,7 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> @@ -39,8 +39,6 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> - <!--version>5.0.18</version> - <scope>compile</scope--> </dependency> </dependencies> @@ -66,23 +64,13 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> - <id>add-test-source</id> - <phase>process-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/generated-test-sources/java</source> - </sources> - </configuration> + <id>add-test-source</id> </execution> </executions> </plugin> - + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-processor-plugin</artifactId> @@ -97,12 +85,8 @@ <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>target/generated-test-sources/xmi/</srcXmiDest> - <srcGenDest>target/generated-test-sources/models/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/generated-test-sources/java</destDirGen> <defaultPackage>org.codelutin.test</defaultPackage> </configuration> <goals> @@ -111,17 +95,13 @@ <goal>generate</goal> </goals> </execution> - + <execution> <id>generate-statemodel</id> <phase>generate-test-sources</phase> - <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>target/generated-test-sources/xmi/</srcXmiDest> - <srcGenDest>target/generated-test-sources/models/</srcGenDest> + <configuration> <includes>**/*.statemodel</includes> <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> - <destDirGen>target/generated-test-sources/java</destDirGen> <extraClassPathDirectory>target/classes</extraClassPathDirectory> </configuration> <goals> @@ -131,12 +111,13 @@ </goals> </execution> </executions> + <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </plugin>