Author: tchemit Date: 2009-02-11 19:58:38 +0000 (Wed, 11 Feb 2009) New Revision: 1358 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: suppression du plugin build-helper-maven-plugin car generator gere desormais la generation en phase test (utiliser la propriete testPhase) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -217,33 +217,10 @@ <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--> + <destDirGen>${test.gen.dir}/java</destDirGen> </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-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-persistence/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -100,18 +100,7 @@ <artifactId>maven-processor-plugin</artifactId> </plugin> - <!-- Add du répertoire de compilation des tests --> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> @@ -120,6 +109,7 @@ <id>Test Generator</id> <phase>generate-test-sources</phase> <configuration> + <testPhase>true</testPhase> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> <fullPackagePath>org.codelutin.topia</fullPackagePath> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-soa/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -42,52 +42,35 @@ <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-server</artifactId> - <!--version>3.1</version> - <scope>compile</scope--> </dependency> <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-client</artifactId> - <!--version>3.1</version> - <scope>compile</scope--> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <!--version>3.1</version> - <scope>runtime</scope--> </dependency> <dependency> <groupId>org.codehaus.xfire</groupId> <artifactId>xfire-java5</artifactId> - <!--version>1.2.6</version> - <exclusions--> - <!-- Fix org.apache.ant conflict) --> - <!--exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions--> </dependency> <!-- Dependencies for tests --> <dependency> <groupId>jetty</groupId> <artifactId>jetty</artifactId> - <!--version>5.1.10</version> - <scope>test</scope--> </dependency> <!-- Dependencies for class generation --> <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> - <!--version>1.5.3</version> - <scope>compile</scope--> </dependency> + </dependencies> <!-- ************************************************************* --> @@ -112,23 +95,7 @@ <artifactId>maven-processor-plugin</artifactId> </plugin> - <!-- Add du répertoire de compilation des tests --> <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> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> @@ -137,6 +104,7 @@ <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> + <testPhase>true</testPhase> <fullPackagePath>org.codelutin.soatest</fullPackagePath> <extractedPackages>org.codelutin.soatest</extractedPackages> <defaultPackage>org.codelutin.soatest</defaultPackage> @@ -153,7 +121,7 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> <scope>compile</scope> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-ui/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -60,18 +60,7 @@ <plugins> - <!-- Add du répertoire de compilation des tests --> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-processor-plugin</artifactId> </plugin> @@ -80,16 +69,22 @@ <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> + <configuration> + <testPhase>true</testPhase> + <fullPackagePath>org.codelutin.test</fullPackagePath> + <extractedPackages>org.codelutin.test</extractedPackages> + </configuration> <executions> <execution> <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> + <!--testPhase>true</testPhase> <fullPackagePath>org.codelutin.test</fullPackagePath> - <extractedPackages>org.codelutin.test</extractedPackages> + <extractedPackages>org.codelutin.test</extractedPackages--> + <defaultPackage>org.codelutin.test</defaultPackage> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <defaultPackage>org.codelutin.test</defaultPackage> </configuration> <goals> <goal>zargo2xmi</goal> @@ -102,8 +97,9 @@ <id>generate-statemodel</id> <phase>generate-test-sources</phase> <configuration> + <!--testPhase>true</testPhase> <fullPackagePath>org.codelutin.test</fullPackagePath> - <extractedPackages>org.codelutin.test</extractedPackages> + <extractedPackages>org.codelutin.test</extractedPackages--> <includes>**/*.statemodel</includes> <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> <extraClassPathDirectory>target/classes</extraClassPathDirectory> @@ -121,7 +117,8 @@ <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> - <scope>runtime</scope> + <!--scope>compile</scope--> + <!--scope>runtime</scope--> </dependency> </dependencies> </plugin>