Author: tchemit Date: 2010-05-08 18:50:20 +0200 (Sat, 08 May 2010) New Revision: 889 Url: http://nuiton.org/repositories/revision/eugene/889 Log: make its works with maven 3 Added: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/xmi/ trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/zargo/ Removed: trunk/maven-eugene-plugin/src/it/smart-generate/all/src/main/java/ trunk/maven-eugene-plugin/src/it/smart-generate/all/src/test/ Modified: trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml trunk/maven-eugene-plugin/src/it/settings.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml Modified: trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/copyVersionFiles/anomalie163/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -138,7 +138,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.3.0-beta-7</version> + <version>2.3</version> <scope>compile</scope> </dependency> <dependency> Modified: trunk/maven-eugene-plugin/src/it/settings.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/settings.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/settings.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -64,6 +64,18 @@ <enabled>true</enabled> </snapshots> </pluginRepository> + + <pluginRepository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> </pluginRepositories> </profile> </profiles> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -50,40 +50,24 @@ <build> <plugins> - - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> - </configuration> - </plugin> <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <version>${project.version}</version> <configuration> - <testPhase>true</testPhase> + <verbose>true</verbose> + <!--<testPhase>true</testPhase>--> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <fullPackagePath>org.nuiton</fullPackagePath> - <templates>org.nuiton.eugene.test.BeanTransformer</templates> + <templates>org.nuiton.eugene.java.JavaBeanTransformer</templates> </configuration> <executions> <execution> <id>Zargo to java</id> <phase>generate-test-sources</phase> <configuration> - <inputs>zargo:src/test/zargo:*.zargo</inputs> + <inputs>zargo:src/main/zargo:*.zargo</inputs> <outputDirectory>target/generated-sources-zargo2Java</outputDirectory> </configuration> <goals> @@ -105,7 +89,7 @@ <id>Model to java</id> <phase>generate-test-sources</phase> <configuration> - <inputs>model:target/generated-sources-zargo2Java/test-models:topiatest.objectmodel</inputs> + <inputs>model:target/generated-sources-zargo2Java/models:topiatest.objectmodel</inputs> <outputDirectory>target/generated-sources-objectModel2Java</outputDirectory> </configuration> <goals> Modified: trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/all/verify.groovy 2010-05-08 16:50:20 UTC (rev 889) @@ -2,46 +2,47 @@ // Zargo to java assert new File(basedir, 'target/generated-sources-zargo2Java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-xmi/topiatest.xmi').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/xmi/topiatest.xmi').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-zargo2Java/test-java/org/nuiton/topiatest/beangen/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-zargo2Java/java/org/nuiton/topiatest/beangen/Siege.java').exists(); // Xmi to java + assert new File(basedir, 'target/generated-sources-xmi2Java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-models/topiatest.objectmodel').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/models/topiatest.objectmodel').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-xmi2Java/test-java/org/nuiton/topiatest/beangen2/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-xmi2Java/java/org/nuiton/topiatest/beangen2/Siege.java').exists(); // ObjectModel to java assert new File(basedir, 'target/generated-sources-objectModel2Java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Voiture.java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Roue.java').exists(); -assert new File(basedir, 'target/generated-sources-objectModel2Java/test-java/org/nuiton/topiatest/beangen/Siege.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Voiture.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Roue.java').exists(); +assert new File(basedir, 'target/generated-sources-objectModel2Java/java/org/nuiton/topiatest/beangen/Siege.java').exists(); return true; Modified: trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2010-05-08 16:49:10 UTC (rev 888) +++ trunk/maven-eugene-plugin/src/it/smart-generate/generators/pom.xml 2010-05-08 16:50:20 UTC (rev 889) @@ -1,147 +1,152 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<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"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>@pom.version@</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>@pom.version@</version> + </parent> - <groupId>org.nuiton.test</groupId> - <artifactId>eugene-test-modelreader</artifactId> + <groupId>org.nuiton.test</groupId> + <artifactId>eugene-test-modelreader</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <name>EUGene :: Test</name> + <description>Test module for generators.</description> + <inceptionYear>2007</inceptionYear> - <name>EUGene :: Test</name> - <description>Test module for generators.</description> - <inceptionYear>2007</inceptionYear> + <contributors> + <contributor> + <name>Florian Desbois</name> + <email>fdesbois@codelutin.com</email> + <timezone>+2</timezone> + <roles> + <role>Developpeur</role> + </roles> + </contributor> + </contributors> - <contributors> - <contributor> - <name>Florian Desbois</name> - <email>fdesbois@codelutin.com</email> - <timezone>+2</timezone> - <roles> - <role>Developpeur</role> - </roles> - </contributor> - </contributors> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <packaging>jar</packaging> - <packaging>jar</packaging> + <properties> + <processor.version>1.0.3</processor.version> + </properties> + <build> - <build> + <plugins> - <plugins> + <plugin> + <groupId>org.nuiton.processor</groupId> + <artifactId>maven-processor-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <includes>**/*.java</includes> + <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter + </filters> + </configuration> + </plugin> - <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>maven-processor-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <includes>**/*.java</includes> - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> - </configuration> - </plugin> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <testPhase>true</testPhase> + <defaultPackage>org.nuiton.eugene.test</defaultPackage> + <generatedPackages>org.nuiton</generatedPackages> + </configuration> + <executions> + <execution> + <id>Test Regression Generator</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>model:src/test/models:dtotest.objectmodel</inputs> + <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + <execution> + <id>Test Bean Transformer</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>model:src/test/models:dtotest2.objectmodel</inputs> + <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + <!--execution> + <id>Test Java Generator</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>model</inputs> + <properties> + <propertie> + <key>reader</key> + <value>org.nuiton.eugene.test.generator.TestReader</value> + </propertie> + </properties> + <templates>org.nuiton.eugene.java.JavaGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution--> + </executions> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </plugin> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <testPhase>true</testPhase> - <defaultPackage>org.nuiton.eugene.test</defaultPackage> - <generatedPackages>org.nuiton</generatedPackages> - </configuration> - <executions> - <execution> - <id>Test Regression Generator</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>model:src/test/models:dtotest.objectmodel</inputs> - <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - <execution> - <id>Test Bean Transformer</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>model:src/test/models:dtotest2.objectmodel</inputs> - <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - <!--execution> - <id>Test Java Generator</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>model</inputs> - <properties> - <propertie> - <key>reader</key> - <value>org.nuiton.eugene.test.generator.TestReader</value> - </propertie> - </properties> - <templates>org.nuiton.eugene.java.JavaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution--> - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </plugin> + </plugins> - </plugins> + </build> - </build> - </project>