branch develop updated (d3afd29 -> aec3f80)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository eugene. See http://git.nuiton.org/eugene.git from d3afd29 fixes #2937: Plugin fail to generate data if project is in a path containing a space Merge branch 'feature/2937' into develop new 9bd119f change default value of failIfUnsafe mojo parameter (refs #3489) new 150af48 Clean its (some tag values used were not safe (refs #3489) new aec3f80 fixes #3489: Change default configuration to fail in case of validation error by default Merge branch 'feature/3489' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit aec3f80b9a456e91b17596857ea3377f7fe6c7f0 Merge: d3afd29 150af48 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 24 15:35:00 2015 +0200 fixes #3489: Change default configuration to fail in case of validation error by default Merge branch 'feature/3489' into develop commit 150af48dc7eaed96f023173cbe864d071184a69c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 24 15:34:45 2015 +0200 Clean its (some tag values used were not safe (refs #3489) commit 9bd119f6b7435a00e3b9e1fbe76046ef9547e670 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 24 15:34:08 2015 +0200 change default value of failIfUnsafe mojo parameter (refs #3489) Summary of changes: eugene-maven-plugin/pom.xml | 5 +- .../src/it/evol-879/model/model-api/pom.xml | 4 - .../src/main/resources/models/topiatest.properties | 1 - .../src/it/evol-879/model/model-impl/pom.xml | 4 - .../src/main/models/topiatest.properties | 1 - .../src/it/evol-879/xmi/xmi-api/pom.xml | 4 - .../src/main/resources/xmi/topiatest.properties | 1 - .../src/it/evol-879/xmi/xmi-impl/pom.xml | 4 - .../src/it/evol-879/zargo/zargo-api/pom.xml | 4 - .../src/main/resources/xmi/topiatest.properties | 1 - .../src/it/evol-879/zargo/zargo-impl/pom.xml | 4 - .../zargo-impl/src/main/xmi/topiatest4.properties | 1 - .../testIncludeWithNoProtocol/pom.xml | 21 +- .../src/main/xmi/topiatest.properties | 1 - .../src/main/zargo/topiatest.properties | 1 - .../testIncludeWithOnlyProtocol/pom.xml | 19 +- eugene-maven-plugin/src/it/generate/all/pom.xml | 18 +- .../generate/all/src/main/xmi/topiatest.properties | 1 - .../all/src/main/zargo/topiatest.properties | 1 - .../src/it/generate/generators/pom.xml | 41 +--- .../src/it/generate/only-zargo-xmi/pom.xml | 225 ++++++++++----------- .../src/main/xmi/topiatest.properties | 1 - .../src/main/zargo/topiatest.properties | 1 - .../src/it/generate/only-zargo/pom.xml | 19 +- .../only-zargo/src/main/xmi/topiatest.properties | 1 - .../only-zargo/src/main/zargo/topiatest.properties | 1 - .../src/it/generate/only-zargo/verify.groovy | 1 - .../org/nuiton/eugene/plugin/GenerateMojo.java | 3 +- 28 files changed, 120 insertions(+), 269 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 9bd119f6b7435a00e3b9e1fbe76046ef9547e670 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 24 15:34:08 2015 +0200 change default value of failIfUnsafe mojo parameter (refs #3489) --- .../src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java index 305e893..4ede1e0 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java @@ -286,9 +286,10 @@ public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterCon /** * A flag to fail if model properties is not safe (means some tagValues or stereotypes are not correct). * + * <strong>Note:</strong> since version 3.0, the default value is {@code true}. * @since 2.9 */ - @Parameter(property = "eugene.failIfUnsafe", defaultValue = "false") + @Parameter(property = "eugene.failIfUnsafe", defaultValue = "true") protected boolean failIfUnsafe; /** -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit 150af48dc7eaed96f023173cbe864d071184a69c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 24 15:34:45 2015 +0200 Clean its (some tag values used were not safe (refs #3489) --- eugene-maven-plugin/pom.xml | 5 +- .../src/it/evol-879/model/model-api/pom.xml | 4 - .../src/main/resources/models/topiatest.properties | 1 - .../src/it/evol-879/model/model-impl/pom.xml | 4 - .../src/main/models/topiatest.properties | 1 - .../src/it/evol-879/xmi/xmi-api/pom.xml | 4 - .../src/main/resources/xmi/topiatest.properties | 1 - .../src/it/evol-879/xmi/xmi-impl/pom.xml | 4 - .../src/it/evol-879/zargo/zargo-api/pom.xml | 4 - .../src/main/resources/xmi/topiatest.properties | 1 - .../src/it/evol-879/zargo/zargo-impl/pom.xml | 4 - .../zargo-impl/src/main/xmi/topiatest4.properties | 1 - .../testIncludeWithNoProtocol/pom.xml | 21 +- .../src/main/xmi/topiatest.properties | 1 - .../src/main/zargo/topiatest.properties | 1 - .../testIncludeWithOnlyProtocol/pom.xml | 19 +- eugene-maven-plugin/src/it/generate/all/pom.xml | 18 +- .../generate/all/src/main/xmi/topiatest.properties | 1 - .../all/src/main/zargo/topiatest.properties | 1 - .../src/it/generate/generators/pom.xml | 41 +--- .../src/it/generate/only-zargo-xmi/pom.xml | 225 ++++++++++----------- .../src/main/xmi/topiatest.properties | 1 - .../src/main/zargo/topiatest.properties | 1 - .../src/it/generate/only-zargo/pom.xml | 19 +- .../only-zargo/src/main/xmi/topiatest.properties | 1 - .../only-zargo/src/main/zargo/topiatest.properties | 1 - .../src/it/generate/only-zargo/verify.groovy | 1 - 27 files changed, 118 insertions(+), 268 deletions(-) diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index d600ab5..b2e453f 100644 --- a/eugene-maven-plugin/pom.xml +++ b/eugene-maven-plugin/pom.xml @@ -266,9 +266,8 @@ <configuration> <pomIncludes> <pomInclude>evol-308/pom.xml</pomInclude> - <!--<pomInclude>evol-879/zargo/pom.xml</pomInclude>--> - <!--<pomInclude>evol-879/xmi/pom.xml</pomInclude>--> - <!--<pomInclude>copyVersionFiles/anomalie163/pom.xml</pomInclude>--> + <pomInclude>evol-879/zargo/pom.xml</pomInclude> + <pomInclude>evol-879/xmi/pom.xml</pomInclude> <pomInclude>generate/only-zargo/pom.xml</pomInclude> <pomInclude>generate/only-zargo-xmi/pom.xml</pomInclude> <pomInclude>generate/all/pom.xml</pomInclude> diff --git a/eugene-maven-plugin/src/it/evol-879/model/model-api/pom.xml b/eugene-maven-plugin/src/it/evol-879/model/model-api/pom.xml index cfaef4b..c94b7a6 100644 --- a/eugene-maven-plugin/src/it/evol-879/model/model-api/pom.xml +++ b/eugene-maven-plugin/src/it/evol-879/model/model-api/pom.xml @@ -27,10 +27,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.eugene.test</groupId> <artifactId>testEvol879-model</artifactId> diff --git a/eugene-maven-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties b/eugene-maven-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties +++ b/eugene-maven-plugin/src/it/evol-879/model/model-api/src/main/resources/models/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml b/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml index fe27c00..76142f5 100644 --- a/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml +++ b/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml @@ -27,10 +27,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.eugene.test</groupId> <artifactId>testEvol879-model</artifactId> diff --git a/eugene-maven-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties b/eugene-maven-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties +++ b/eugene-maven-plugin/src/it/evol-879/model/model-impl/src/main/models/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/evol-879/xmi/xmi-api/pom.xml b/eugene-maven-plugin/src/it/evol-879/xmi/xmi-api/pom.xml index f384d19..466a66a 100644 --- a/eugene-maven-plugin/src/it/evol-879/xmi/xmi-api/pom.xml +++ b/eugene-maven-plugin/src/it/evol-879/xmi/xmi-api/pom.xml @@ -27,10 +27,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.eugene.test</groupId> <artifactId>testEvol879-xmi</artifactId> diff --git a/eugene-maven-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties b/eugene-maven-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties +++ b/eugene-maven-plugin/src/it/evol-879/xmi/xmi-api/src/main/resources/xmi/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml b/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml index 7f6d889..96ff1fd 100644 --- a/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml +++ b/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml @@ -27,10 +27,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.eugene.test</groupId> <artifactId>testEvol879-xmi</artifactId> diff --git a/eugene-maven-plugin/src/it/evol-879/zargo/zargo-api/pom.xml b/eugene-maven-plugin/src/it/evol-879/zargo/zargo-api/pom.xml index 8cf2a6d..6ba8fab 100644 --- a/eugene-maven-plugin/src/it/evol-879/zargo/zargo-api/pom.xml +++ b/eugene-maven-plugin/src/it/evol-879/zargo/zargo-api/pom.xml @@ -27,10 +27,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.eugene.test</groupId> <artifactId>testEvol879-zargo</artifactId> diff --git a/eugene-maven-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties b/eugene-maven-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties +++ b/eugene-maven-plugin/src/it/evol-879/zargo/zargo-api/src/main/resources/xmi/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml b/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml index 9be6162..a075664 100644 --- a/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml +++ b/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml @@ -27,10 +27,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton.eugene.test</groupId> <artifactId>testEvol879-zargo</artifactId> diff --git a/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties b/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties +++ b/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/src/main/xmi/topiatest4.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml b/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml index 336ce04..9179193 100644 --- a/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml +++ b/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml @@ -27,12 +27,8 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <groupId>org.nuiton.eugene.test</groupId> - <artifactId>testIncludeWithOnlyProtocol</artifactId> + <artifactId>eugene-test-generate-includeWithOnlyProtocol</artifactId> <version>2.0.0</version> <dependencies> @@ -52,18 +48,7 @@ </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> + <name>EUGene Test :: generate-includeWithOnlyProtocol</name> <properties> @@ -87,7 +72,6 @@ <id>Zargo to object model</id> <phase>generate-sources</phase> <configuration> - <!--<modelType>objectmodel</modelType>--> <inputFiles> <inputFile>src/main/zargo:**/*.zargo</inputFile> </inputFiles> @@ -119,7 +103,6 @@ <id>Xmi to object model</id> <phase>generate-sources</phase> <configuration> - <!--<modelType>objectmodel</modelType>--> <inputFiles> <inputFile>src/main/xmi:**/*.xmi</inputFile> </inputFiles> diff --git a/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties b/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties +++ b/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/xmi/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties b/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties +++ b/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/src/main/zargo/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml b/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml index c0b4d23..d1f71c7 100644 --- a/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml +++ b/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml @@ -27,12 +27,8 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <groupId>org.nuiton.eugene.test</groupId> - <artifactId>testIncludeWithOnlyProtocol</artifactId> + <artifactId>euegene-test-generate-includeWithOnlyProtocol</artifactId> <version>2.0.0</version> <dependencies> @@ -52,18 +48,7 @@ </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> + <name>EUGene Test :: generate-includeWithOnlyProtocol</name> <properties> diff --git a/eugene-maven-plugin/src/it/generate/all/pom.xml b/eugene-maven-plugin/src/it/generate/all/pom.xml index 4c24c5b..643dba3 100644 --- a/eugene-maven-plugin/src/it/generate/all/pom.xml +++ b/eugene-maven-plugin/src/it/generate/all/pom.xml @@ -26,10 +26,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> @@ -56,18 +52,7 @@ </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> + <name>EUGene Test :: generate-all</name> <build> @@ -79,7 +64,6 @@ <version>${project.version}</version> <configuration> <verbose>true</verbose> - <!--<testPhase>true</testPhase>--> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <fullPackagePath>org.nuiton</fullPackagePath> <templates>org.nuiton.eugene.java.JavaBeanTransformer</templates> diff --git a/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties b/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties +++ b/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties b/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties +++ b/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate/generators/pom.xml b/eugene-maven-plugin/src/it/generate/generators/pom.xml index dca479c..6c51bf4 100644 --- a/eugene-maven-plugin/src/it/generate/generators/pom.xml +++ b/eugene-maven-plugin/src/it/generate/generators/pom.xml @@ -27,10 +27,6 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> @@ -38,7 +34,7 @@ </parent> <groupId>org.nuiton.test</groupId> - <artifactId>eugene-test-modelreader</artifactId> + <artifactId>eugene-test-generators</artifactId> <dependencies> <dependency> @@ -47,7 +43,7 @@ <version>${project.version}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -55,12 +51,7 @@ </dependency> </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>EUGene :: Test</name> + <name>EUGene :: generators</name> <description>Test module for generators.</description> <inceptionYear>2007</inceptionYear> @@ -75,12 +66,6 @@ </contributor> </contributors> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - <properties> <processorVersion>1.0.3</processorVersion> </properties> @@ -101,8 +86,7 @@ </executions> <configuration> <includes>**/*.java</includes> - <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter - </filters> + <filters>org.nuiton.processor.filters.GeneratorTemplatesFilter</filters> </configuration> </plugin> @@ -138,23 +122,6 @@ <goal>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>generate</goal> - </goals> - </execution--> </executions> <dependencies> <dependency> diff --git a/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml b/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml index eff8ff6..c23ac5c 100644 --- a/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml +++ b/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml @@ -24,126 +24,111 @@ <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> - - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - - <groupId>org.nuiton.eugene.test</groupId> - <artifactId>testIncludeWithOnlyProtocol</artifactId> - <version>2.0.0</version> - - <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${eugeneVersion}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - - </dependencies> - - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> - - <properties> - - <eugeneVersion>@pom.version@</eugeneVersion> - - <!-- default encoding --> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - </properties> - - <build> - - <plugins> - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <version>${eugeneVersion}</version> - <configuration> - <skipInputs>model</skipInputs> - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - </configuration> - <executions> - <execution> - <id>Zargo to object model</id> - <phase>generate-sources</phase> - <configuration> - <inputs>zargo:src/main/zargo:*.zargo</inputs> - <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>Zargo to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputs>zargo:src/main/zargo:*.zargo</inputs> - <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>Xmi to object model</id> - <phase>generate-sources</phase> - <configuration> - <inputs>xmi</inputs> - <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>Xmi to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputs>xmi</inputs> - <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.eugene.test</groupId> + <artifactId>generate-test-only-zargo-xmi</artifactId> + <version>2.0.0</version> + + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugeneVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + + </dependencies> + + <name>EUGene Test :: generate-only-zargo-xmi</name> + + <properties> + + <eugeneVersion>@pom.version@</eugeneVersion> + + <!-- default encoding --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + </properties> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${eugeneVersion}</version> + <configuration> + <skipInputs>model</skipInputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + </configuration> + <executions> + <execution> + <id>Zargo to object model</id> + <phase>generate-sources</phase> + <configuration> + <inputs>zargo:src/main/zargo:*.zargo</inputs> + <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Zargo to state model</id> + <phase>generate-sources</phase> + <configuration> + <modelType>statemodel</modelType> + <inputs>zargo:src/main/zargo:*.zargo</inputs> + <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to object model</id> + <phase>generate-sources</phase> + <configuration> + <inputs>xmi</inputs> + <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to state model</id> + <phase>generate-sources</phase> + <configuration> + <modelType>statemodel</modelType> + <inputs>xmi</inputs> + <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> </project> diff --git a/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties b/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties +++ b/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties b/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties +++ b/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml b/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml index 78d3b52..f87721b 100644 --- a/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml +++ b/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml @@ -27,12 +27,8 @@ <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <groupId>org.nuiton.eugene.test</groupId> - <artifactId>testIncludeWithOnlyProtocol</artifactId> + <artifactId>generate-test-only-zargo</artifactId> <version>2.0.0</version> <dependencies> @@ -52,18 +48,7 @@ </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>jar</packaging> + <name>EUGene Test :: generate-only-zargo</name> <properties> diff --git a/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties b/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties +++ b/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties b/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties index b75287a..5793295 100644 --- a/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties +++ b/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties @@ -19,4 +19,3 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagvalue.generateOperatorForDAOHelper=true diff --git a/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy b/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy index cf74e4f..5050f0b 100644 --- a/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy +++ b/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy @@ -20,7 +20,6 @@ * #L% */ - // Zargo to xmi assert new File(basedir, 'target/generated-sources-xmi').exists(); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See http://git.nuiton.org/eugene.git commit aec3f80b9a456e91b17596857ea3377f7fe6c7f0 Merge: d3afd29 150af48 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun May 24 15:35:00 2015 +0200 fixes #3489: Change default configuration to fail in case of validation error by default Merge branch 'feature/3489' into develop eugene-maven-plugin/pom.xml | 5 +- .../src/it/evol-879/model/model-api/pom.xml | 4 - .../src/main/resources/models/topiatest.properties | 1 - .../src/it/evol-879/model/model-impl/pom.xml | 4 - .../src/main/models/topiatest.properties | 1 - .../src/it/evol-879/xmi/xmi-api/pom.xml | 4 - .../src/main/resources/xmi/topiatest.properties | 1 - .../src/it/evol-879/xmi/xmi-impl/pom.xml | 4 - .../src/it/evol-879/zargo/zargo-api/pom.xml | 4 - .../src/main/resources/xmi/topiatest.properties | 1 - .../src/it/evol-879/zargo/zargo-impl/pom.xml | 4 - .../zargo-impl/src/main/xmi/topiatest4.properties | 1 - .../testIncludeWithNoProtocol/pom.xml | 21 +- .../src/main/xmi/topiatest.properties | 1 - .../src/main/zargo/topiatest.properties | 1 - .../testIncludeWithOnlyProtocol/pom.xml | 19 +- eugene-maven-plugin/src/it/generate/all/pom.xml | 18 +- .../generate/all/src/main/xmi/topiatest.properties | 1 - .../all/src/main/zargo/topiatest.properties | 1 - .../src/it/generate/generators/pom.xml | 41 +--- .../src/it/generate/only-zargo-xmi/pom.xml | 225 ++++++++++----------- .../src/main/xmi/topiatest.properties | 1 - .../src/main/zargo/topiatest.properties | 1 - .../src/it/generate/only-zargo/pom.xml | 19 +- .../only-zargo/src/main/xmi/topiatest.properties | 1 - .../only-zargo/src/main/zargo/topiatest.properties | 1 - .../src/it/generate/only-zargo/verify.groovy | 1 - .../org/nuiton/eugene/plugin/GenerateMojo.java | 3 +- 28 files changed, 120 insertions(+), 269 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm