August 2012 - Eugene-commits - mailman.cloud.codelutin.com

r1178 - trunk
by tchemit＠users.nuiton.org 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:42:46 +0200 (Thu, 30 Aug 2012) New Revision: 1178 Url: http://nuiton.org/repositories/revision/eugene/1178 Log: Update mavenpom4redmineAndCentral to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-19 11:36:09 UTC (rev 1177) +++ trunk/pom.xml 2012-08-30 14:42:46 UTC (rev 1178) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.6</version> + <version>3.3.7</version> </parent> <artifactId>eugene</artifactId> @@ -528,12 +528,12 @@ <tasks> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd" /> + <include name="**/*.xsd"/> </fileset> </copy> <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd" /> + <include name="**/*.dtd"/> </fileset> </copy> </tasks>

1 0

r1177 - trunk/eugene-maven-plugin
by tchemit＠users.nuiton.org 19 Aug '12

19 Aug '12

Author: tchemit Date: 2012-08-19 13:36:09 +0200 (Sun, 19 Aug 2012) New Revision: 1177 Url: http://nuiton.org/repositories/revision/eugene/1177 Log: desactivate a it : too complex to mantain it Modified: trunk/eugene-maven-plugin/pom.xml Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2012-08-17 08:54:07 UTC (rev 1176) +++ trunk/eugene-maven-plugin/pom.xml 2012-08-19 11:36:09 UTC (rev 1177) @@ -229,7 +229,8 @@ <pomInclude>generate/only-zargo/pom.xml</pomInclude> <pomInclude>generate/only-zargo-xmi/pom.xml</pomInclude> <pomInclude>generate/all/pom.xml</pomInclude> - <pomInclude>generate/generators/pom.xml</pomInclude> +  +   <pomInclude>evol-879/model/pom.xml</pomInclude> </pomIncludes>

1 0

r1176 - branches
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 10:54:07 +0200 (Fri, 17 Aug 2012) New Revision: 1176 Url: http://nuiton.org/repositories/revision/eugene/1176 Log: no more used Removed: branches/eugene-2.0/

1 0

r1175 - branches
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 10:53:57 +0200 (Fri, 17 Aug 2012) New Revision: 1175 Url: http://nuiton.org/repositories/revision/eugene/1175 Log: no more used Removed: branches/eugene-2.4.3/

1 0

r1174 - in trunk: . ant-eugene-task ant-eugene-task/src/main/java/org/nuiton/eugene ant-eugene-task/src/test/java/org/nuiton/eugene eugene eugene/doc/1-javamodel eugene/doc/1-javamodel/sources eugene/doc/2-javabuilder eugene/src/main/java/org/nuiton/eugene/java eugene/src/main/java/org/nuiton/eugene/java/extension eugene/src/site eugene/src/site/fr/rst eugene/src/site/rst eugene/src/test/java/org/nuiton/eugene/java/extension eugene-maven-plugin eugene-maven-plugin/src/it eugene-maven-plugin
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 10:44:36 +0200 (Fri, 17 Aug 2012) New Revision: 1174 Url: http://nuiton.org/repositories/revision/eugene/1174 Log: merge from version 2.5 Added: trunk/eugene-maven-plugin/src/it/evol-308/goals.txt trunk/eugene-maven-plugin/src/it/evol-879/model/goals.txt trunk/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt trunk/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt trunk/eugene-maven-plugin/src/it/generate/ trunk/eugene-maven-plugin/src/it/generate/all/ trunk/eugene-maven-plugin/src/it/generate/all/LICENSE.txt trunk/eugene-maven-plugin/src/it/generate/all/README.txt trunk/eugene-maven-plugin/src/it/generate/all/changelog.txt trunk/eugene-maven-plugin/src/it/generate/all/goals.txt trunk/eugene-maven-plugin/src/it/generate/all/pom.xml trunk/eugene-maven-plugin/src/it/generate/all/src/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/resources/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.zargo trunk/eugene-maven-plugin/src/it/generate/all/verify.groovy trunk/eugene-maven-plugin/src/it/generate/generators/ trunk/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt trunk/eugene-maven-plugin/src/it/generate/generators/README.txt trunk/eugene-maven-plugin/src/it/generate/generators/changelog.txt trunk/eugene-maven-plugin/src/it/generate/generators/goals.txt trunk/eugene-maven-plugin/src/it/generate/generators/pom.xml trunk/eugene-maven-plugin/src/it/generate/generators/src/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties trunk/eugene-maven-plugin/src/it/generate/generators/src/test/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties trunk/eugene-maven-plugin/src/it/generate/generators/verify.groovy trunk/eugene-maven-plugin/src/it/generate/goals.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.zargo trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy trunk/eugene-maven-plugin/src/it/generate/only-zargo/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/README.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/resources/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.zargo trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.zargo trunk/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java Removed: trunk/eugene-maven-plugin/src/it/evol-308/invoker.properties trunk/eugene-maven-plugin/src/it/evol-879/model/invoker.properties trunk/eugene-maven-plugin/src/it/evol-879/xmi/invoker.properties trunk/eugene-maven-plugin/src/it/evol-879/zargo/invoker.properties trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties trunk/eugene-maven-plugin/src/it/generate/all/ trunk/eugene-maven-plugin/src/it/generate/all/LICENSE.txt trunk/eugene-maven-plugin/src/it/generate/all/README.txt trunk/eugene-maven-plugin/src/it/generate/all/changelog.txt trunk/eugene-maven-plugin/src/it/generate/all/goals.txt trunk/eugene-maven-plugin/src/it/generate/all/pom.xml trunk/eugene-maven-plugin/src/it/generate/all/src/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/resources/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/ trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.zargo trunk/eugene-maven-plugin/src/it/generate/all/verify.groovy trunk/eugene-maven-plugin/src/it/generate/generators/ trunk/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt trunk/eugene-maven-plugin/src/it/generate/generators/README.txt trunk/eugene-maven-plugin/src/it/generate/generators/changelog.txt trunk/eugene-maven-plugin/src/it/generate/generators/goals.txt trunk/eugene-maven-plugin/src/it/generate/generators/pom.xml trunk/eugene-maven-plugin/src/it/generate/generators/src/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties trunk/eugene-maven-plugin/src/it/generate/generators/src/test/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties trunk/eugene-maven-plugin/src/it/generate/generators/verify.groovy trunk/eugene-maven-plugin/src/it/generate/goals.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.zargo trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy trunk/eugene-maven-plugin/src/it/generate/only-zargo/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/README.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt trunk/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/resources/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.zargo trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.zargo trunk/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy trunk/eugene-maven-plugin/src/it/smart-generate/ Modified: trunk/ trunk/ant-eugene-task/pom.xml trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java trunk/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java trunk/eugene-maven-plugin/ trunk/eugene-maven-plugin/pom.xml trunk/eugene-maven-plugin/src/it/evol-308/pom.xml trunk/eugene-maven-plugin/src/it/evol-879/model/README.txt trunk/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml trunk/eugene-maven-plugin/src/it/evol-879/xmi/README.txt trunk/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml trunk/eugene-maven-plugin/src/it/evol-879/zargo/README.txt trunk/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml trunk/eugene-maven-plugin/src/license/THIRD-PARTY.properties trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java trunk/eugene-maven-plugin/src/site/fr/rst/example.rst.vm trunk/eugene-maven-plugin/src/site/fr/rst/index.rst trunk/eugene-maven-plugin/src/site/fr/rst/usage.rst trunk/eugene-maven-plugin/src/site/rst/example.rst.vm trunk/eugene-maven-plugin/src/site/rst/index.rst trunk/eugene-maven-plugin/src/site/rst/usage.rst trunk/eugene-maven-plugin/src/site/site_en.xml trunk/eugene-maven-plugin/src/site/site_fr.xml trunk/eugene/doc/1-javamodel/ trunk/eugene/doc/1-javamodel/sources/ trunk/eugene/doc/2-javabuilder/ trunk/eugene/pom.xml trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java trunk/eugene/src/site/fr/rst/DevUIDoc.rst trunk/eugene/src/site/fr/rst/DiscussionSurTypeDeGeneration.rst trunk/eugene/src/site/fr/rst/Todo.rst trunk/eugene/src/site/fr/rst/index.rst trunk/eugene/src/site/fr/rst/plugineclipse.rst trunk/eugene/src/site/rst/LutinGenerator.rst trunk/eugene/src/site/rst/generatorHelp.rst trunk/eugene/src/site/rst/index.rst trunk/eugene/src/site/site_en.xml trunk/eugene/src/site/site_fr.xml trunk/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerTest.java trunk/pom.xml trunk/src/site/fr/rst/01-introduction.rst trunk/src/site/fr/rst/02-objectmodel.rst trunk/src/site/fr/rst/03-generation.rst trunk/src/site/fr/rst/04-templates.rst trunk/src/site/fr/rst/05-execution.rst.vm trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst trunk/src/site/fr/rst/07-glossaire.rst trunk/src/site/fr/rst/08-FAQ.rst trunk/src/site/fr/rst/09-tutoriel-index.rst trunk/src/site/fr/rst/eugene-plan.rst trunk/src/site/fr/rst/index.rst trunk/src/site/resources/objectmodel/Hotel.objectmodel.png trunk/src/site/resources/objectmodel/Hotel.png trunk/src/site/resources/objectmodel/ObjectModel.png trunk/src/site/resources/objectmodel/ObjectModel_Generator.png trunk/src/site/resources/objectmodel/ObjectModel_Interfaces.png trunk/src/site/rst/01-introduction.rst trunk/src/site/rst/02-objectmodel.rst trunk/src/site/rst/03-generation.rst trunk/src/site/rst/04-templates.rst trunk/src/site/rst/05-execution.rst.vm trunk/src/site/rst/06-fonctionnalites-avancees.rst trunk/src/site/rst/07-glossaire.rst trunk/src/site/rst/08-FAQ.rst trunk/src/site/rst/09-tutoriel-index.rst trunk/src/site/rst/index.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754 + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754 /branches/eugene-2.4.3:1151-1173 Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/ant-eugene-task/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java =================================================================== --- trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/ant-eugene-task/src/main/java/org/nuiton/eugene/GeneratorTask.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -48,6 +48,7 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import org.apache.commons.io.FileUtils; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; @@ -444,7 +445,7 @@ File propertyOutputFile = new File(outputDirectory, propertyFile.getName()); try { - FileUtil.copy(propertyFile, propertyOutputFile); + FileUtils.copyFile(propertyFile, propertyOutputFile); } catch (IOException ioe) { log("Cannot copy .properties file", ioe, Project.MSG_ERR); Modified: trunk/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java =================================================================== --- trunk/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/ant-eugene-task/src/test/java/org/nuiton/eugene/GeneratorTaskTest.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -28,6 +28,7 @@ import java.io.File; import java.io.IOException; +import org.apache.commons.io.FileUtils; import org.apache.tools.ant.BuildLogger; import org.apache.tools.ant.NoBannerLogger; import org.apache.tools.ant.Project; @@ -112,7 +113,7 @@ ).exists()); // remove created temp dir - FileUtil.deleteRecursively(destDirGen); + FileUtils.deleteDirectory(destDirGen); } /** @@ -148,7 +149,7 @@ // TODO Check result // remove created temp dir - FileUtil.deleteRecursively(destDirGen); + FileUtils.deleteDirectory(destDirGen); } /** @@ -183,7 +184,7 @@ // TODO Check result // remove created temp dir - FileUtil.deleteRecursively(destDirGen); + FileUtils.deleteDirectory(destDirGen); } /** @@ -230,6 +231,6 @@ } // remove created temp dir - FileUtil.deleteRecursively(destDirGen); + FileUtils.deleteDirectory(destDirGen); } } Property changes on: trunk/eugene/doc/1-javamodel ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/doc/1-javamodel:641-651 /branches/eugene-2.0/eugene/doc/1-javamodel:682-754 + /branches/1.0.1-Javabuilder/eugene/doc/1-javamodel:641-651 /branches/eugene-2.0/eugene/doc/1-javamodel:682-754 /branches/eugene-2.4.3/eugene/doc/1-javamodel:1151-1173 Property changes on: trunk/eugene/doc/1-javamodel/sources ___________________________________________________________________ Modified: svn:mergeinfo - + /branches/eugene-2.4.3/eugene/doc/1-javamodel/sources:1151-1173 Property changes on: trunk/eugene/doc/2-javabuilder ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/doc/2-javabuilder:641-651 /branches/eugene-2.0/eugene/doc/2-javabuilder:682-754 + /branches/1.0.1-Javabuilder/eugene/doc/2-javabuilder:641-651 /branches/eugene-2.0/eugene/doc/2-javabuilder:682-754 /branches/eugene-2.4.3/eugene/doc/2-javabuilder:1151-1173 Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java:641-651 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java:682-754 + /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java:641-651 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java:682-754 /branches/eugene-2.4.3/eugene/src/main/java/org/nuiton/eugene/java/JavaBuilder.java:1151-1173 Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java:641-651 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java:682-754 + /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java:641-651 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java:682-754 /branches/eugene-2.4.3/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java:1151-1173 Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java:641-651 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java:682-754 + /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java:641-651 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java:682-754 /branches/eugene-2.4.3/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java:1151-1173 Property changes on: trunk/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:641-651 /branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:652-681 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:682-754 + /branches/1.0.1-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:641-651 /branches/1.1.0-Javabuilder/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:652-681 /branches/eugene-2.0/eugene/src/main/java/org/nuiton/eugene/ImportsManager.java:682-754 /branches/eugene-2.4.3/eugene/src/main/java/org/nuiton/eugene/java/extension/ImportsManager.java:1151-1173 Modified: trunk/eugene/src/site/fr/rst/DevUIDoc.rst =================================================================== --- trunk/eugene/src/site/fr/rst/DevUIDoc.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/fr/rst/DevUIDoc.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ======= UIModel ======= Modified: trunk/eugene/src/site/fr/rst/DiscussionSurTypeDeGeneration.rst =================================================================== --- trunk/eugene/src/site/fr/rst/DiscussionSurTypeDeGeneration.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/fr/rst/DiscussionSurTypeDeGeneration.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ========================= Principe de la génération ========================= Modified: trunk/eugene/src/site/fr/rst/Todo.rst =================================================================== --- trunk/eugene/src/site/fr/rst/Todo.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/fr/rst/Todo.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ==== TODO ==== Modified: trunk/eugene/src/site/fr/rst/index.rst =================================================================== --- trunk/eugene/src/site/fr/rst/index.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/fr/rst/index.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ====== Eugene ====== Modified: trunk/eugene/src/site/fr/rst/plugineclipse.rst =================================================================== --- trunk/eugene/src/site/fr/rst/plugineclipse.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/fr/rst/plugineclipse.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ===================================== Installation du plugin LutinGenerator ===================================== Modified: trunk/eugene/src/site/rst/LutinGenerator.rst =================================================================== --- trunk/eugene/src/site/rst/LutinGenerator.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/rst/LutinGenerator.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ====== Eugene ====== Modified: trunk/eugene/src/site/rst/generatorHelp.rst =================================================================== --- trunk/eugene/src/site/rst/generatorHelp.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/rst/generatorHelp.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============== Generator Help ============== Modified: trunk/eugene/src/site/rst/index.rst =================================================================== --- trunk/eugene/src/site/rst/index.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/rst/index.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ====== Eugene ====== Modified: trunk/eugene/src/site/site_en.xml =================================================================== --- trunk/eugene/src/site/site_en.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/site_en.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -26,69 +26,75 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <body> - - <breadcrumbs> - <item name="${project.name}" href="index.html" /> -  - </breadcrumbs> + <body> - <links> - <item name="[fr" href="fr/index.html" /> - <item name="en]" href="index.html" /> - </links> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> - <menu ref="parent"/> - - <menu name="User"> - <item href="index.html" name="Home"/> - </menu> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> +  + </breadcrumbs> - <menu name="Downloads"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Library (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - <item href="http://${platform}/projects/eugene/files" name="Archives" /> - </menu> + <links> + <item name="[fr" href="fr/index.html"/> + <item name="en]" href="index.html"/> + </links> - <menu name="Trackers"> - <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> - <item name="Evolutions" href="${project.issueManagement.url}?query_id=1"/> - <item name="Help" href="${project.issueManagement.url}?query_id=3"/> - </menu> + <menu ref="parent"/> - <menu name="Links"> - <item name="Nuiton-processor" href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> - </menu> + <menu name="User"> + <item href="index.html" name="Home"/> + </menu> - <menu ref="reports"/> + <menu name="Downloads"> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Library (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="http://${platform}/projects/eugene/files" name="Archives"/> + </menu> - <footer> + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> + <item name="Evolutions" href="${project.issueManagement.url}?query_id=1"/> + <item name="Help" href="${project.issueManagement.url}?query_id=3"/> + </menu> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu name="Links"> + <item name="Nuiton-processor" + href="http://maven-site.nuiton.org/processor"/> + <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + </menu> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <menu ref="reports"/> - </body> + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: trunk/eugene/src/site/site_fr.xml =================================================================== --- trunk/eugene/src/site/site_fr.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene/src/site/site_fr.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -26,81 +26,87 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <body> - - <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/eugene/index.html" /> - </breadcrumbs> + <body> - <links> - <item name="[fr" href="index.html" /> - <item name="en]" href="../index.html" /> - </links> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> -  -  - <menu name="Parent Projet"> - <item name="Eugene" href="../../fr/index.html"/> - </menu> + <breadcrumbs> + <item name="${project.name}" + href="http://maven-site.nuiton.org/eugene/eugene/index.html"/> + </breadcrumbs> - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - <item href="DiscussionSurTypeDeGeneration.html" name="Génération"/> - <item href="FAQ.html" name="FAQ"/> - </menu> - - <menu name="Developpeur"> - <item name="ObjectModel" href="ObjectModel.html"/> - <item name="UIModel" href="DevUIDoc.html"/> - <item name="Plugin Eclipse" href="plugineclipse.html"/> - <item name="Todo" href="Todo.html"/> - </menu> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="../index.html"/> + </links> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - <item href="http://${platform}/projects/eugene/files" name="Archives" /> - </menu> +  +  + <menu name="Parent Projet"> + <item name="Eugene" href="../../fr/index.html"/> + </menu> - <menu name="Trackers"> - <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> - <item name="Améliorations" href="${project.issueManagement.url}?query_id=1"/> - <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> - </menu> + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + <item href="DiscussionSurTypeDeGeneration.html" name="Génération"/> + </menu> - <menu name="Liens"> - <item name="Nuiton-processor" href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> - </menu> + <menu name="Developpeur"> + <item name="UIModel" href="DevUIDoc.html"/> + <item name="Plugin Eclipse" href="plugineclipse.html"/> + <item name="Todo" href="Todo.html"/> + </menu> - <menu ref="reports"/> + <menu name="Téléchargement"> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + <item href="http://${platform}/projects/eugene/files" name="Archives"/> + </menu> - <footer> + <menu name="Trackers"> + <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> + <item name="Améliorations" + href="${project.issueManagement.url}?query_id=1"/> + <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + </menu> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu name="Liens"> + <item name="Nuiton-processor" + href="http://maven-site.nuiton.org/processor"/> + <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + </menu> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <menu ref="reports"/> - </body> + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Property changes on: trunk/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerTest.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:641-651 /branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:652-681 /branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:682-754 + /branches/1.0.1-Javabuilder/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:641-651 /branches/1.1.0-Javabuilder/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:652-681 /branches/eugene-2.0/eugene/src/test/java/org/nuiton/eugene/ImportsManagerTest.java:682-754 /branches/eugene-2.4.3/eugene/src/test/java/org/nuiton/eugene/java/extension/ImportsManagerTest.java:1151-1173 Property changes on: trunk/eugene-maven-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/maven-eugene-plugin:641-651 /branches/1.1.0-Javabuilder/maven-eugene-plugin:652-681 /branches/eugene-2.0/maven-eugene-plugin:682-754 + /branches/1.0.1-Javabuilder/maven-eugene-plugin:641-651 /branches/1.1.0-Javabuilder/maven-eugene-plugin:652-681 /branches/eugene-2.0/maven-eugene-plugin:682-754 /branches/eugene-2.4.3/eugene-maven-plugin:1151-1173 Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> @@ -96,6 +96,11 @@ </dependency> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> @@ -118,7 +123,7 @@  <name>EUGene :: Maven plugin</name> <inceptionYear>2006</inceptionYear> - <description>maven plugin to use the eugene library</description> + <description>Maven plugin to use the eugene library</description>   @@ -127,6 +132,27 @@ <build> + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </pluginManagement> + <plugins>  @@ -150,35 +176,6 @@  <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - - <plugins> - -  - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </profile> - -  - <profile> <id>reporting</id> <activation> <property> @@ -226,15 +223,15 @@ <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>generate/only-zargo/pom.xml</pomInclude> + <pomInclude>generate/only-zargo-xmi/pom.xml</pomInclude> + <pomInclude>generate/all/pom.xml</pomInclude> + <pomInclude>generate/generators/pom.xml</pomInclude> +  + <pomInclude>evol-879/model/pom.xml</pomInclude> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${basedir}/target/local-repo Copied: trunk/eugene-maven-plugin/src/it/evol-308/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-308/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-308/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/evol-308/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean test \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/evol-308/invoker.properties =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-308/invoker.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-308/invoker.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,25 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2011 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -invoker.goals=clean test \ No newline at end of file Modified: trunk/eugene-maven-plugin/src/it/evol-308/pom.xml =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-308/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-308/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -79,7 +79,7 @@ <execution> <phase>generate-sources</phase> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Modified: trunk/eugene-maven-plugin/src/it/evol-879/model/README.txt =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/model/README.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/model/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,4 +1,4 @@ -On teste ici le goal smart-generate avec un fichier model dans le class-path : +On teste ici le goal generate avec un fichier model dans le class-path : Le résultat désiré est : Copied: trunk/eugene-maven-plugin/src/it/evol-879/model/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/model/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/model/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/evol-879/model/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean install \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/evol-879/model/invoker.properties =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/model/invoker.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/model/invoker.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean install - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: trunk/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/model/model-impl/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -46,12 +46,12 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.4.1</version> + <version>2.5.3</version> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.4.3</version> + <version>${topiaVersion}</version> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -68,6 +68,9 @@ <name>EUGene Test :: testEvol879-model-impl</name> + <properties> + <topiaVersion>2.6.11</topiaVersion> + </properties> <build> <plugins> @@ -97,7 +100,7 @@ <extractDirectory>target/extracted-sources1</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -111,7 +114,7 @@ <extractDirectory>target/extracted-sources2</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -124,7 +127,7 @@ <extractDirectory>target/extracted-sources3</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -137,7 +140,7 @@ <extractDirectory>target/extracted-sources4</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -155,7 +158,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>2.4.3</version> + <version>${topiaVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/eugene-maven-plugin/src/it/evol-879/xmi/README.txt =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/xmi/README.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/xmi/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,4 +1,4 @@ -On teste ici le goal smart-generate avec un fichier xmi dans le class-path : +On teste ici le goal generate avec un fichier xmi dans le class-path : Le result désiré est : Copied: trunk/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/evol-879/xmi/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean install \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/evol-879/xmi/invoker.properties =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/xmi/invoker.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/xmi/invoker.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean install - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: trunk/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/xmi/xmi-impl/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -75,7 +75,7 @@ <extractDirectory>target/extracted-sources1</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -88,7 +88,7 @@ <extractDirectory>target/extracted-sources2</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -100,7 +100,7 @@ <extractDirectory>target/extracted-sources3</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -114,7 +114,7 @@ <extractDirectory>target/extracted-sources4</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -126,7 +126,7 @@ <extractDirectory>target/extracted-sources5</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -139,7 +139,7 @@ <extractDirectory>target/extracted-sources6</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -151,7 +151,7 @@ <extractDirectory>target/extracted-sources7</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -163,7 +163,7 @@ <extractDirectory>target/extracted-sources8</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -175,7 +175,7 @@ <extractDirectory>target/extracted-sources9</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Modified: trunk/eugene-maven-plugin/src/it/evol-879/zargo/README.txt =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/zargo/README.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/zargo/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,4 +1,4 @@ -On teste ici le goal smart-generate avec un fichier zargo dans le class-path : +On teste ici le goal generate avec un fichier zargo dans le class-path : Le result doit être Copied: trunk/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/evol-879/zargo/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean install \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/evol-879/zargo/invoker.properties =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/zargo/invoker.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/zargo/invoker.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean install - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: trunk/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml =================================================================== --- trunk/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/evol-879/zargo/zargo-impl/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -75,7 +75,7 @@ <extractDirectory>target/extracted-sources1</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -88,7 +88,7 @@ <extractDirectory>target/extracted-sources2</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -100,7 +100,7 @@ <extractDirectory>target/extracted-sources3</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -114,7 +114,7 @@ <extractDirectory>target/extracted-sources4</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -126,7 +126,7 @@ <extractDirectory>target/extracted-sources5</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -139,7 +139,7 @@ <extractDirectory>target/extracted-sources6</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -151,7 +151,7 @@ <extractDirectory>target/extracted-sources7</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -163,7 +163,7 @@ <extractDirectory>target/extracted-sources8</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -175,7 +175,7 @@ <extractDirectory>target/extracted-sources9</extractDirectory> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Deleted: trunk/eugene-maven-plugin/src/it/generate/all/LICENSE.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/LICENSE.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/LICENSE.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,166 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. - Copied: trunk/eugene-maven-plugin/src/it/generate/all/LICENSE.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/LICENSE.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/LICENSE.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/LICENSE.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Deleted: trunk/eugene-maven-plugin/src/it/generate/all/README.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/README.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,2 +0,0 @@ -To deploy new version of pom: mvn deploy -To install localy: mvn install Copied: trunk/eugene-maven-plugin/src/it/generate/all/README.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/README.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/README.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Deleted: trunk/eugene-maven-plugin/src/it/generate/all/changelog.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/changelog.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/changelog.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,53 +0,0 @@ -1.0.0 xxx xxx - * Add multiple models loading and restricted package generation - * Recode EugenePlugin without ant - * Move to org.nuiton groupid - * Rename project to Eugene - -0.64 chemit 20090218 - * 20090211 [chatellier] add testPhase property in mojo to specify when using it in test phase - * 20090210 [chatellier] add info and debug maven log messages - * 20090210 [chatellier] add default value on all non required parameters - * 20090209 [chemit] fix bug when using sibling dependencies in a multi-module project - * 20090129 [chemit] use lutinproject 3.4 (suppress javadoc plugin invocation) - -0.63 chemit 20081215 - * 20081215 [chemit] follow lutingenerator release - -0.62 chemit 20081210 - * 20081210 [chemit] use lutinpluginproject 3.2 - * 20081203 [chemit] add a encoding goal property to be dispatched in all generator to control file generation encoding - * 20081118 [chemit] use lutinproject 3.1 - * 20081117 [chemit] - - add extraClassPathDirectory parameter to can specify an extra directory to add in classLoader - - bump lutingenerator version - -0.61 chatellier 20081114 - * 20081107 [chatellier] - - add test compile dir and test resources in generation gaol - * 20081101 [chemit] - - add an excludeTemplates property on GeneratorPlugin to permit exclusion of generators for some composite generator - - bump lutingenerator to 0.61 - -0.60 chemit 20081013 - * 20081013 [chemit] - - remove addCompileDirectory option (always done) + add dynamic resources - - use lutingenerator 0.60 - - clean pom - -0.51 thimel 20080925 - * 20080925 [thimel] Refactor pom using the correct architecture - * 20080925 [thimel] Switched License to LGPL - * 20080723 [chemit] - - add generated sources in maven project's compilation directories via addCompilationDirectory plugin property - - * 20070525 [chatellier] - - add Xmi2StateModel goal - - improve Xmi2Model Hierarchy - * 20070525 [chatellier] update ant dependency to 1.7.0 - * 20070525 [chatellier] replacing lutinxml.XSLAntTask by Ant.XSLTProcess - -0.50 ??? ??? - - * 20070420 [chatellier] add goal to copy a set of generated files - * 20070420 [chatellier] update lutingenerator depencency to 0.50 \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/all/changelog.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/changelog.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/changelog.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/changelog.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,53 @@ +1.0.0 xxx xxx + * Add multiple models loading and restricted package generation + * Recode EugenePlugin without ant + * Move to org.nuiton groupid + * Rename project to Eugene + +0.64 chemit 20090218 + * 20090211 [chatellier] add testPhase property in mojo to specify when using it in test phase + * 20090210 [chatellier] add info and debug maven log messages + * 20090210 [chatellier] add default value on all non required parameters + * 20090209 [chemit] fix bug when using sibling dependencies in a multi-module project + * 20090129 [chemit] use lutinproject 3.4 (suppress javadoc plugin invocation) + +0.63 chemit 20081215 + * 20081215 [chemit] follow lutingenerator release + +0.62 chemit 20081210 + * 20081210 [chemit] use lutinpluginproject 3.2 + * 20081203 [chemit] add a encoding goal property to be dispatched in all generator to control file generation encoding + * 20081118 [chemit] use lutinproject 3.1 + * 20081117 [chemit] + - add extraClassPathDirectory parameter to can specify an extra directory to add in classLoader + - bump lutingenerator version + +0.61 chatellier 20081114 + * 20081107 [chatellier] + - add test compile dir and test resources in generation gaol + * 20081101 [chemit] + - add an excludeTemplates property on GeneratorPlugin to permit exclusion of generators for some composite generator + - bump lutingenerator to 0.61 + +0.60 chemit 20081013 + * 20081013 [chemit] + - remove addCompileDirectory option (always done) + add dynamic resources + - use lutingenerator 0.60 + - clean pom + +0.51 thimel 20080925 + * 20080925 [thimel] Refactor pom using the correct architecture + * 20080925 [thimel] Switched License to LGPL + * 20080723 [chemit] + - add generated sources in maven project's compilation directories via addCompilationDirectory plugin property + + * 20070525 [chatellier] + - add Xmi2StateModel goal + - improve Xmi2Model Hierarchy + * 20070525 [chatellier] update ant dependency to 1.7.0 + * 20070525 [chatellier] replacing lutinxml.XSLAntTask by Ant.XSLTProcess + +0.50 ??? ??? + + * 20070420 [chatellier] add goal to copy a set of generated files + * 20070420 [chatellier] update lutingenerator depencency to 0.50 \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/all/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/goals.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1 +0,0 @@ -clean generate-test-sources \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/all/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean generate-test-sources \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/all/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,138 +0,0 @@ -<?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" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>@pom.version@</version> - </parent> - - <groupId>org.nuiton.test</groupId> - <artifactId>eugene-test-generate-all</artifactId> - - <dependencies> - <dependency> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>${project.version}</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 :: testIncludeWithOnlyProtocol</name> - -  -  -  - - <packaging>jar</packaging> - - <build> - - <plugins> - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <verbose>true</verbose> -  - <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> - <fullPackagePath>org.nuiton</fullPackagePath> - <templates>org.nuiton.eugene.java.JavaBeanTransformer</templates> - </configuration> - <executions> - <execution> - <id>Zargo to java</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>zargo:src/main/zargo:*.zargo</inputs> - <outputDirectory>target/generated-sources-zargo2Java</outputDirectory> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>Xmi to java</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>xmi</inputs> - <outputDirectory>target/generated-sources-xmi2Java</outputDirectory> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>Model to java</id> - <phase>generate-test-sources</phase> - <configuration> - <inputs>model:target/generated-sources-zargo2Java/models:topiatest.objectmodel</inputs> - <outputDirectory>target/generated-sources-objectModel2Java</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> - - Copied: trunk/eugene-maven-plugin/src/it/generate/all/pom.xml (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/pom.xml) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/pom.xml (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,138 @@ +<?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" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>@pom.version@</version> + </parent> + + <groupId>org.nuiton.test</groupId> + <artifactId>eugene-test-generate-all</artifactId> + + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${project.version}</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 :: testIncludeWithOnlyProtocol</name> + +  +  +  + + <packaging>jar</packaging> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <verbose>true</verbose> +  + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + <fullPackagePath>org.nuiton</fullPackagePath> + <templates>org.nuiton.eugene.java.JavaBeanTransformer</templates> + </configuration> + <executions> + <execution> + <id>Zargo to java</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>zargo:src/main/zargo:*.zargo</inputs> + <outputDirectory>target/generated-sources-zargo2Java</outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to java</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>xmi</inputs> + <outputDirectory>target/generated-sources-xmi2Java</outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Model to java</id> + <phase>generate-test-sources</phase> + <configuration> + <inputs>model:target/generated-sources-zargo2Java/models:topiatest.objectmodel</inputs> + <outputDirectory>target/generated-sources-objectModel2Java</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> + + Deleted: trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,25 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,1334 +0,0 @@ -<?xml version = '1.0' encoding = 'UTF-8' ?> -<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:56:54 CEST 2009'> - <XMI.header> <XMI.documentation> - <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> - <XMI.exporterVersion>0.28.1(6) revised on $Date$ </XMI.exporterVersion> - </XMI.documentation> - <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> - <XMI.content> - <UML:Model xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000077B' - name = 'xmiTopiaTest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E3' - isSpecification = 'false'> - <UML:TaggedValue.dataValue>1.2</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4'/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Namespace.ownedElement> - <UML:TagDefinition xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4' - name = 'version' isSpecification = 'false' tagType = 'String'> - <UML:TagDefinition.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E6'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E5' - lower = '0' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:TagDefinition.multiplicity> - </UML:TagDefinition> - <UML:Stereotype xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7' - name = 'entity' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> - </UML:Stereotype> - <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090B' - name = 'org' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090C' - name = 'nuiton' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090D' - name = 'topiatest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA' - name = 'Personne' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:GeneralizableElement.generalization> - <UML:Generalization xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001020'/> - </UML:GeneralizableElement.generalization> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF9' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFD'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFC' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB0' - name = 'otherNames' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB8'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB7' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE' - name = 'Employe' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:GeneralizableElement.generalization> - <UML:Generalization xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E2'/> - </UML:GeneralizableElement.generalization> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D54' - name = 'salary' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5A'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D59' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0' - name = 'Company' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011BD' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011C5'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011C4' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008F9' - name = 'Address' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000903' - name = 'city' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF7'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF6' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CE8' - name = 'adress' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF3'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF2' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FB' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FC' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FD'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FE' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FF' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000900'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000901' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008F9'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Generalization xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E2' - isSpecification = 'false'> - <UML:Generalization.child> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:Generalization.parent> - </UML:Generalization> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFE' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFF' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102B' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D02' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102A'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001029' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B' - name = 'Department' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D25' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D29'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D28' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A' - name = 'Product' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D37' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D3F'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D3E' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5B' - name = 'Store' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D7D' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D83'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D82' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D40' - name = 'Type' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4D' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D53'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D52' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:AssociationClass xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D65' - name = 'Bill' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D66' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D89'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D88' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D69' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D8D'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D8C' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D6D' - name = 'cost' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D75'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D74' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D76' - name = 'date' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D7A'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D79' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000085F'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:AssociationClass> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D18' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D19' - name = 'lead' visibility = 'public' isSpecification = 'false' isNavigable = 'false' - ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D24'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D23' - lower = '0' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1C' - name = 'leader' visibility = 'public' isSpecification = 'false' isNavigable = 'true' - ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1D'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1E' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0D' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0E' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0F'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D10' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D11' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D17'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D16' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2C' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2D' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2E'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2F' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D30' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D36'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D35' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D42' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D43' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4B' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D46' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D47'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D48' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D40'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Package xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E71' - name = 'beangen2' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72' - name = 'Voiture' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'true' isActive = 'false'> - <UML:ModelElement.clientDependency> - <UML:Abstraction xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E77'/> - </UML:ModelElement.clientDependency> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA1' - isSpecification = 'false'> - <UML:TaggedValue.dataValue>Doc for BeanA</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7C' - name = 'immatriculation' visibility = 'public' isSpecification = 'false' - ownerScope = 'instance' changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7D'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7E' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA2' - isSpecification = 'false'> - <UML:TaggedValue.dataValue>attrA of BeanA</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7F' - name = 'modele' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E80'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E81' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE6' - name = 'proprietaire' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE7'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE8' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E75' - name = 'Roue' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E85' - name = 'mount' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:BehavioralFeature.parameter> - <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E86' - name = 'return' isSpecification = 'false' kind = 'return'> - <UML:Parameter.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086B'/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - </UML:Operation> - <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E87' - name = 'getModel' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:BehavioralFeature.parameter> - <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E88' - name = 'return' isSpecification = 'false' kind = 'return'> - <UML:Parameter.type> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> - </UML:Parameter.type> - </UML:Parameter> - <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E89' - name = 'id' isSpecification = 'false'> - <UML:Parameter.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - </UML:Operation> - </UML:Classifier.feature> - </UML:Class> - <UML:Abstraction xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E77' - isSpecification = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E78'/> - </UML:ModelElement.stereotype> - <UML:Dependency.client> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> - </UML:Dependency.client> - <UML:Dependency.supplier> - <UML:Interface xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E76'/> - </UML:Dependency.supplier> - </UML:Abstraction> - <UML:Interface xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E76' - name = 'Vehicule' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false'> - <UML:Classifier.feature> - <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7A' - name = 'start' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:BehavioralFeature.parameter> - <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7B' - name = 'return' isSpecification = 'false' kind = 'return'> - <UML:Parameter.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086B'/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - </UML:Operation> - </UML:Classifier.feature> - </UML:Interface> - <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8A' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8B' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8D' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8E' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED2'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED1' - lower = '4' upper = '4'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E75'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAB' - name = 'RelationDTO' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAC' - name = 'idCompany' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAD'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAE' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAF' - name = 'idDepartement' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB0'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB1' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBB' - name = 'dateDebut' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBC'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBD' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000085F'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9' - name = 'PersonneDTO' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.clientDependency> - <UML:Dependency xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAA'/> - </UML:ModelElement.clientDependency> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74'/> - </UML:ModelElement.stereotype> - <UML:Namespace.ownedElement> - <UML:Dependency xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAA' - isSpecification = 'false'> - <UML:Dependency.client> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9'/> - </UML:Dependency.client> - <UML:Dependency.supplier> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:Dependency.supplier> - </UML:Dependency> - </UML:Namespace.ownedElement> - </UML:Class> - <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB2' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB3' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBA'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB9' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAB'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB6' - name = 'person' visibility = 'public' isSpecification = 'false' isNavigable = 'true' - ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB7'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB8' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED3' - name = 'Siege' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDB' - name = 'noSerie' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDC'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDD' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED4' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED5' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE5'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE4' - lower = '1' upper = '4'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED3'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED8' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED9'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDA' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Package xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100A' - name = 'deletetest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B' - name = 'Contact2' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001019' - name = 'contactValue' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101A'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101B' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101C' - name = 'type' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101D'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101E' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Operation xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102F' - name = 'findAllByCompany' visibility = 'public' isSpecification = 'false' - ownerScope = 'instance' isQuery = 'false' concurrency = 'sequential' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001034'/> - </UML:ModelElement.stereotype> - <UML:BehavioralFeature.parameter> - <UML:Parameter xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001030' - name = 'return' isSpecification = 'false' kind = 'return'> - <UML:Parameter.type> - <UML:Class xmi.idref = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001032'/> - </UML:Parameter.type> - </UML:Parameter> - <UML:Parameter xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001033' - name = 'company' isSpecification = 'false'> - <UML:Parameter.type> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - </UML:Operation> - </UML:Classifier.feature> - </UML:Class> - <UML:Association xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100C' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100D' - name = 'contacts' visibility = 'public' isSpecification = 'false' isNavigable = 'true' - ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001026'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001025' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001010' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001028'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001027' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001017' - name = 'Telephone2' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:GeneralizableElement.generalization> - <UML:Generalization xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001018'/> - </UML:GeneralizableElement.generalization> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001021' - name = 'prefix' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001022'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001023' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001024' - name = 'country' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001025'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001026' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Generalization xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001018' - isSpecification = 'false'> - <UML:Generalization.child> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001017'/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B'/> - </UML:Generalization.parent> - </UML:Generalization> - <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F' - name = 'Party2' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - </UML:Class> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Generalization xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001020' - isSpecification = 'false'> - <UML:Generalization.child> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F'/> - </UML:Generalization.parent> - </UML:Generalization> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121D' - name = 'topia' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121E' - name = 'test' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121F' - name = 'entities' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001220' - name = 'Person' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001228' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001229'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122A' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122B' - name = 'firstname' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122D' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221' - name = 'Pet' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001222' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001223'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001224' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001225' - name = 'type' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001226'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001227' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Association xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001237' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001238' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001239'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123A' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001220'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123B' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123F'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123E' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Association xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102A' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102B' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102D' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102E' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102F'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001030' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001029'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001029' - name = 'Race' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001031' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001032'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001033' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - </UML:Namespace.ownedElement> - </UML:Package> - </UML:Namespace.ownedElement> - </UML:Package> - </UML:Namespace.ownedElement> - </UML:Package> - </UML:Namespace.ownedElement> - </UML:Package> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73' - name = 'bean' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> - </UML:Stereotype> - <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74' - name = 'dto' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> - </UML:Stereotype> - <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E78' - name = 'realize' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> - </UML:Stereotype> - <UML:Package xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001031' - name = 'java.util' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001032' - name = 'Set<Contact2>' visibility = 'public' isSpecification = 'false' - isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Stereotype xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001034' - name = 'dao' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Operation</UML:Stereotype.baseClass> - </UML:Stereotype> - </UML:Namespace.ownedElement> - </UML:Model> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001233'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001234' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123D' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </XMI.content> -</XMI> Copied: trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/src/main/xmi/topiatest.xmi 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,1334 @@ +<?xml version = '1.0' encoding = 'UTF-8' ?> +<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:56:54 CEST 2009'> + <XMI.header> <XMI.documentation> + <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> + <XMI.exporterVersion>0.28.1(6) revised on $Date$ </XMI.exporterVersion> + </XMI.documentation> + <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> + <XMI.content> + <UML:Model xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000077B' + name = 'xmiTopiaTest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:ModelElement.taggedValue> + <UML:TaggedValue xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E3' + isSpecification = 'false'> + <UML:TaggedValue.dataValue>1.2</UML:TaggedValue.dataValue> + <UML:TaggedValue.type> + <UML:TagDefinition xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4'/> + </UML:TaggedValue.type> + </UML:TaggedValue> + </UML:ModelElement.taggedValue> + <UML:Namespace.ownedElement> + <UML:TagDefinition xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4' + name = 'version' isSpecification = 'false' tagType = 'String'> + <UML:TagDefinition.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E6'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E5' + lower = '0' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:TagDefinition.multiplicity> + </UML:TagDefinition> + <UML:Stereotype xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7' + name = 'entity' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090B' + name = 'org' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090C' + name = 'nuiton' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090D' + name = 'topiatest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA' + name = 'Personne' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:GeneralizableElement.generalization> + <UML:Generalization xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001020'/> + </UML:GeneralizableElement.generalization> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF9' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFD'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFC' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB0' + name = 'otherNames' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB8'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB7' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE' + name = 'Employe' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:GeneralizableElement.generalization> + <UML:Generalization xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E2'/> + </UML:GeneralizableElement.generalization> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D54' + name = 'salary' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5A'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D59' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0' + name = 'Company' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011BD' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011C5'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011C4' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008F9' + name = 'Address' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000903' + name = 'city' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF7'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF6' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CE8' + name = 'adress' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF3'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF2' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FB' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FC' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FD'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FE' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FF' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000900'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000901' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008F9'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Generalization xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E2' + isSpecification = 'false'> + <UML:Generalization.child> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> + </UML:Generalization.child> + <UML:Generalization.parent> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:Generalization.parent> + </UML:Generalization> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFE' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFF' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102B' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D02' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102A'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001029' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B' + name = 'Department' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D25' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D29'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D28' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A' + name = 'Product' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D37' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D3F'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D3E' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5B' + name = 'Store' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D7D' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D83'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D82' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D40' + name = 'Type' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4D' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D53'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D52' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:AssociationClass xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D65' + name = 'Bill' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D66' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D89'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D88' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D69' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D8D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D8C' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D6D' + name = 'cost' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D75'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D74' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D76' + name = 'date' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D7A'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D79' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000085F'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:AssociationClass> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D18' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D19' + name = 'lead' visibility = 'public' isSpecification = 'false' isNavigable = 'false' + ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D24'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D23' + lower = '0' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1C' + name = 'leader' visibility = 'public' isSpecification = 'false' isNavigable = 'true' + ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1E' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0D' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0E' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0F'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D10' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D11' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D17'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D16' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2C' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2D' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2E'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2F' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D30' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D36'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D35' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D42' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D43' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4B' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D46' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D47'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D48' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D40'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Package xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E71' + name = 'beangen2' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72' + name = 'Voiture' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'true' isActive = 'false'> + <UML:ModelElement.clientDependency> + <UML:Abstraction xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E77'/> + </UML:ModelElement.clientDependency> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> + </UML:ModelElement.stereotype> + <UML:ModelElement.taggedValue> + <UML:TaggedValue xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA1' + isSpecification = 'false'> + <UML:TaggedValue.dataValue>Doc for BeanA</UML:TaggedValue.dataValue> + <UML:TaggedValue.type> + <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> + </UML:TaggedValue.type> + </UML:TaggedValue> + </UML:ModelElement.taggedValue> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7C' + name = 'immatriculation' visibility = 'public' isSpecification = 'false' + ownerScope = 'instance' changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7E' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:ModelElement.taggedValue> + <UML:TaggedValue xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA2' + isSpecification = 'false'> + <UML:TaggedValue.dataValue>attrA of BeanA</UML:TaggedValue.dataValue> + <UML:TaggedValue.type> + <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> + </UML:TaggedValue.type> + </UML:TaggedValue> + </UML:ModelElement.taggedValue> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7F' + name = 'modele' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E80'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E81' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE6' + name = 'proprietaire' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE7'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE8' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E75' + name = 'Roue' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E85' + name = 'mount' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E86' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086B'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E87' + name = 'getModel' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E88' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> + </UML:Parameter.type> + </UML:Parameter> + <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E89' + name = 'id' isSpecification = 'false'> + <UML:Parameter.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + </UML:Classifier.feature> + </UML:Class> + <UML:Abstraction xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E77' + isSpecification = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E78'/> + </UML:ModelElement.stereotype> + <UML:Dependency.client> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> + </UML:Dependency.client> + <UML:Dependency.supplier> + <UML:Interface xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E76'/> + </UML:Dependency.supplier> + </UML:Abstraction> + <UML:Interface xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E76' + name = 'Vehicule' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false'> + <UML:Classifier.feature> + <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7A' + name = 'start' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7B' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086B'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + </UML:Classifier.feature> + </UML:Interface> + <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8A' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8B' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8D' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8E' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED2'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED1' + lower = '4' upper = '4'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E75'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAB' + name = 'RelationDTO' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAC' + name = 'idCompany' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAD'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAE' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAF' + name = 'idDepartement' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB0'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB1' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBB' + name = 'dateDebut' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBC'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBD' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000085F'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9' + name = 'PersonneDTO' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.clientDependency> + <UML:Dependency xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAA'/> + </UML:ModelElement.clientDependency> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74'/> + </UML:ModelElement.stereotype> + <UML:Namespace.ownedElement> + <UML:Dependency xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAA' + isSpecification = 'false'> + <UML:Dependency.client> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9'/> + </UML:Dependency.client> + <UML:Dependency.supplier> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:Dependency.supplier> + </UML:Dependency> + </UML:Namespace.ownedElement> + </UML:Class> + <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB2' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB3' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBA'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB9' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAB'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB6' + name = 'person' visibility = 'public' isSpecification = 'false' isNavigable = 'true' + ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB7'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB8' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED3' + name = 'Siege' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDB' + name = 'noSerie' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDC'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDD' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED4' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED5' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE5'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE4' + lower = '1' upper = '4'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED3'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED8' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED9'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDA' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Package xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100A' + name = 'deletetest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B' + name = 'Contact2' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001019' + name = 'contactValue' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101A'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101B' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101C' + name = 'type' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101E' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Operation xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102F' + name = 'findAllByCompany' visibility = 'public' isSpecification = 'false' + ownerScope = 'instance' isQuery = 'false' concurrency = 'sequential' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001034'/> + </UML:ModelElement.stereotype> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001030' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:Class xmi.idref = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001032'/> + </UML:Parameter.type> + </UML:Parameter> + <UML:Parameter xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001033' + name = 'company' isSpecification = 'false'> + <UML:Parameter.type> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + </UML:Classifier.feature> + </UML:Class> + <UML:Association xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100C' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100D' + name = 'contacts' visibility = 'public' isSpecification = 'false' isNavigable = 'true' + ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001026'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001025' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001010' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001028'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001027' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001017' + name = 'Telephone2' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:GeneralizableElement.generalization> + <UML:Generalization xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001018'/> + </UML:GeneralizableElement.generalization> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001021' + name = 'prefix' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001022'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001023' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001024' + name = 'country' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001025'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001026' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Generalization xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001018' + isSpecification = 'false'> + <UML:Generalization.child> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001017'/> + </UML:Generalization.child> + <UML:Generalization.parent> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B'/> + </UML:Generalization.parent> + </UML:Generalization> + <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F' + name = 'Party2' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + </UML:Class> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Generalization xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001020' + isSpecification = 'false'> + <UML:Generalization.child> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:Generalization.child> + <UML:Generalization.parent> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F'/> + </UML:Generalization.parent> + </UML:Generalization> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121D' + name = 'topia' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121E' + name = 'test' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121F' + name = 'entities' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001220' + name = 'Person' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001228' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001229'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122A' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122B' + name = 'firstname' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122D' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221' + name = 'Pet' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001222' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001223'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001224' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001225' + name = 'type' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001226'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001227' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Association xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001237' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001238' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001239'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123A' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001220'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123B' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123F'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123E' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Association xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102A' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102B' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102D' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102E' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102F'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001030' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001029'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001029' + name = 'Race' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001031' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001032'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001033' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73' + name = 'bean' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74' + name = 'dto' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E78' + name = 'realize' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Package xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001031' + name = 'java.util' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001032' + name = 'Set<Contact2>' visibility = 'public' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Stereotype xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001034' + name = 'dao' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Operation</UML:Stereotype.baseClass> + </UML:Stereotype> + </UML:Namespace.ownedElement> + </UML:Model> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001233'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001234' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123D' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </XMI.content> +</XMI> Deleted: trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,25 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.zargo =================================================================== (Binary files differ) Copied: trunk/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.zargo (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/src/main/zargo/topiatest.zargo) =================================================================== (Binary files differ) Deleted: trunk/eugene-maven-plugin/src/it/generate/all/verify.groovy =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/verify.groovy 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/all/verify.groovy 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,72 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -// Zargo to java - -assert new File(basedir, 'target/generated-sources-zargo2Java').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/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/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/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/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/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/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; - Copied: trunk/eugene-maven-plugin/src/it/generate/all/verify.groovy (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/all/verify.groovy) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/all/verify.groovy (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/all/verify.groovy 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,72 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +// Zargo to java + +assert new File(basedir, 'target/generated-sources-zargo2Java').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/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/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/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/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/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/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; + Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,166 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. - Copied: trunk/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/LICENSE.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/README.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/README.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,2 +0,0 @@ -To deploy new version of pom: mvn deploy -To install localy: mvn install Copied: trunk/eugene-maven-plugin/src/it/generate/generators/README.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/README.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/README.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/changelog.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/changelog.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/changelog.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,53 +0,0 @@ -1.0.0 xxx xxx - * Add multiple models loading and restricted package generation - * Recode EugenePlugin without ant - * Move to org.nuiton groupid - * Rename project to Eugene - -0.64 chemit 20090218 - * 20090211 [chatellier] add testPhase property in mojo to specify when using it in test phase - * 20090210 [chatellier] add info and debug maven log messages - * 20090210 [chatellier] add default value on all non required parameters - * 20090209 [chemit] fix bug when using sibling dependencies in a multi-module project - * 20090129 [chemit] use lutinproject 3.4 (suppress javadoc plugin invocation) - -0.63 chemit 20081215 - * 20081215 [chemit] follow lutingenerator release - -0.62 chemit 20081210 - * 20081210 [chemit] use lutinpluginproject 3.2 - * 20081203 [chemit] add a encoding goal property to be dispatched in all generator to control file generation encoding - * 20081118 [chemit] use lutinproject 3.1 - * 20081117 [chemit] - - add extraClassPathDirectory parameter to can specify an extra directory to add in classLoader - - bump lutingenerator version - -0.61 chatellier 20081114 - * 20081107 [chatellier] - - add test compile dir and test resources in generation gaol - * 20081101 [chemit] - - add an excludeTemplates property on GeneratorPlugin to permit exclusion of generators for some composite generator - - bump lutingenerator to 0.61 - -0.60 chemit 20081013 - * 20081013 [chemit] - - remove addCompileDirectory option (always done) + add dynamic resources - - use lutingenerator 0.60 - - clean pom - -0.51 thimel 20080925 - * 20080925 [thimel] Refactor pom using the correct architecture - * 20080925 [thimel] Switched License to LGPL - * 20080723 [chemit] - - add generated sources in maven project's compilation directories via addCompilationDirectory plugin property - - * 20070525 [chatellier] - - add Xmi2StateModel goal - - improve Xmi2Model Hierarchy - * 20070525 [chatellier] update ant dependency to 1.7.0 - * 20070525 [chatellier] replacing lutinxml.XSLAntTask by Ant.XSLTProcess - -0.50 ??? ??? - - * 20070420 [chatellier] add goal to copy a set of generated files - * 20070420 [chatellier] update lutingenerator depencency to 0.50 \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/generators/changelog.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/changelog.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/changelog.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/changelog.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,53 @@ +1.0.0 xxx xxx + * Add multiple models loading and restricted package generation + * Recode EugenePlugin without ant + * Move to org.nuiton groupid + * Rename project to Eugene + +0.64 chemit 20090218 + * 20090211 [chatellier] add testPhase property in mojo to specify when using it in test phase + * 20090210 [chatellier] add info and debug maven log messages + * 20090210 [chatellier] add default value on all non required parameters + * 20090209 [chemit] fix bug when using sibling dependencies in a multi-module project + * 20090129 [chemit] use lutinproject 3.4 (suppress javadoc plugin invocation) + +0.63 chemit 20081215 + * 20081215 [chemit] follow lutingenerator release + +0.62 chemit 20081210 + * 20081210 [chemit] use lutinpluginproject 3.2 + * 20081203 [chemit] add a encoding goal property to be dispatched in all generator to control file generation encoding + * 20081118 [chemit] use lutinproject 3.1 + * 20081117 [chemit] + - add extraClassPathDirectory parameter to can specify an extra directory to add in classLoader + - bump lutingenerator version + +0.61 chatellier 20081114 + * 20081107 [chatellier] + - add test compile dir and test resources in generation gaol + * 20081101 [chemit] + - add an excludeTemplates property on GeneratorPlugin to permit exclusion of generators for some composite generator + - bump lutingenerator to 0.61 + +0.60 chemit 20081013 + * 20081013 [chemit] + - remove addCompileDirectory option (always done) + add dynamic resources + - use lutingenerator 0.60 + - clean pom + +0.51 thimel 20080925 + * 20080925 [thimel] Refactor pom using the correct architecture + * 20080925 [thimel] Switched License to LGPL + * 20080723 [chemit] + - add generated sources in maven project's compilation directories via addCompilationDirectory plugin property + + * 20070525 [chatellier] + - add Xmi2StateModel goal + - improve Xmi2Model Hierarchy + * 20070525 [chatellier] update ant dependency to 1.7.0 + * 20070525 [chatellier] replacing lutinxml.XSLAntTask by Ant.XSLTProcess + +0.50 ??? ??? + + * 20070420 [chatellier] add goal to copy a set of generated files + * 20070420 [chatellier] update lutingenerator depencency to 0.50 \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/goals.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1 +0,0 @@ -clean test \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/generators/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean test \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,176 +0,0 @@ -<?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" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.nuiton</groupId> - <artifactId>eugene</artifactId> - <version>@pom.version@</version> - </parent> - - <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> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - -  -  -  - - <name>EUGene :: Test</name> - <description>Test module for generators.</description> - <inceptionYear>2007</inceptionYear> - - <contributors> - <contributor> - <name>Florian Desbois</name> - <email>fdesbois(a)codelutin.com</email> - <timezone>+2</timezone> - <roles> - <role>Developpeur</role> - </roles> - </contributor> - </contributors> - -  -  -  - - <packaging>jar</packaging> - - <properties> - <processorVersion>1.0.3</processorVersion> - </properties> - <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>eugene-maven-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>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>generate</goal> - </goals> - </execution> -  - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4jVersion}</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - - </build> - -</project> - - Copied: trunk/eugene-maven-plugin/src/it/generate/generators/pom.xml (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/pom.xml) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/pom.xml (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,176 @@ +<?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" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>eugene</artifactId> + <version>@pom.version@</version> + </parent> + + <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> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + +  +  +  + + <name>EUGene :: Test</name> + <description>Test module for generators.</description> + <inceptionYear>2007</inceptionYear> + + <contributors> + <contributor> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <timezone>+2</timezone> + <roles> + <role>Developpeur</role> + </roles> + </contributor> + </contributors> + +  +  +  + + <packaging>jar</packaging> + + <properties> + <processorVersion>1.0.3</processorVersion> + </properties> + <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>eugene-maven-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>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>generate</goal> + </goals> + </execution> +  + </executions> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4jVersion}</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + + </build> + +</project> + + Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,714 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -/* * -* BeanGenerator.java -* -* Created: 17 avril 2009 -* -* @author tchemit <chemit(a)codelutin.com> -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -* @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.BeanGenerator" -*/ - -package org.nuiton.eugene.test.generator; - -import org.apache.commons.lang3.StringUtils; - -import java.io.File; -import java.io.IOException; -import java.io.Serializable; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.Iterator; - -import java.util.List; -import java.util.Set; -import java.util.HashSet; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.ObjectModelGenerator; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelDependency; -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.eugene.java.extension.ImportsManagerExtension; -import org.nuiton.eugene.java.extension.ImportsManager; - -/** - * DTO generator - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanGenerator" - */ -public class BeanGenerator extends ObjectModelGenerator { - /** Tag pour ajouter une annotation à un champ */ - public static final String TAG_ANNOTATION = "annotation"; - /** Stéréotype pour les objets devant être générées sous forme d'entités */ - public static final String STEREOTYPE_ENTITY = "entity"; - /** Stéréotype pour les objets devant être générées sous forme de DTO */ - public static final String STEREOTYPE_DTO = "dto"; - /** Stéréotype pour les objets devant être générées sous forme de bean */ - public static final String STEREOTYPE_BEAN = "bean"; - /** - * Logger for this class - */ - private static final Log log = LogFactory.getLog(BeanGenerator.class); - - public BeanGenerator() { - super(); - } - - @Override - public String getFilenameForClass(ObjectModelClass clazz) { - return clazz.getQualifiedName().replace('.', File.separatorChar) + ".java"; - } - - @Override - public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException { - if (!clazz.hasStereotype(STEREOTYPE_BEAN) && - !clazz.hasStereotype(STEREOTYPE_DTO)) { - return; - } - // - // première phase : calcul des variables - // - String copyright = ""; - String clazzName = clazz.getName(); - String abstractStr = isAbstract(clazz) ? " abstract " : " "; - boolean needGetEntityMethod = false; - boolean generateToString = true; - - ImportsManager imports = new ImportsManager(); - - String extendClass = ""; - Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); - if (j.hasNext()) { - ObjectModelClassifier p = j.next(); - imports.addImport(p.getQualifiedName()); - extendClass += p.getName(); - } - String implInterface = ""; - for (Iterator<ObjectModelInterface> i=clazz.getInterfaces().iterator(); i.hasNext();) { - ObjectModelClassifier parentInterface = i.next(); - imports.addImport(parentInterface.getQualifiedName()); - implInterface += parentInterface.getName(); - if (i.hasNext()) { - implInterface += ", "; - } - } - // Add Serializable implements for DTO generation - if (clazz.hasStereotype(STEREOTYPE_DTO)) { - imports.addImport(Serializable.class); - if (!implInterface.isEmpty()) { - implInterface += ", "; - } - implInterface += Serializable.class.getName(); - } - String svUID = "1L"; - - List<ObjectModelAttribute> attributes = new ArrayList<ObjectModelAttribute>(); - List<ObjectModelAttribute> multipleAttr = new ArrayList<ObjectModelAttribute>(); - - setAttributesForDTO(clazz, attributes,imports); - - boolean needListInImport=false; - - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable()) { - attributes.add(attr); - imports.addImport(attr.getType()); - if (GeneratorUtil.isNMultiplicity(attr)) { - multipleAttr.add(attr); - ObjectModelClass attrEntity = null; - if (model.hasClass(attr.getType())) { - attrEntity = model.getClass(attr.getType()); - } - boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(STEREOTYPE_ENTITY)); - needGetEntityMethod |= isEntity; - if (attr.isOrdered()) { - needListInImport = true; - } - } - } - } - - imports.addImport(java.beans.PropertyChangeListener.class.getName()); - imports.addImport(java.beans.PropertyChangeSupport.class.getName()); - - for (ObjectModelOperation operation : clazz.getOperations()) { - imports.addImport(operation.getReturnType()); - for (ObjectModelParameter parameter : operation.getParameters()) { - imports.addImport(parameter.getType()); - } - } - - if (needGetEntityMethod) { - imports.addImport("org.nuiton.topia.persistence.TopiaEntity"); - } - if (!multipleAttr.isEmpty()) { - imports.addImport(Collection.class); - } - if (needListInImport) { - imports.addImport(List.class); - } - if (generateToString) { - imports.addImport(org.apache.commons.lang3.builder.ToStringBuilder.class); - } - - boolean sortAttribute = true; - if (sortAttribute) { - Comparator<ObjectModelAttribute> comp = new Comparator<ObjectModelAttribute>(){ - - @Override - public int compare(ObjectModelAttribute o1, ObjectModelAttribute o2) { - return o1.getName().compareTo(o2.getName()); - } - }; - java.util.Collections.sort(attributes,comp); - java.util.Collections.sort(multipleAttr,comp); - } - // - // seconde phase : génération - // - - if (StringUtils.isNotEmpty(copyright)) { -/*{<%=copyright%> -}*/ - } - -/*{package <%=clazz.getPackageName()%>; - - }*/ - - if (log.isDebugEnabled()) { - log.debug("imports for class <" + clazzName + ">"); - } - //for (String anImport : imports) { - for (String anImport : imports.getImports(clazz.getPackageName())) { - if (log.isDebugEnabled()) { - log.debug("import " + anImport); - } -/*{import <%=anImport%>; -}*/ - } -/*{ -public<%=abstractStr%>class <%=clazzName%>}*/ - -/* - * Définition de la super classe : il ne doit y avoir qu'une - */ - if (extendClass.length() > 0) { -/*{ extends <%=extendClass%>}*/ - } - - if (implInterface.length() > 0) { -/*{ implements <%=implInterface%> { - -}*/ - } else { - /*{ { - -}*/ - } - - - // TODO Calculer un serialVersionUID si il n'y en a pas - if (svUID != null) { -/*{ public static final long serialVersionUID = <%=svUID%>; - -}*/ - } - generateInterfaceOperations(output, clazz); - generateAttributes(output, attributes); -/*{ protected final PropertyChangeSupport pcs; - - /** - * Default constructor of <%=clazzName%>. - *) - public <%=clazzName%>() { - pcs = new PropertyChangeSupport(this); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.removePropertyChangeListener(propertyName, listener); - } - -}*/ - generateGetters(output, attributes); - generateSetters(output, attributes); - generateGetChild(output, multipleAttr); - generateAddChild(output, multipleAttr); - generateRemoveChild(output, multipleAttr); - if (generateToString) { - generateToString(output, clazz); - } - if (!multipleAttr.isEmpty()) { -/*{ - - protected <T> T getChild(Collection<T> childs, int index) { - if (childs != null) { - int i = 0; - for (T o : childs) { - if (index == i) { - return o; - } - i++; - } - } - return null; - } - - }*/ - if (needGetEntityMethod) { -/*{ protected <T extends TopiaEntity> T getEntity(Collection<T> childs, String topiaId) { - if (childs != null) { - for (T o : childs) { - if (topiaId.equals(o.getTopiaId())) { - return o; - } - } - } - return null; - } - }*/ - } - } - -/*{ - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - pcs.firePropertyChange(propertyName, oldValue, newValue); - } - -} //<%=clazz.getName()%> -}*/ - } - - protected void generateAttributes(Writer output, List<ObjectModelAttribute> attributes) throws IOException { - - for (ObjectModelAttribute attr : attributes) { - - if (!(attr.isNavigable() - || attr.hasAssociationClass())) { - continue; - } - - if (GeneratorUtil.hasDocumentation(attr)) { -/*{ /** - * <%=attr.getDocumentation()%> - *) -}*/ - } - String annotation = attr.getTagValue(TAG_ANNOTATION); - if (annotation != null && annotation.length() > 0) { -/*{ <%=annotation%> -}*/ - } - String attrName = attr.getName(); - String attrVisibility = attr.getVisibility(); - String attrType = attr.getType(); - if (attr.hasAssociationClass()) { - String assocAttrName = getAssocAttrName(attr); - attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - attrType = attr.getAssociationClass().getName(); - } - int dot = attrType.lastIndexOf("."); - if (dot>-1) { - attrType = attrType.substring(dot + 1); - } - if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = getCollection(attr, attrType); - } - -/*{ <%=attrVisibility%> <%=attrType%> <%=attrName%>; -}*/ - } - } - - /** - * Renvoie le nom de l'attribut de classe d'association en fonction des cas: - * Si l'attribut porte le même nom que le type (extrémité inverse de - * l'association), on lui ajoute le nom de la classe d'association - * - * @param attr l'attribut a traiter - * @return le nom de l'attribut de classe d'association - */ - public static String getAssocAttrName(ObjectModelAttribute attr) { - String typeName = attr.getType().substring( - attr.getType().lastIndexOf(".") + 1); - String result = attr.getName(); - if (attr.getName().equalsIgnoreCase(typeName)) { - result += StringUtils.capitalize(attr.getAssociationClass().getName()); - } - return result; - } - - protected void generateGetters(Writer output, List<ObjectModelAttribute> attributes) throws IOException { - /* - * Définition des getteurs et setteurs - */ - for (ObjectModelAttribute attr : attributes) { - - if (!attr.isNavigable()) { - continue; - } - - String attrName = attr.getName(); - String attrType = attr.getType(); - if (attr.hasAssociationClass()) { - String assocAttrName = getAssocAttrName(attr); - attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - attrType = attr.getAssociationClass().getName(); - } - String attrNameCapitalized = StringUtils.capitalize(attrName); - int dot = attrType.lastIndexOf("."); - if (dot>-1) { - attrType = attrType.substring(dot + 1); - } - if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = getCollection(attr, attrType); - } -/*{ public <%=attrType%> get<%=attrNameCapitalized%>() { - return <%=attrName%>; - } - -}*/ - } - } - - protected void generateSetters(Writer output, List<ObjectModelAttribute> attributes) throws IOException { - /* - * Définition des getteurs et setteurs - */ - for (ObjectModelAttribute attr : attributes) { - - if (!attr.isNavigable()) { - continue; - } - - String attrName = attr.getName(); - String attrType = attr.getType(); - - if (attr.hasAssociationClass()) { - String assocAttrName = getAssocAttrName(attr); - attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - attrType = attr.getAssociationClass().getName(); - } - String attrNameCapitalized = StringUtils.capitalize(attrName); - int dot = attrType.lastIndexOf("."); - if (dot>-1) { - attrType = attrType.substring(dot + 1); - } - if (GeneratorUtil.isNMultiplicity(attr)) { - attrType = getCollection(attr, attrType); - } -/*{ public void set<%=attrNameCapitalized%>(<%=attrType%> newValue) { - <%=attrType%> oldValue = get<%=attrNameCapitalized%>(); - this.<%=attrName%> = newValue; - firePropertyChange("<%=attrName%>", oldValue, newValue); - } - -}*/ - } - } - - protected void generateGetChild(Writer output, List<ObjectModelAttribute> multipleAttr) throws IOException { - - for (ObjectModelAttribute attr : multipleAttr) { - - String attrName = attr.getName(); - String attrNameCapitalized = StringUtils.capitalize(attrName); - String attrType = attr.getType(); - int dot = attrType.lastIndexOf("."); - if (dot>-1) { - attrType = attrType.substring(dot + 1); - } - ObjectModelClass attrEntity=null; - if (model.hasClass(attr.getType())) { - attrEntity = model.getClass(attr.getType()); - } - boolean isEntity = (attrEntity != null && attrEntity.hasStereotype("entity")); -/*{ public <%=attrType%> get<%=attrNameCapitalized%>(int index) { - <%=attrType%> o = getChild(<%=attrName%>, index); - return o; - } - -}*/ - if (isEntity) { -/*{ public <%=attrType%> get<%=attrNameCapitalized%>(String topiaId) { - <%=attrType%> o = getEntity(<%=attrName%>, topiaId); - return o; - } - -}*/ - } - } - } - protected void generateAddChild(Writer output, List<ObjectModelAttribute> multipleAttr) throws IOException { - for (ObjectModelAttribute attr : multipleAttr) { - - String attrName = attr.getName(); - String attrNameCapitalized = StringUtils.capitalize(attrName); - String attrType = attr.getType(); - int dot = attrType.lastIndexOf("."); - if (dot>-1) { - attrType = attrType.substring(dot + 1); - } -/*{ public <%=attrType%> add<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { - get<%=attrNameCapitalized%>().add(<%=attrName%>); - firePropertyChange("<%=attrName%>", null, <%=attrName%>); - return <%=attrName%>; - } - -}*/ - } - } - - protected void generateRemoveChild(Writer output, List<ObjectModelAttribute> multipleAttr) throws IOException { - for (ObjectModelAttribute attr : multipleAttr) { - String attrName = attr.getName(); - String attrNameCapitalized = StringUtils.capitalize(attrName); - String attrType = attr.getType(); - int dot = attrType.lastIndexOf("."); - if (dot>-1) { - attrType = attrType.substring(dot + 1); - } -/*{ public boolean remove<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { - boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); - if (removed) { - firePropertyChange("<%=attrName%>", <%=attrName%>, null); - } - return removed; - } - -}*/ - } - } - - protected void generateInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { - for (ObjectModelOperation op : classifier.getOperations()) { - String opName = op.getName(); -/*{ /** -}*/ - if (GeneratorUtil.hasDocumentation(op)) { - String opDocumentation = op.getDocumentation(); -/*{ * <%=opName%> : <%=opDocumentation%> -}*/ - } - Collection<ObjectModelParameter> params = op.getParameters(); - for (ObjectModelParameter param : params) { - String paramName = param.getName(); - String paramDocumentation = param.getDocumentation(); -/*{ * @param <%=paramName%> <%=paramDocumentation%> - }*/ - } - String opVisibility = op.getVisibility(); - String opType = op.getReturnType(); -/*{ *) - <%=opVisibility%> abstract <%=opType%> <%=opName%>(}*/ - String comma = ""; - for (ObjectModelParameter param : params) { - String paramName = param.getName(); - String paramType = param.getType(); -/*{<%=comma%><%=paramType%> <%=paramName%>}*/ - comma = ", "; - } -/*{)}*/ - Set<String> exceptions = op.getExceptions(); - comma = " throws "; - for (String exception : exceptions) { -/*{<%=comma%><%=exception%>}*/ - comma = ", "; - } -/*{; - -}*/ - } - } - protected void generateToString(Writer output, ObjectModelClass clazz) throws IOException { -/*{ - @Override - public String toString() { - String result = new ToStringBuilder(this). -}*/ - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (!(attr.isNavigable() || attr.hasAssociationClass())) { - continue; - } - //FIXME possibilité de boucles (non directes) - String attrName = attr.getName(); -/*{ append("<%=attrName%>", this.<%=attrName%>). -}*/ - } -/*{ toString(); - return result; - } - }*/ - } - - protected String getCollection(ObjectModelAttribute attr, String attrType) { - String nMultType; - if (attr.isOrdered()) { - nMultType = "List<"; - } else { - nMultType = "Collection<"; - } - nMultType += attrType; - nMultType += ">"; - return nMultType; - } - - protected boolean isAbstract(ObjectModelClass clazz) { - if (clazz.isAbstract()) { - return true; - } - return !clazz.getOperations().isEmpty(); - } - - /** - * Dependecy gestion for DTO generation. - * All primitives attributes (and dates) of dependencies entities of the DTO are - * copied in the DTO. This method only prepare a list of attributes to be generated. - * @param clazz DTO ObjectModelClass - * @param attributes list of attributes for the generation (may be not empty) - * @param imports the ImportsManager used to generate the header imports of the DTO - * @return the same list of attributes in parameter with attributes from entities dependencies - * @see org.nuiton.eugene.java.extension.ImportsManager - * @see org.nuiton.eugene.models.object.ObjectModelDependency - */ - private List<ObjectModelAttribute> setAttributesForDTO(ObjectModelClass clazz, - List<ObjectModelAttribute> attributes, ImportsManager imports) { - - if (clazz.hasStereotype(STEREOTYPE_DTO)) { - if (log.isInfoEnabled()) { - log.info("DTO dependency gestion"); - } - for (ObjectModelDependency dependency : clazz.getDependencies()) { - ObjectModelClass supplier = (ObjectModelClass)dependency.getSupplier(); - - // ENTITY dependency - // Copy all primitives attributes from the Entity (supplier) to the DTO - // Prepare a list to future generation of all object generated attributes - if (supplier.hasStereotype(STEREOTYPE_ENTITY)) { - if (log.isInfoEnabled()) { - log.info("Create primitive and date fields in DTO from Entity : " - + supplier.getQualifiedName()); - } - for (ObjectModelAttribute attr : supplier.getAttributes()) { - if (isPrimitiveType(attr) || isDateType(attr)) { - attributes.add(attr); - imports.addImport(attr.getType()); - } - if (GeneratorUtil.isNMultiplicity(attr)) { - imports.addImport("java.util.Collection"); - } - } - } - } - } - return attributes; - } - - private static final Set<String> numberTypes = new HashSet<String>(); - private static final Set<String> textTypes = new HashSet<String>(); - private static final Set<String> booleanTypes = new HashSet<String>(); - private static final Set<String> primitiveTypes = new HashSet<String>(); - - static { - numberTypes.add("byte"); - numberTypes.add("java.lang.Byte"); - numberTypes.add("Byte"); - numberTypes.add("short"); - numberTypes.add("java.lang.Short"); - numberTypes.add("Short"); - numberTypes.add("int"); - numberTypes.add("java.lang.Integer"); - numberTypes.add("Integer"); - numberTypes.add("long"); - numberTypes.add("java.lang.Long"); - numberTypes.add("Long"); - numberTypes.add("float"); - numberTypes.add("java.lang.Float"); - numberTypes.add("Float"); - numberTypes.add("double"); - numberTypes.add("java.lang.Double"); - numberTypes.add("Double"); - - textTypes.add("char"); - textTypes.add("java.lang.Char"); - textTypes.add("Char"); - textTypes.add("java.lang.String"); - textTypes.add("String"); - - booleanTypes.add("boolean"); - booleanTypes.add("java.lang.Boolean"); - booleanTypes.add("Boolean"); - - primitiveTypes.addAll(numberTypes); - primitiveTypes.addAll(textTypes); - primitiveTypes.addAll(booleanTypes); - } - - public static boolean isNumericType(ObjectModelAttribute attr) { - return numberTypes.contains(attr.getType()); - } - - public static boolean isTextType(ObjectModelAttribute attr) { - return textTypes.contains(attr.getType()); - } - - public static boolean isDateType(ObjectModelAttribute attr) { - return "java.util.Date".equals(attr.getType()); - } - - public static boolean isBooleanType(ObjectModelAttribute attr) { - return booleanTypes.contains(attr.getType()); - } - - public static boolean isPrimitiveType(ObjectModelAttribute attr) { - return primitiveTypes.contains(attr.getType()); - } - -} //BeanGenerator Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,714 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +/* * +* BeanGenerator.java +* +* Created: 17 avril 2009 +* +* @author tchemit <chemit(a)codelutin.com> +* @version $Revision$ +* +* Mise a jour: $Date$ +* par : $Author$ +* @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.BeanGenerator" +*/ + +package org.nuiton.eugene.test.generator; + +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.IOException; +import java.io.Serializable; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; + +import java.util.List; +import java.util.Set; +import java.util.HashSet; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.models.object.ObjectModelGenerator; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.eugene.java.extension.ImportsManagerExtension; +import org.nuiton.eugene.java.extension.ImportsManager; + +/** + * DTO generator + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanGenerator" + */ +public class BeanGenerator extends ObjectModelGenerator { + /** Tag pour ajouter une annotation à un champ */ + public static final String TAG_ANNOTATION = "annotation"; + /** Stéréotype pour les objets devant être générées sous forme d'entités */ + public static final String STEREOTYPE_ENTITY = "entity"; + /** Stéréotype pour les objets devant être générées sous forme de DTO */ + public static final String STEREOTYPE_DTO = "dto"; + /** Stéréotype pour les objets devant être générées sous forme de bean */ + public static final String STEREOTYPE_BEAN = "bean"; + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(BeanGenerator.class); + + public BeanGenerator() { + super(); + } + + @Override + public String getFilenameForClass(ObjectModelClass clazz) { + return clazz.getQualifiedName().replace('.', File.separatorChar) + ".java"; + } + + @Override + public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException { + if (!clazz.hasStereotype(STEREOTYPE_BEAN) && + !clazz.hasStereotype(STEREOTYPE_DTO)) { + return; + } + // + // première phase : calcul des variables + // + String copyright = ""; + String clazzName = clazz.getName(); + String abstractStr = isAbstract(clazz) ? " abstract " : " "; + boolean needGetEntityMethod = false; + boolean generateToString = true; + + ImportsManager imports = new ImportsManager(); + + String extendClass = ""; + Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); + if (j.hasNext()) { + ObjectModelClassifier p = j.next(); + imports.addImport(p.getQualifiedName()); + extendClass += p.getName(); + } + String implInterface = ""; + for (Iterator<ObjectModelInterface> i=clazz.getInterfaces().iterator(); i.hasNext();) { + ObjectModelClassifier parentInterface = i.next(); + imports.addImport(parentInterface.getQualifiedName()); + implInterface += parentInterface.getName(); + if (i.hasNext()) { + implInterface += ", "; + } + } + // Add Serializable implements for DTO generation + if (clazz.hasStereotype(STEREOTYPE_DTO)) { + imports.addImport(Serializable.class); + if (!implInterface.isEmpty()) { + implInterface += ", "; + } + implInterface += Serializable.class.getName(); + } + String svUID = "1L"; + + List<ObjectModelAttribute> attributes = new ArrayList<ObjectModelAttribute>(); + List<ObjectModelAttribute> multipleAttr = new ArrayList<ObjectModelAttribute>(); + + setAttributesForDTO(clazz, attributes,imports); + + boolean needListInImport=false; + + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (attr.isNavigable()) { + attributes.add(attr); + imports.addImport(attr.getType()); + if (GeneratorUtil.isNMultiplicity(attr)) { + multipleAttr.add(attr); + ObjectModelClass attrEntity = null; + if (model.hasClass(attr.getType())) { + attrEntity = model.getClass(attr.getType()); + } + boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(STEREOTYPE_ENTITY)); + needGetEntityMethod |= isEntity; + if (attr.isOrdered()) { + needListInImport = true; + } + } + } + } + + imports.addImport(java.beans.PropertyChangeListener.class.getName()); + imports.addImport(java.beans.PropertyChangeSupport.class.getName()); + + for (ObjectModelOperation operation : clazz.getOperations()) { + imports.addImport(operation.getReturnType()); + for (ObjectModelParameter parameter : operation.getParameters()) { + imports.addImport(parameter.getType()); + } + } + + if (needGetEntityMethod) { + imports.addImport("org.nuiton.topia.persistence.TopiaEntity"); + } + if (!multipleAttr.isEmpty()) { + imports.addImport(Collection.class); + } + if (needListInImport) { + imports.addImport(List.class); + } + if (generateToString) { + imports.addImport(org.apache.commons.lang3.builder.ToStringBuilder.class); + } + + boolean sortAttribute = true; + if (sortAttribute) { + Comparator<ObjectModelAttribute> comp = new Comparator<ObjectModelAttribute>(){ + + @Override + public int compare(ObjectModelAttribute o1, ObjectModelAttribute o2) { + return o1.getName().compareTo(o2.getName()); + } + }; + java.util.Collections.sort(attributes,comp); + java.util.Collections.sort(multipleAttr,comp); + } + // + // seconde phase : génération + // + + if (StringUtils.isNotEmpty(copyright)) { +/*{<%=copyright%> +}*/ + } + +/*{package <%=clazz.getPackageName()%>; + + }*/ + + if (log.isDebugEnabled()) { + log.debug("imports for class <" + clazzName + ">"); + } + //for (String anImport : imports) { + for (String anImport : imports.getImports(clazz.getPackageName())) { + if (log.isDebugEnabled()) { + log.debug("import " + anImport); + } +/*{import <%=anImport%>; +}*/ + } +/*{ +public<%=abstractStr%>class <%=clazzName%>}*/ + +/* + * Définition de la super classe : il ne doit y avoir qu'une + */ + if (extendClass.length() > 0) { +/*{ extends <%=extendClass%>}*/ + } + + if (implInterface.length() > 0) { +/*{ implements <%=implInterface%> { + +}*/ + } else { + /*{ { + +}*/ + } + + + // TODO Calculer un serialVersionUID si il n'y en a pas + if (svUID != null) { +/*{ public static final long serialVersionUID = <%=svUID%>; + +}*/ + } + generateInterfaceOperations(output, clazz); + generateAttributes(output, attributes); +/*{ protected final PropertyChangeSupport pcs; + + /** + * Default constructor of <%=clazzName%>. + *) + public <%=clazzName%>() { + pcs = new PropertyChangeSupport(this); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + +}*/ + generateGetters(output, attributes); + generateSetters(output, attributes); + generateGetChild(output, multipleAttr); + generateAddChild(output, multipleAttr); + generateRemoveChild(output, multipleAttr); + if (generateToString) { + generateToString(output, clazz); + } + if (!multipleAttr.isEmpty()) { +/*{ + + protected <T> T getChild(Collection<T> childs, int index) { + if (childs != null) { + int i = 0; + for (T o : childs) { + if (index == i) { + return o; + } + i++; + } + } + return null; + } + + }*/ + if (needGetEntityMethod) { +/*{ protected <T extends TopiaEntity> T getEntity(Collection<T> childs, String topiaId) { + if (childs != null) { + for (T o : childs) { + if (topiaId.equals(o.getTopiaId())) { + return o; + } + } + } + return null; + } + }*/ + } + } + +/*{ + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + +} //<%=clazz.getName()%> +}*/ + } + + protected void generateAttributes(Writer output, List<ObjectModelAttribute> attributes) throws IOException { + + for (ObjectModelAttribute attr : attributes) { + + if (!(attr.isNavigable() + || attr.hasAssociationClass())) { + continue; + } + + if (GeneratorUtil.hasDocumentation(attr)) { +/*{ /** + * <%=attr.getDocumentation()%> + *) +}*/ + } + String annotation = attr.getTagValue(TAG_ANNOTATION); + if (annotation != null && annotation.length() > 0) { +/*{ <%=annotation%> +}*/ + } + String attrName = attr.getName(); + String attrVisibility = attr.getVisibility(); + String attrType = attr.getType(); + if (attr.hasAssociationClass()) { + String assocAttrName = getAssocAttrName(attr); + attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); + attrType = attr.getAssociationClass().getName(); + } + int dot = attrType.lastIndexOf("."); + if (dot>-1) { + attrType = attrType.substring(dot + 1); + } + if (GeneratorUtil.isNMultiplicity(attr)) { + attrType = getCollection(attr, attrType); + } + +/*{ <%=attrVisibility%> <%=attrType%> <%=attrName%>; +}*/ + } + } + + /** + * Renvoie le nom de l'attribut de classe d'association en fonction des cas: + * Si l'attribut porte le même nom que le type (extrémité inverse de + * l'association), on lui ajoute le nom de la classe d'association + * + * @param attr l'attribut a traiter + * @return le nom de l'attribut de classe d'association + */ + public static String getAssocAttrName(ObjectModelAttribute attr) { + String typeName = attr.getType().substring( + attr.getType().lastIndexOf(".") + 1); + String result = attr.getName(); + if (attr.getName().equalsIgnoreCase(typeName)) { + result += StringUtils.capitalize(attr.getAssociationClass().getName()); + } + return result; + } + + protected void generateGetters(Writer output, List<ObjectModelAttribute> attributes) throws IOException { + /* + * Définition des getteurs et setteurs + */ + for (ObjectModelAttribute attr : attributes) { + + if (!attr.isNavigable()) { + continue; + } + + String attrName = attr.getName(); + String attrType = attr.getType(); + if (attr.hasAssociationClass()) { + String assocAttrName = getAssocAttrName(attr); + attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); + attrType = attr.getAssociationClass().getName(); + } + String attrNameCapitalized = StringUtils.capitalize(attrName); + int dot = attrType.lastIndexOf("."); + if (dot>-1) { + attrType = attrType.substring(dot + 1); + } + if (GeneratorUtil.isNMultiplicity(attr)) { + attrType = getCollection(attr, attrType); + } +/*{ public <%=attrType%> get<%=attrNameCapitalized%>() { + return <%=attrName%>; + } + +}*/ + } + } + + protected void generateSetters(Writer output, List<ObjectModelAttribute> attributes) throws IOException { + /* + * Définition des getteurs et setteurs + */ + for (ObjectModelAttribute attr : attributes) { + + if (!attr.isNavigable()) { + continue; + } + + String attrName = attr.getName(); + String attrType = attr.getType(); + + if (attr.hasAssociationClass()) { + String assocAttrName = getAssocAttrName(attr); + attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); + attrType = attr.getAssociationClass().getName(); + } + String attrNameCapitalized = StringUtils.capitalize(attrName); + int dot = attrType.lastIndexOf("."); + if (dot>-1) { + attrType = attrType.substring(dot + 1); + } + if (GeneratorUtil.isNMultiplicity(attr)) { + attrType = getCollection(attr, attrType); + } +/*{ public void set<%=attrNameCapitalized%>(<%=attrType%> newValue) { + <%=attrType%> oldValue = get<%=attrNameCapitalized%>(); + this.<%=attrName%> = newValue; + firePropertyChange("<%=attrName%>", oldValue, newValue); + } + +}*/ + } + } + + protected void generateGetChild(Writer output, List<ObjectModelAttribute> multipleAttr) throws IOException { + + for (ObjectModelAttribute attr : multipleAttr) { + + String attrName = attr.getName(); + String attrNameCapitalized = StringUtils.capitalize(attrName); + String attrType = attr.getType(); + int dot = attrType.lastIndexOf("."); + if (dot>-1) { + attrType = attrType.substring(dot + 1); + } + ObjectModelClass attrEntity=null; + if (model.hasClass(attr.getType())) { + attrEntity = model.getClass(attr.getType()); + } + boolean isEntity = (attrEntity != null && attrEntity.hasStereotype("entity")); +/*{ public <%=attrType%> get<%=attrNameCapitalized%>(int index) { + <%=attrType%> o = getChild(<%=attrName%>, index); + return o; + } + +}*/ + if (isEntity) { +/*{ public <%=attrType%> get<%=attrNameCapitalized%>(String topiaId) { + <%=attrType%> o = getEntity(<%=attrName%>, topiaId); + return o; + } + +}*/ + } + } + } + protected void generateAddChild(Writer output, List<ObjectModelAttribute> multipleAttr) throws IOException { + for (ObjectModelAttribute attr : multipleAttr) { + + String attrName = attr.getName(); + String attrNameCapitalized = StringUtils.capitalize(attrName); + String attrType = attr.getType(); + int dot = attrType.lastIndexOf("."); + if (dot>-1) { + attrType = attrType.substring(dot + 1); + } +/*{ public <%=attrType%> add<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { + get<%=attrNameCapitalized%>().add(<%=attrName%>); + firePropertyChange("<%=attrName%>", null, <%=attrName%>); + return <%=attrName%>; + } + +}*/ + } + } + + protected void generateRemoveChild(Writer output, List<ObjectModelAttribute> multipleAttr) throws IOException { + for (ObjectModelAttribute attr : multipleAttr) { + String attrName = attr.getName(); + String attrNameCapitalized = StringUtils.capitalize(attrName); + String attrType = attr.getType(); + int dot = attrType.lastIndexOf("."); + if (dot>-1) { + attrType = attrType.substring(dot + 1); + } +/*{ public boolean remove<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { + boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); + if (removed) { + firePropertyChange("<%=attrName%>", <%=attrName%>, null); + } + return removed; + } + +}*/ + } + } + + protected void generateInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { + for (ObjectModelOperation op : classifier.getOperations()) { + String opName = op.getName(); +/*{ /** +}*/ + if (GeneratorUtil.hasDocumentation(op)) { + String opDocumentation = op.getDocumentation(); +/*{ * <%=opName%> : <%=opDocumentation%> +}*/ + } + Collection<ObjectModelParameter> params = op.getParameters(); + for (ObjectModelParameter param : params) { + String paramName = param.getName(); + String paramDocumentation = param.getDocumentation(); +/*{ * @param <%=paramName%> <%=paramDocumentation%> + }*/ + } + String opVisibility = op.getVisibility(); + String opType = op.getReturnType(); +/*{ *) + <%=opVisibility%> abstract <%=opType%> <%=opName%>(}*/ + String comma = ""; + for (ObjectModelParameter param : params) { + String paramName = param.getName(); + String paramType = param.getType(); +/*{<%=comma%><%=paramType%> <%=paramName%>}*/ + comma = ", "; + } +/*{)}*/ + Set<String> exceptions = op.getExceptions(); + comma = " throws "; + for (String exception : exceptions) { +/*{<%=comma%><%=exception%>}*/ + comma = ", "; + } +/*{; + +}*/ + } + } + protected void generateToString(Writer output, ObjectModelClass clazz) throws IOException { +/*{ + @Override + public String toString() { + String result = new ToStringBuilder(this). +}*/ + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (!(attr.isNavigable() || attr.hasAssociationClass())) { + continue; + } + //FIXME possibilité de boucles (non directes) + String attrName = attr.getName(); +/*{ append("<%=attrName%>", this.<%=attrName%>). +}*/ + } +/*{ toString(); + return result; + } + }*/ + } + + protected String getCollection(ObjectModelAttribute attr, String attrType) { + String nMultType; + if (attr.isOrdered()) { + nMultType = "List<"; + } else { + nMultType = "Collection<"; + } + nMultType += attrType; + nMultType += ">"; + return nMultType; + } + + protected boolean isAbstract(ObjectModelClass clazz) { + if (clazz.isAbstract()) { + return true; + } + return !clazz.getOperations().isEmpty(); + } + + /** + * Dependecy gestion for DTO generation. + * All primitives attributes (and dates) of dependencies entities of the DTO are + * copied in the DTO. This method only prepare a list of attributes to be generated. + * @param clazz DTO ObjectModelClass + * @param attributes list of attributes for the generation (may be not empty) + * @param imports the ImportsManager used to generate the header imports of the DTO + * @return the same list of attributes in parameter with attributes from entities dependencies + * @see org.nuiton.eugene.java.extension.ImportsManager + * @see org.nuiton.eugene.models.object.ObjectModelDependency + */ + private List<ObjectModelAttribute> setAttributesForDTO(ObjectModelClass clazz, + List<ObjectModelAttribute> attributes, ImportsManager imports) { + + if (clazz.hasStereotype(STEREOTYPE_DTO)) { + if (log.isInfoEnabled()) { + log.info("DTO dependency gestion"); + } + for (ObjectModelDependency dependency : clazz.getDependencies()) { + ObjectModelClass supplier = (ObjectModelClass)dependency.getSupplier(); + + // ENTITY dependency + // Copy all primitives attributes from the Entity (supplier) to the DTO + // Prepare a list to future generation of all object generated attributes + if (supplier.hasStereotype(STEREOTYPE_ENTITY)) { + if (log.isInfoEnabled()) { + log.info("Create primitive and date fields in DTO from Entity : " + + supplier.getQualifiedName()); + } + for (ObjectModelAttribute attr : supplier.getAttributes()) { + if (isPrimitiveType(attr) || isDateType(attr)) { + attributes.add(attr); + imports.addImport(attr.getType()); + } + if (GeneratorUtil.isNMultiplicity(attr)) { + imports.addImport("java.util.Collection"); + } + } + } + } + } + return attributes; + } + + private static final Set<String> numberTypes = new HashSet<String>(); + private static final Set<String> textTypes = new HashSet<String>(); + private static final Set<String> booleanTypes = new HashSet<String>(); + private static final Set<String> primitiveTypes = new HashSet<String>(); + + static { + numberTypes.add("byte"); + numberTypes.add("java.lang.Byte"); + numberTypes.add("Byte"); + numberTypes.add("short"); + numberTypes.add("java.lang.Short"); + numberTypes.add("Short"); + numberTypes.add("int"); + numberTypes.add("java.lang.Integer"); + numberTypes.add("Integer"); + numberTypes.add("long"); + numberTypes.add("java.lang.Long"); + numberTypes.add("Long"); + numberTypes.add("float"); + numberTypes.add("java.lang.Float"); + numberTypes.add("Float"); + numberTypes.add("double"); + numberTypes.add("java.lang.Double"); + numberTypes.add("Double"); + + textTypes.add("char"); + textTypes.add("java.lang.Char"); + textTypes.add("Char"); + textTypes.add("java.lang.String"); + textTypes.add("String"); + + booleanTypes.add("boolean"); + booleanTypes.add("java.lang.Boolean"); + booleanTypes.add("Boolean"); + + primitiveTypes.addAll(numberTypes); + primitiveTypes.addAll(textTypes); + primitiveTypes.addAll(booleanTypes); + } + + public static boolean isNumericType(ObjectModelAttribute attr) { + return numberTypes.contains(attr.getType()); + } + + public static boolean isTextType(ObjectModelAttribute attr) { + return textTypes.contains(attr.getType()); + } + + public static boolean isDateType(ObjectModelAttribute attr) { + return "java.util.Date".equals(attr.getType()); + } + + public static boolean isBooleanType(ObjectModelAttribute attr) { + return booleanTypes.contains(attr.getType()); + } + + public static boolean isPrimitiveType(ObjectModelAttribute attr) { + return primitiveTypes.contains(attr.getType()); + } + +} //BeanGenerator Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,363 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -/* - * *##% - * EUGene Test - * Copyright (C) 2007 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ -package org.nuiton.eugene.test.generator; - -import org.apache.commons.lang3.StringUtils; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.*; - -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -/*{generator option: parentheses = false}*/ - -/*{generator option: writeString = +}*/ -/** - * BeanTransformer - * <p/> - * Created: 28 oct. 2009 - * - * @author fdesbois - * @version $Id$ - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanTransformer" - */ -public class BeanTransformer extends ObjectModelTransformerToJava { - - public BeanTransformer() { - super(); - } - - @Override - public void transformFromClass(ObjectModelClass clazz) { - if (!clazz.hasStereotype(BeanGenerator.STEREOTYPE_BEAN) && - !clazz.hasStereotype(BeanGenerator.STEREOTYPE_DTO)) { - return; - } - - ObjectModelClass resultClass; - if (!clazz.getOperations().isEmpty()) { - resultClass = createAbstractClass(clazz.getName(), clazz.getPackageName()); - } else { - resultClass = createClass(clazz.getName(), clazz.getPackageName()); - } - - createForDTO(resultClass, clazz); - - // Set superclass - Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); - if (j.hasNext()) { - ObjectModelClass p = j.next(); - setSuperClass(resultClass, p.getQualifiedName()); - } - - // Add interfaces from inputModel - for (ObjectModelInterface parentInterface : clazz.getInterfaces()) { - addInterface(resultClass, parentInterface.getQualifiedName()); - } - - createListeners(resultClass, clazz); - - boolean hasEntity = false; - boolean hasMultipleAttribute = false; - - // Add attributes with getter/setter - for (ObjectModelAttribute attr : clazz.getAttributes()) { - - if (attr.isNavigable()/* || attr.hasAssociationClass()*/) { - String attrType = attr.getType(); - String simpleType = GeneratorUtil.getSimpleName(attrType); - String attrName = attr.getName(); - String attrNameCapitalized = StringUtils.capitalize(attrName); - - // multiple attribute - if (GeneratorUtil.isNMultiplicity(attr)) { - hasMultipleAttribute = true; - - // Add getChild - ObjectModelOperation getChild = addOperation(resultClass, "get" + attrNameCapitalized, - attrType, ObjectModelModifier.PUBLIC); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" - /*{ - <%=simpleType%> o = getChild(<%=attrName%>, index); - return o; - }*/ - ); - - // Add getEntity - ObjectModelClass attrEntity = null; - if (getModel().hasClass(attr.getType())) { - attrEntity = getModel().getClass(attr.getType()); - } - boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(BeanGenerator.STEREOTYPE_ENTITY)); - - if (isEntity) { - hasEntity = true; - ObjectModelOperation getChildEntity = addOperation(resultClass, "get" + attrNameCapitalized, - attrType, ObjectModelModifier.PUBLIC); - addParameter(getChildEntity, String.class.getName(), "topiaId"); - setOperationBody(getChildEntity, "" - /*{ - <%=simpleType%> o = getEntity(<%=attrName%>, topiaId); - return o; - }*/ - ); - } - - // Add addChild - ObjectModelOperation addChild = addOperation(resultClass, "add" + attrNameCapitalized, - attrType, ObjectModelModifier.PUBLIC); - addParameter(addChild, attrType, attrName); - setOperationBody(addChild, "" - - /*{ - get<%=attrNameCapitalized%>().add(<%=attrName%>); - firePropertyChange("<%=attrName%>", null, <%=attrName%>); - return <%=attrName%>; - }*/ - ); - - // Add removeChild - ObjectModelOperation removeChild = addOperation(resultClass, "remove" + attrNameCapitalized, - "boolean", ObjectModelModifier.PUBLIC); - addParameter(removeChild, attrType, attrName); - setOperationBody(removeChild, "" - - /*{ - boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); - if (removed) { - firePropertyChange("<%=attrName%>", <%=attrName%>, null); - } - return removed; - }*/ - ); - - // Change type for Multiple attribute - if (attr.isOrdered()) { - attrType = List.class.getName() + "<" + attrType + ">"; - } else { - attrType = Collection.class.getName() + "<" + attrType + ">"; - } - simpleType = GeneratorUtil.getSimpleName(attrType); - } - - if (attr.hasAssociationClass()) { - String assocAttrName = BeanGenerator.getAssocAttrName(attr); - attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - attrType = attr.getAssociationClass().getName(); - } - - // Add attribute - String visibility = attr.getVisibility(); - addAttribute(resultClass, attrName, attrType, "", ObjectModelModifier.toValue(visibility)); - - // Add getter - ObjectModelOperation getter = addOperation(resultClass, "get" + attrNameCapitalized, attrType, - ObjectModelModifier.PUBLIC); - setOperationBody(getter, "" - /*{ - return this.<%=attrName%>; - }*/ - ); - - // Add setter - ObjectModelOperation setter = addOperation(resultClass, "set" + attrNameCapitalized, "void", - ObjectModelModifier.PUBLIC); - addParameter(setter, attrType, "newValue"); - setOperationBody(setter, "" - /*{ - <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); - this.<%=attrName%> = newValue; - firePropertyChange("<%=attrName%>", oldValue, newValue); - }*/ - ); - - } - } - - // Add helper methods - if (hasMultipleAttribute) { - ObjectModelOperation getChild = addOperation(resultClass, "getChild", "<T> T", - ObjectModelModifier.PROTECTED); - addParameter(getChild, "java.util.Collection<T>", "childs"); - addParameter(getChild, "int", "index"); - setOperationBody(getChild, "" - /*{ - if (childs != null) { - int i = 0; - for (T o : childs) { - if (index == i) { - return o; - } - i++; - } - } - return null; - }*/ - ); - } - - if (hasEntity) { - ObjectModelOperation getEntity = addOperation(resultClass, "getEntity", - "<T extends org.nuiton.topia.persistence.TopiaEntity> T", ObjectModelModifier.PROTECTED); - addParameter(getEntity, "java.util.Collection<T>", "childs"); - addParameter(getEntity, "java.lang.String", "topiaId"); - setOperationBody(getEntity, "" - /*{ - if (childs != null) { - for (T o : childs) { - if (topiaId.equals(o.getTopiaId())) { - return o; - } - } - } - return null; - }*/ - ); - } - - // Add operations - for (ObjectModelOperation op : clazz.getOperations()) { - String visibility = op.getVisibility(); - ObjectModelOperation resultOperation = addOperation(resultClass, op.getName(), op.getReturnType(), - ObjectModelModifier.toValue(visibility), ObjectModelModifier.ABSTRACT); - - for (ObjectModelParameter param : op.getParameters()) { - addParameter(resultOperation, param.getType(), param.getName()); - } - - for (String exception : op.getExceptions()) { - addException(resultOperation, exception); - } - } - - - } - - private void createForDTO(ObjectModelClass resultClass, ObjectModelClass inputClass) { - - // Add Serializable implements for DTO generation - if (inputClass.hasStereotype(BeanGenerator.STEREOTYPE_DTO)) { - addInterface(resultClass, "java.io.Serializable"); - } - - String svUID = "1L"; - if (svUID != null) { - addConstant(resultClass, "serialVersionUID", "long", svUID, ObjectModelModifier.PUBLIC); - } - } - - protected void createListeners(ObjectModelClass resultClass, ObjectModelClass inputClass) { - - addAttribute(resultClass, "pcs", "java.beans.PropertyChangeSupport", "", - ObjectModelModifier.PROTECTED, ObjectModelModifier.FINAL); - - // Default constructor - ObjectModelOperation constructor = addConstructor(resultClass, ObjectModelModifier.PUBLIC); - setOperationBody(constructor, "" - /*{ - pcs = new PropertyChangeSupport(this); - }*/ - ); - - // Add PropertyListener - String propType = "java.beans.PropertyChangeListener"; - String strType = String.class.getName(); - String objectType = Object.class.getName(); - - ObjectModelOperation addPropertyChangeListener = addOperation(resultClass, - "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); - addParameter(addPropertyChangeListener, propType, "listener"); - setOperationBody(addPropertyChangeListener, "" - /*{ - pcs.addPropertyChangeListener(listener); - }*/ - ); - - ObjectModelOperation addPropertyChangeListenerPlus = addOperation(resultClass, - "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); - addParameter(addPropertyChangeListenerPlus, strType, "propertyName"); - addParameter(addPropertyChangeListenerPlus, propType, "listener"); - setOperationBody(addPropertyChangeListenerPlus, "" - /*{ - pcs.addPropertyChangeListener(propertyName, listener); - }*/ - ); - - ObjectModelOperation removePropertyChangeListener = addOperation(resultClass, - "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); - addParameter(removePropertyChangeListener, propType, "listener"); - setOperationBody(removePropertyChangeListener, "" - /*{ - pcs.removePropertyChangeListener(listener); - }*/ - ); - - ObjectModelOperation removePropertyChangeListenerPlus = addOperation(resultClass, - "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); - addParameter(removePropertyChangeListenerPlus, strType, "propertyName"); - addParameter(removePropertyChangeListenerPlus, propType, "listener"); - setOperationBody(removePropertyChangeListenerPlus, "" - /*{ - pcs.removePropertyChangeListener(propertyName, listener); - }*/ - ); - - ObjectModelOperation firePropertyChange = addOperation(resultClass, - "firePropertyChange", "void", ObjectModelModifier.PROTECTED); - addParameter(firePropertyChange, strType, "propertyName"); - addParameter(firePropertyChange, objectType, "oldValue"); - addParameter(firePropertyChange, objectType, "newValue"); - setOperationBody(firePropertyChange, "" - /*{ - pcs.firePropertyChange(propertyName, oldValue, newValue); - }*/ - ); - } - - -} Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,363 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* + * *##% + * EUGene Test + * Copyright (C) 2007 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package org.nuiton.eugene.test.generator; + +import org.apache.commons.lang3.StringUtils; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.*; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +/*{generator option: parentheses = false}*/ + +/*{generator option: writeString = +}*/ +/** + * BeanTransformer + * <p/> + * Created: 28 oct. 2009 + * + * @author fdesbois + * @version $Id$ + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanTransformer" + */ +public class BeanTransformer extends ObjectModelTransformerToJava { + + public BeanTransformer() { + super(); + } + + @Override + public void transformFromClass(ObjectModelClass clazz) { + if (!clazz.hasStereotype(BeanGenerator.STEREOTYPE_BEAN) && + !clazz.hasStereotype(BeanGenerator.STEREOTYPE_DTO)) { + return; + } + + ObjectModelClass resultClass; + if (!clazz.getOperations().isEmpty()) { + resultClass = createAbstractClass(clazz.getName(), clazz.getPackageName()); + } else { + resultClass = createClass(clazz.getName(), clazz.getPackageName()); + } + + createForDTO(resultClass, clazz); + + // Set superclass + Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); + if (j.hasNext()) { + ObjectModelClass p = j.next(); + setSuperClass(resultClass, p.getQualifiedName()); + } + + // Add interfaces from inputModel + for (ObjectModelInterface parentInterface : clazz.getInterfaces()) { + addInterface(resultClass, parentInterface.getQualifiedName()); + } + + createListeners(resultClass, clazz); + + boolean hasEntity = false; + boolean hasMultipleAttribute = false; + + // Add attributes with getter/setter + for (ObjectModelAttribute attr : clazz.getAttributes()) { + + if (attr.isNavigable()/* || attr.hasAssociationClass()*/) { + String attrType = attr.getType(); + String simpleType = GeneratorUtil.getSimpleName(attrType); + String attrName = attr.getName(); + String attrNameCapitalized = StringUtils.capitalize(attrName); + + // multiple attribute + if (GeneratorUtil.isNMultiplicity(attr)) { + hasMultipleAttribute = true; + + // Add getChild + ObjectModelOperation getChild = addOperation(resultClass, "get" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(getChild, "int", "index"); + setOperationBody(getChild, "" + /*{ + <%=simpleType%> o = getChild(<%=attrName%>, index); + return o; + }*/ + ); + + // Add getEntity + ObjectModelClass attrEntity = null; + if (getModel().hasClass(attr.getType())) { + attrEntity = getModel().getClass(attr.getType()); + } + boolean isEntity = (attrEntity != null && attrEntity.hasStereotype(BeanGenerator.STEREOTYPE_ENTITY)); + + if (isEntity) { + hasEntity = true; + ObjectModelOperation getChildEntity = addOperation(resultClass, "get" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(getChildEntity, String.class.getName(), "topiaId"); + setOperationBody(getChildEntity, "" + /*{ + <%=simpleType%> o = getEntity(<%=attrName%>, topiaId); + return o; + }*/ + ); + } + + // Add addChild + ObjectModelOperation addChild = addOperation(resultClass, "add" + attrNameCapitalized, + attrType, ObjectModelModifier.PUBLIC); + addParameter(addChild, attrType, attrName); + setOperationBody(addChild, "" + + /*{ + get<%=attrNameCapitalized%>().add(<%=attrName%>); + firePropertyChange("<%=attrName%>", null, <%=attrName%>); + return <%=attrName%>; + }*/ + ); + + // Add removeChild + ObjectModelOperation removeChild = addOperation(resultClass, "remove" + attrNameCapitalized, + "boolean", ObjectModelModifier.PUBLIC); + addParameter(removeChild, attrType, attrName); + setOperationBody(removeChild, "" + + /*{ + boolean removed = get<%=attrNameCapitalized%>().remove(<%=attrName%>); + if (removed) { + firePropertyChange("<%=attrName%>", <%=attrName%>, null); + } + return removed; + }*/ + ); + + // Change type for Multiple attribute + if (attr.isOrdered()) { + attrType = List.class.getName() + "<" + attrType + ">"; + } else { + attrType = Collection.class.getName() + "<" + attrType + ">"; + } + simpleType = GeneratorUtil.getSimpleName(attrType); + } + + if (attr.hasAssociationClass()) { + String assocAttrName = BeanGenerator.getAssocAttrName(attr); + attrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); + attrType = attr.getAssociationClass().getName(); + } + + // Add attribute + String visibility = attr.getVisibility(); + addAttribute(resultClass, attrName, attrType, "", ObjectModelModifier.toValue(visibility)); + + // Add getter + ObjectModelOperation getter = addOperation(resultClass, "get" + attrNameCapitalized, attrType, + ObjectModelModifier.PUBLIC); + setOperationBody(getter, "" + /*{ + return this.<%=attrName%>; + }*/ + ); + + // Add setter + ObjectModelOperation setter = addOperation(resultClass, "set" + attrNameCapitalized, "void", + ObjectModelModifier.PUBLIC); + addParameter(setter, attrType, "newValue"); + setOperationBody(setter, "" + /*{ + <%=simpleType%> oldValue = get<%=attrNameCapitalized%>(); + this.<%=attrName%> = newValue; + firePropertyChange("<%=attrName%>", oldValue, newValue); + }*/ + ); + + } + } + + // Add helper methods + if (hasMultipleAttribute) { + ObjectModelOperation getChild = addOperation(resultClass, "getChild", "<T> T", + ObjectModelModifier.PROTECTED); + addParameter(getChild, "java.util.Collection<T>", "childs"); + addParameter(getChild, "int", "index"); + setOperationBody(getChild, "" + /*{ + if (childs != null) { + int i = 0; + for (T o : childs) { + if (index == i) { + return o; + } + i++; + } + } + return null; + }*/ + ); + } + + if (hasEntity) { + ObjectModelOperation getEntity = addOperation(resultClass, "getEntity", + "<T extends org.nuiton.topia.persistence.TopiaEntity> T", ObjectModelModifier.PROTECTED); + addParameter(getEntity, "java.util.Collection<T>", "childs"); + addParameter(getEntity, "java.lang.String", "topiaId"); + setOperationBody(getEntity, "" + /*{ + if (childs != null) { + for (T o : childs) { + if (topiaId.equals(o.getTopiaId())) { + return o; + } + } + } + return null; + }*/ + ); + } + + // Add operations + for (ObjectModelOperation op : clazz.getOperations()) { + String visibility = op.getVisibility(); + ObjectModelOperation resultOperation = addOperation(resultClass, op.getName(), op.getReturnType(), + ObjectModelModifier.toValue(visibility), ObjectModelModifier.ABSTRACT); + + for (ObjectModelParameter param : op.getParameters()) { + addParameter(resultOperation, param.getType(), param.getName()); + } + + for (String exception : op.getExceptions()) { + addException(resultOperation, exception); + } + } + + + } + + private void createForDTO(ObjectModelClass resultClass, ObjectModelClass inputClass) { + + // Add Serializable implements for DTO generation + if (inputClass.hasStereotype(BeanGenerator.STEREOTYPE_DTO)) { + addInterface(resultClass, "java.io.Serializable"); + } + + String svUID = "1L"; + if (svUID != null) { + addConstant(resultClass, "serialVersionUID", "long", svUID, ObjectModelModifier.PUBLIC); + } + } + + protected void createListeners(ObjectModelClass resultClass, ObjectModelClass inputClass) { + + addAttribute(resultClass, "pcs", "java.beans.PropertyChangeSupport", "", + ObjectModelModifier.PROTECTED, ObjectModelModifier.FINAL); + + // Default constructor + ObjectModelOperation constructor = addConstructor(resultClass, ObjectModelModifier.PUBLIC); + setOperationBody(constructor, "" + /*{ + pcs = new PropertyChangeSupport(this); + }*/ + ); + + // Add PropertyListener + String propType = "java.beans.PropertyChangeListener"; + String strType = String.class.getName(); + String objectType = Object.class.getName(); + + ObjectModelOperation addPropertyChangeListener = addOperation(resultClass, + "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(addPropertyChangeListener, propType, "listener"); + setOperationBody(addPropertyChangeListener, "" + /*{ + pcs.addPropertyChangeListener(listener); + }*/ + ); + + ObjectModelOperation addPropertyChangeListenerPlus = addOperation(resultClass, + "addPropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(addPropertyChangeListenerPlus, strType, "propertyName"); + addParameter(addPropertyChangeListenerPlus, propType, "listener"); + setOperationBody(addPropertyChangeListenerPlus, "" + /*{ + pcs.addPropertyChangeListener(propertyName, listener); + }*/ + ); + + ObjectModelOperation removePropertyChangeListener = addOperation(resultClass, + "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(removePropertyChangeListener, propType, "listener"); + setOperationBody(removePropertyChangeListener, "" + /*{ + pcs.removePropertyChangeListener(listener); + }*/ + ); + + ObjectModelOperation removePropertyChangeListenerPlus = addOperation(resultClass, + "removePropertyChangeListener", "void", ObjectModelModifier.PUBLIC); + addParameter(removePropertyChangeListenerPlus, strType, "propertyName"); + addParameter(removePropertyChangeListenerPlus, propType, "listener"); + setOperationBody(removePropertyChangeListenerPlus, "" + /*{ + pcs.removePropertyChangeListener(propertyName, listener); + }*/ + ); + + ObjectModelOperation firePropertyChange = addOperation(resultClass, + "firePropertyChange", "void", ObjectModelModifier.PROTECTED); + addParameter(firePropertyChange, strType, "propertyName"); + addParameter(firePropertyChange, objectType, "oldValue"); + addParameter(firePropertyChange, objectType, "newValue"); + setOperationBody(firePropertyChange, "" + /*{ + pcs.firePropertyChange(propertyName, oldValue, newValue); + }*/ + ); + } + + +} Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,62 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.eugene.test.generator; - -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModelClass; - -/** - * Megatron - * - * Chainage des transformer : Modele de depart -> transformation dans BeanTransformer = modele d'entrée de Megatron - * - * Created: 12 nov. 2009 - * - * @author fdesbois - * @version $Id$ - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.Megatron" - */ -public class Megatron extends ObjectModelTransformerToJava { - - public Megatron() { - super(); - } - - /* - CAS modele de sortie vide : modele d'entree transformee par BeanTransformer - */ - @Override - protected ObjectModelTransformerToJava initPreviousTransformer() { - return new BeanTransformer(); - } - - @Override - public void transformFromClass(ObjectModelClass clazz) { - - - - } - -} Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,62 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.eugene.test.generator; + +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModelClass; + +/** + * Megatron + * + * Chainage des transformer : Modele de depart -> transformation dans BeanTransformer = modele d'entrée de Megatron + * + * Created: 12 nov. 2009 + * + * @author fdesbois + * @version $Id$ + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.Megatron" + */ +public class Megatron extends ObjectModelTransformerToJava { + + public Megatron() { + super(); + } + + /* + CAS modele de sortie vide : modele d'entree transformee par BeanTransformer + */ + @Override + protected ObjectModelTransformerToJava initPreviousTransformer() { + return new BeanTransformer(); + } + + @Override + public void transformFromClass(ObjectModelClass clazz) { + + + + } + +} Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,116 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -/* - * *##% - * EUGene Test - * Copyright (C) 2007 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ - -package org.nuiton.eugene.test.generator; - -import org.nuiton.eugene.java.JavaBuilder; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; - -/*{generator option: parentheses = false}*/ -/*{generator option: writeString = +}*/ -/** - * TestBuilder - * - * Created: 25 oct. 2009 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ -public class TestBuilder extends JavaBuilder { - - public TestBuilder() { - super("TestModel"); - } - - //@Override - public void build() { - createRole(); - createPerson(); - } - - private void createRole() { - ObjectModelClass roleClass = createClass("Role", "org.chorem.bonzoms"); - - addAttribute(roleClass, "name", "java.lang.String"); - - //this.addImportForClassifier(roleClass, Date.class); - addAttribute(roleClass, "fromDate", "java.util.Date"); - addAttribute(roleClass, "thruDate", "java.util.Date"); - } - - private void createPerson() { - ObjectModelClass personneClass = createClass("Person", "org.chorem.bonzoms"); - - addAttribute(personneClass, "lastName", "java.lang.String"); - addAttribute(personneClass, "firstName", "java.lang.String", "\"2.0\""); - - //this.addImportForClassifier(personneClass, List.class); - addAttribute(personneClass, "roles", "java.util.List<org.chorem.bonzoms.Role>", - "new java.util.ArrayList<org.chorem.bonzoms.Role>()"); - - - ObjectModelOperation setLastName = addOperation(personneClass, "setLastName", "void", - ObjectModelModifier.PUBLIC); - addParameter(setLastName, "java.lang.String", "lastName"); - setOperationBody(setLastName, "" - /*{ - this.lastName = lastName; - }*/ - ); - - ObjectModelOperation getLastName = addOperation(personneClass, "getLastName", "java.lang.String", - ObjectModelModifier.PUBLIC); - setOperationBody(getLastName, "" - /*{ - return this.lastName; - }*/ - ); - } - -} Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestBuilder.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,116 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* + * *##% + * EUGene Test + * Copyright (C) 2007 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ + +package org.nuiton.eugene.test.generator; + +import org.nuiton.eugene.java.JavaBuilder; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ +/** + * TestBuilder + * + * Created: 25 oct. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : */ +public class TestBuilder extends JavaBuilder { + + public TestBuilder() { + super("TestModel"); + } + + //@Override + public void build() { + createRole(); + createPerson(); + } + + private void createRole() { + ObjectModelClass roleClass = createClass("Role", "org.chorem.bonzoms"); + + addAttribute(roleClass, "name", "java.lang.String"); + + //this.addImportForClassifier(roleClass, Date.class); + addAttribute(roleClass, "fromDate", "java.util.Date"); + addAttribute(roleClass, "thruDate", "java.util.Date"); + } + + private void createPerson() { + ObjectModelClass personneClass = createClass("Person", "org.chorem.bonzoms"); + + addAttribute(personneClass, "lastName", "java.lang.String"); + addAttribute(personneClass, "firstName", "java.lang.String", "\"2.0\""); + + //this.addImportForClassifier(personneClass, List.class); + addAttribute(personneClass, "roles", "java.util.List<org.chorem.bonzoms.Role>", + "new java.util.ArrayList<org.chorem.bonzoms.Role>()"); + + + ObjectModelOperation setLastName = addOperation(personneClass, "setLastName", "void", + ObjectModelModifier.PUBLIC); + addParameter(setLastName, "java.lang.String", "lastName"); + setOperationBody(setLastName, "" + /*{ + this.lastName = lastName; + }*/ + ); + + ObjectModelOperation getLastName = addOperation(personneClass, "getLastName", "java.lang.String", + ObjectModelModifier.PUBLIC); + setOperationBody(getLastName, "" + /*{ + return this.lastName; + }*/ + ); + } + +} Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,74 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -/* - * *##% - * EUGene Test - * Copyright (C) 2007 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ - -package org.nuiton.eugene.test.generator; - -import java.io.File; -import org.nuiton.eugene.ModelReader; -import org.nuiton.eugene.models.object.ObjectModel; - -/** - * TestReader - * - * Created: 27 oct. 2009 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ -public class TestReader extends ModelReader<ObjectModel> { - - - @Override - public ObjectModel read(File[] file) { - TestBuilder builder = new TestBuilder(); - - builder.build(); - - return builder.getModel(); - } - -} Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/TestReader.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,74 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* + * *##% + * EUGene Test + * Copyright (C) 2007 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ + +package org.nuiton.eugene.test.generator; + +import java.io.File; +import org.nuiton.eugene.ModelReader; +import org.nuiton.eugene.models.object.ObjectModel; + +/** + * TestReader + * + * Created: 27 oct. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : */ +public class TestReader extends ModelReader<ObjectModel> { + + + @Override + public ObjectModel read(File[] file) { + TestBuilder builder = new TestBuilder(); + + builder.build(); + + return builder.getModel(); + } + +} Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,36 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -# Global logging configuration -log4j.rootLogger=ERROR, stdout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -# package level -log4j.logger.org.nuiton.eugene=DEBUG -log4j.logger.org.nuiton.eugene.test=DEBUG -log4j.logger.org.nuiton.processor=DEBUG Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/main/resources/log4j.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,36 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.nuiton.eugene=DEBUG +log4j.logger.org.nuiton.eugene.test=DEBUG +log4j.logger.org.nuiton.processor=DEBUG Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,110 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -/* - * *##% - * EUGene Test - * Copyright (C) 2007 - 2009 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * ##%* - */ -package org.nuiton.eugene.test.generator; - -import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.junit.Assert.*; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelOperation; - -/** - * - * @author fdesbois - */ -public class TestBuilderTest { - - private static final Log log = LogFactory.getLog(TestBuilderTest.class); - - public TestBuilderTest() { - } - - @BeforeClass - public static void setUpClass() throws Exception { - } - - @AfterClass - public static void tearDownClass() throws Exception { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - /** - * Test of build method, of class TestBuilder. - */ - @Test - public void testBuild() { - System.out.println("build"); - TestBuilder instance = new TestBuilder(); - - instance.build(); - - ObjectModel result = instance.getModel(); - assertNotNull(result); - assertEquals(result.getClasses().size(), 2); - ObjectModelClass clazz = result.getClass("org.chorem.bonzoms.Person"); - assertNotNull(clazz); - assertEquals(clazz.getAttributes().size(), 3); - assertEquals(clazz.getOperations().size(), 2); - List<ObjectModelOperation> operations = (List<ObjectModelOperation>)clazz.getOperations(); - ObjectModelOperation operation = operations.get(0); - log.debug("Body code [" + operation.getName() + "] : " + operation.getBodyCode()); - assertFalse(operation.getBodyCode().isEmpty()); - } - -} \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/java/org/nuiton/eugene/test/generator/TestBuilderTest.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,110 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* + * *##% + * EUGene Test + * Copyright (C) 2007 - 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * ##%* + */ +package org.nuiton.eugene.test.generator; + +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import static org.junit.Assert.*; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/** + * + * @author fdesbois + */ +public class TestBuilderTest { + + private static final Log log = LogFactory.getLog(TestBuilderTest.class); + + public TestBuilderTest() { + } + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test of build method, of class TestBuilder. + */ + @Test + public void testBuild() { + System.out.println("build"); + TestBuilder instance = new TestBuilder(); + + instance.build(); + + ObjectModel result = instance.getModel(); + assertNotNull(result); + assertEquals(result.getClasses().size(), 2); + ObjectModelClass clazz = result.getClass("org.chorem.bonzoms.Person"); + assertNotNull(clazz); + assertEquals(clazz.getAttributes().size(), 3); + assertEquals(clazz.getOperations().size(), 2); + List<ObjectModelOperation> operations = (List<ObjectModelOperation>)clazz.getOperations(); + ObjectModelOperation operation = operations.get(0); + log.debug("Body code [" + operation.getName() + "] : " + operation.getBodyCode()); + assertFalse(operation.getBodyCode().isEmpty()); + } + +} \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="TopiaTest" version="1"> - <class name="Personne" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <superclass name="org.nuiton.eugene.test.Party2" discriminator=""/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="otherNames" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="0" maxMultiplicity="-1"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Address" reverseAttributeName="" associationType="aggregate" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="Employe" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <superclass name="org.nuiton.eugene.test.Personne" discriminator=""/> - <attribute name="salary" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> - <attribute name="lead" visibility="public" type="org.nuiton.eugene.test.Department" reverseAttributeName="leader" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="1" navigable="false" ordering="unordered"/> - </class> - <class name="Company" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Employe" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - <attribute visibility="public" associationClassName="org.nuiton.eugene.test.Bill" type="org.nuiton.eugene.test.Store" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Department" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Address" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <attribute name="city" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="adress" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Personne" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> - </class> - <class name="Department" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="leader" visibility="public" type="org.nuiton.eugene.test.Employe" reverseAttributeName="lead" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Product" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Product" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Department" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Type" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="Store" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="DEFAULT_NUM" associationType="composite" visibility="public" static="true" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="numStore" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <operation name="getDefaultNum" visibility="public" static="true"> - <returnParameter type="java.lang.String"/> - </operation> - <class name="Row" package="org.nuiton.eugene.test"> - <attribute name="num" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="position" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - </class> - <attribute visibility="public" associationClassName="org.nuiton.eugene.test.Bill" type="org.nuiton.eugene.test.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> - </class> - <class name="Type" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test.Product" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> - </class> - <associationClass name="Bill" package="org.nuiton.eugene.test"> - <stereotype name="entity"/> - <participant name="org.nuiton.eugene.test.Company" attribute=""/> - <participant name="org.nuiton.eugene.test.Store" attribute=""/> - <attribute name="cost" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="date" associationType="composite" visibility="public" type="java.util.Date" minMultiplicity="1" maxMultiplicity="1"/> - </associationClass> - <class name="Voiture" abstract="true" package="org.nuiton.eugene.test.beangen"> - <stereotype name="bean"/> - <tagValue name="documentation" value="Doc for BeanA"/> - <attribute name="immatriculation" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"> - <tagValue name="documentation" value="attrA of BeanA"/> - </attribute> - <attribute name="modele" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="proprietaire" associationType="composite" visibility="public" type="org.nuiton.eugene.test.beangen.PersonneDTO" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Roue" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="4" maxMultiplicity="4" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Siege" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="4" navigable="true" ordering="unordered"/> - </class> - <class name="Roue" package="org.nuiton.eugene.test.beangen"> - <stereotype name="bean"/> - <operation name="mount" visibility="public"> - <returnParameter type="void"/> - </operation> - <operation name="getModel" visibility="public"> - <returnParameter type="int"/> - <parameter name="id" type="java.lang.String"/> - </operation> - <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="RelationDTO" package="org.nuiton.eugene.test.beangen"> - <stereotype name="dto"/> - <attribute name="idCompany" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="idDepartement" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="dateDebut" associationType="composite" visibility="public" type="java.util.Date" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="person" visibility="public" type="org.nuiton.eugene.test.beangen.PersonneDTO" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="PersonneDTO" package="org.nuiton.eugene.test.beangen"> - <dependency name="" supplierName="org.nuiton.eugene.test.Personne"/> - <stereotype name="dto"/> - <attribute visibility="public" type="org.nuiton.eugene.test.beangen.RelationDTO" reverseAttributeName="person" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> - </class> - <class name="Siege" package="org.nuiton.eugene.test.beangen"> - <stereotype name="bean"/> - <attribute name="noSerie" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <interface name="Vehicule" package="org.nuiton.eugene.test.beangen"> - <operation name="start" visibility="public"> - <returnParameter type="void"/> - </operation> - </interface> - <class name="Contact2" package="org.nuiton.eugene.test.deletetest"> - <stereotype name="entity"/> - <attribute name="contactValue" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="type" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <operation name="findAllByCompany" visibility="public"> - <returnParameter type="java.util.Set<Contact2>"/> - <parameter name="company" type="org.nuiton.eugene.test.Company"/> - <stereotype name="dao"/> - </operation> - <attribute visibility="public" type="org.nuiton.eugene.test.Party2" reverseAttributeName="contacts" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Telephone2" package="org.nuiton.eugene.test.deletetest"> - <stereotype name="entity"/> - <superclass name="org.nuiton.eugene.test.Contact2" discriminator=""/> - <attribute name="prefix" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="country" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - </class> - <class name="Party2" package="org.nuiton.eugene.test.deletetest"> - <stereotype name="entity"/> - <attribute name="contacts" visibility="public" type="org.nuiton.eugene.test.Contact2" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Person" package="org.nuiton.topia.test.entities"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="firstname" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.topia.test.entities.Pet" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Pet" package="org.nuiton.topia.test.entities"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="type" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.topia.test.entities.Person" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.topia.test.entities.Race" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="Race" package="org.nuiton.topia.test.entities"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.topia.test.entities.Pet" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> - </class> - <class name="Set<Contact2>" package="java.util"/> -</objectModel> Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest.objectmodel 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,178 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="TopiaTest" version="1"> + <class name="Personne" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <superclass name="org.nuiton.eugene.test.Party2" discriminator=""/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="otherNames" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="0" maxMultiplicity="-1"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Address" reverseAttributeName="" associationType="aggregate" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="Employe" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <superclass name="org.nuiton.eugene.test.Personne" discriminator=""/> + <attribute name="salary" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> + <attribute name="lead" visibility="public" type="org.nuiton.eugene.test.Department" reverseAttributeName="leader" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="1" navigable="false" ordering="unordered"/> + </class> + <class name="Company" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Employe" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + <attribute visibility="public" associationClassName="org.nuiton.eugene.test.Bill" type="org.nuiton.eugene.test.Store" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Department" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Address" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <attribute name="city" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="adress" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Personne" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> + </class> + <class name="Department" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="leader" visibility="public" type="org.nuiton.eugene.test.Employe" reverseAttributeName="lead" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Product" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Product" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Department" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Type" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="Store" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="DEFAULT_NUM" associationType="composite" visibility="public" static="true" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="numStore" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <operation name="getDefaultNum" visibility="public" static="true"> + <returnParameter type="java.lang.String"/> + </operation> + <class name="Row" package="org.nuiton.eugene.test"> + <attribute name="num" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="position" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + </class> + <attribute visibility="public" associationClassName="org.nuiton.eugene.test.Bill" type="org.nuiton.eugene.test.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> + </class> + <class name="Type" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test.Product" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> + </class> + <associationClass name="Bill" package="org.nuiton.eugene.test"> + <stereotype name="entity"/> + <participant name="org.nuiton.eugene.test.Company" attribute=""/> + <participant name="org.nuiton.eugene.test.Store" attribute=""/> + <attribute name="cost" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="date" associationType="composite" visibility="public" type="java.util.Date" minMultiplicity="1" maxMultiplicity="1"/> + </associationClass> + <class name="Voiture" abstract="true" package="org.nuiton.eugene.test.beangen"> + <stereotype name="bean"/> + <tagValue name="documentation" value="Doc for BeanA"/> + <attribute name="immatriculation" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"> + <tagValue name="documentation" value="attrA of BeanA"/> + </attribute> + <attribute name="modele" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="proprietaire" associationType="composite" visibility="public" type="org.nuiton.eugene.test.beangen.PersonneDTO" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Roue" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="4" maxMultiplicity="4" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Siege" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="4" navigable="true" ordering="unordered"/> + </class> + <class name="Roue" package="org.nuiton.eugene.test.beangen"> + <stereotype name="bean"/> + <operation name="mount" visibility="public"> + <returnParameter type="void"/> + </operation> + <operation name="getModel" visibility="public"> + <returnParameter type="int"/> + <parameter name="id" type="java.lang.String"/> + </operation> + <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="RelationDTO" package="org.nuiton.eugene.test.beangen"> + <stereotype name="dto"/> + <attribute name="idCompany" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="idDepartement" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="dateDebut" associationType="composite" visibility="public" type="java.util.Date" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="person" visibility="public" type="org.nuiton.eugene.test.beangen.PersonneDTO" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="PersonneDTO" package="org.nuiton.eugene.test.beangen"> + <dependency name="" supplierName="org.nuiton.eugene.test.Personne"/> + <stereotype name="dto"/> + <attribute visibility="public" type="org.nuiton.eugene.test.beangen.RelationDTO" reverseAttributeName="person" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> + </class> + <class name="Siege" package="org.nuiton.eugene.test.beangen"> + <stereotype name="bean"/> + <attribute name="noSerie" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <interface name="Vehicule" package="org.nuiton.eugene.test.beangen"> + <operation name="start" visibility="public"> + <returnParameter type="void"/> + </operation> + </interface> + <class name="Contact2" package="org.nuiton.eugene.test.deletetest"> + <stereotype name="entity"/> + <attribute name="contactValue" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="type" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <operation name="findAllByCompany" visibility="public"> + <returnParameter type="java.util.Set<Contact2>"/> + <parameter name="company" type="org.nuiton.eugene.test.Company"/> + <stereotype name="dao"/> + </operation> + <attribute visibility="public" type="org.nuiton.eugene.test.Party2" reverseAttributeName="contacts" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Telephone2" package="org.nuiton.eugene.test.deletetest"> + <stereotype name="entity"/> + <superclass name="org.nuiton.eugene.test.Contact2" discriminator=""/> + <attribute name="prefix" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="country" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + </class> + <class name="Party2" package="org.nuiton.eugene.test.deletetest"> + <stereotype name="entity"/> + <attribute name="contacts" visibility="public" type="org.nuiton.eugene.test.Contact2" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Person" package="org.nuiton.topia.test.entities"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="firstname" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.topia.test.entities.Pet" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Pet" package="org.nuiton.topia.test.entities"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="type" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.topia.test.entities.Person" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.topia.test.entities.Race" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="Race" package="org.nuiton.topia.test.entities"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.topia.test.entities.Pet" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> + </class> + <class name="Set<Contact2>" package="java.util"/> +</objectModel> Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="TopiaTest" version="1"> - <class name="Personne" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <superclass name="org.nuiton.eugene.test2.Party2" discriminator=""/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="otherNames" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="0" maxMultiplicity="-1"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Address" reverseAttributeName="" associationType="aggregate" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="Employe" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <superclass name="org.nuiton.eugene.test2.Personne" discriminator=""/> - <attribute name="salary" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> - <attribute name="lead" visibility="public" type="org.nuiton.eugene.test2.Department" reverseAttributeName="leader" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="1" navigable="false" ordering="unordered"/> - </class> - <class name="Company" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Employe" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - <attribute visibility="public" associationClassName="org.nuiton.eugene.test2.Bill" type="org.nuiton.eugene.test2.Store" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Department" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Address" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <attribute name="city" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="adress" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Personne" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> - </class> - <class name="Department" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="leader" visibility="public" type="org.nuiton.eugene.test2.Employe" reverseAttributeName="lead" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Product" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Product" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Department" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Type" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="Store" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="DEFAULT_NUM" associationType="composite" visibility="public" static="true" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="numStore" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <operation name="getDefaultNum" visibility="public" static="true"> - <returnParameter type="java.lang.String"/> - </operation> - <class name="Row" package="org.nuiton.eugene.test2"> - <attribute name="num" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="position" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - </class> - <attribute visibility="public" associationClassName="org.nuiton.eugene.test2.Bill" type="org.nuiton.eugene.test2.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> - </class> - <class name="Type" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.Product" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> - </class> - <associationClass name="Bill" package="org.nuiton.eugene.test2"> - <stereotype name="entity"/> - <participant name="org.nuiton.eugene.test2.Company" attribute=""/> - <participant name="org.nuiton.eugene.test2.Store" attribute=""/> - <attribute name="cost" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="date" associationType="composite" visibility="public" type="java.util.Date" minMultiplicity="1" maxMultiplicity="1"/> - </associationClass> - <class name="Voiture" abstract="true" package="org.nuiton.eugene.test2.beangen"> - <stereotype name="bean"/> - <tagValue name="documentation" value="Doc for BeanA"/> - <attribute name="immatriculation" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"> - <tagValue name="documentation" value="attrA of BeanA"/> - </attribute> - <attribute name="modele" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="proprietaire" associationType="composite" visibility="public" type="org.nuiton.eugene.test2.beangen.PersonneDTO" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Roue" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="4" maxMultiplicity="4" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Siege" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="4" navigable="true" ordering="unordered"/> - </class> - <class name="Roue" package="org.nuiton.eugene.test2.beangen"> - <stereotype name="bean"/> - <operation name="mount" visibility="public"> - <returnParameter type="void"/> - </operation> - <operation name="getModel" visibility="public"> - <returnParameter type="int"/> - <parameter name="id" type="java.lang.String"/> - </operation> - <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="RelationDTO" package="org.nuiton.eugene.test2.beangen"> - <stereotype name="dto"/> - <attribute name="idCompany" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="idDepartement" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="dateDebut" associationType="composite" visibility="public" type="java.util.Date" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="person" visibility="public" type="org.nuiton.eugene.test2.beangen.PersonneDTO" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="PersonneDTO" package="org.nuiton.eugene.test2.beangen"> - <dependency name="" supplierName="org.nuiton.eugene.test2.Personne"/> - <stereotype name="dto"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.RelationDTO" reverseAttributeName="person" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> - </class> - <class name="Siege" package="org.nuiton.eugene.test2.beangen"> - <stereotype name="bean"/> - <attribute name="noSerie" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <interface name="Vehicule" package="org.nuiton.eugene.test2.beangen"> - <operation name="start" visibility="public"> - <returnParameter type="void"/> - </operation> - </interface> - <class name="Contact2" package="org.nuiton.eugene.test2.deletetest"> - <stereotype name="entity"/> - <attribute name="contactValue" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="type" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <operation name="findAllByCompany" visibility="public"> - <returnParameter type="java.util.Set<Contact2>"/> - <parameter name="company" type="org.nuiton.eugene.test2.Company"/> - <stereotype name="dao"/> - </operation> - <attribute visibility="public" type="org.nuiton.eugene.test2.Party2" reverseAttributeName="contacts" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Telephone2" package="org.nuiton.eugene.test2.deletetest"> - <stereotype name="entity"/> - <superclass name="org.nuiton.eugene.test2.Contact2" discriminator=""/> - <attribute name="prefix" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="country" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - </class> - <class name="Party2" package="org.nuiton.eugene.test2.deletetest"> - <stereotype name="entity"/> - <attribute name="contacts" visibility="public" type="org.nuiton.eugene.test2.Contact2" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Person" package="org.nuiton.topia.test.entities"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="firstname" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.topia.test.entities.Pet" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> - </class> - <class name="Pet" package="org.nuiton.topia.test.entities"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute name="type" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.topia.test.entities.Person" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - <attribute visibility="public" type="org.nuiton.topia.test.entities.Race" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> - </class> - <class name="Race" package="org.nuiton.topia.test.entities"> - <stereotype name="entity"/> - <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> - <attribute visibility="public" type="org.nuiton.topia.test.entities.Pet" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> - </class> - <class name="Set<Contact2>" package="java.util"/> -</objectModel> Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/models/dtotest2.objectmodel 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,178 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<objectModel xmlns="http://www.codelutin.org/eugene/objectModel" name="TopiaTest" version="1"> + <class name="Personne" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <superclass name="org.nuiton.eugene.test2.Party2" discriminator=""/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="otherNames" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="0" maxMultiplicity="-1"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Address" reverseAttributeName="" associationType="aggregate" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="Employe" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <superclass name="org.nuiton.eugene.test2.Personne" discriminator=""/> + <attribute name="salary" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> + <attribute name="lead" visibility="public" type="org.nuiton.eugene.test2.Department" reverseAttributeName="leader" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="1" navigable="false" ordering="unordered"/> + </class> + <class name="Company" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Employe" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + <attribute visibility="public" associationClassName="org.nuiton.eugene.test2.Bill" type="org.nuiton.eugene.test2.Store" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Department" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Address" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <attribute name="city" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="adress" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Personne" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> + </class> + <class name="Department" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="leader" visibility="public" type="org.nuiton.eugene.test2.Employe" reverseAttributeName="lead" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Product" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Product" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Department" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Type" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="Store" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="DEFAULT_NUM" associationType="composite" visibility="public" static="true" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="numStore" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <operation name="getDefaultNum" visibility="public" static="true"> + <returnParameter type="java.lang.String"/> + </operation> + <class name="Row" package="org.nuiton.eugene.test2"> + <attribute name="num" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="position" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + </class> + <attribute visibility="public" associationClassName="org.nuiton.eugene.test2.Bill" type="org.nuiton.eugene.test2.Company" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> + </class> + <class name="Type" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.Product" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> + </class> + <associationClass name="Bill" package="org.nuiton.eugene.test2"> + <stereotype name="entity"/> + <participant name="org.nuiton.eugene.test2.Company" attribute=""/> + <participant name="org.nuiton.eugene.test2.Store" attribute=""/> + <attribute name="cost" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="date" associationType="composite" visibility="public" type="java.util.Date" minMultiplicity="1" maxMultiplicity="1"/> + </associationClass> + <class name="Voiture" abstract="true" package="org.nuiton.eugene.test2.beangen"> + <stereotype name="bean"/> + <tagValue name="documentation" value="Doc for BeanA"/> + <attribute name="immatriculation" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"> + <tagValue name="documentation" value="attrA of BeanA"/> + </attribute> + <attribute name="modele" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="proprietaire" associationType="composite" visibility="public" type="org.nuiton.eugene.test2.beangen.PersonneDTO" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Roue" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="4" maxMultiplicity="4" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Siege" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="4" navigable="true" ordering="unordered"/> + </class> + <class name="Roue" package="org.nuiton.eugene.test2.beangen"> + <stereotype name="bean"/> + <operation name="mount" visibility="public"> + <returnParameter type="void"/> + </operation> + <operation name="getModel" visibility="public"> + <returnParameter type="int"/> + <parameter name="id" type="java.lang.String"/> + </operation> + <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="RelationDTO" package="org.nuiton.eugene.test2.beangen"> + <stereotype name="dto"/> + <attribute name="idCompany" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="idDepartement" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="dateDebut" associationType="composite" visibility="public" type="java.util.Date" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="person" visibility="public" type="org.nuiton.eugene.test2.beangen.PersonneDTO" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="PersonneDTO" package="org.nuiton.eugene.test2.beangen"> + <dependency name="" supplierName="org.nuiton.eugene.test2.Personne"/> + <stereotype name="dto"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.RelationDTO" reverseAttributeName="person" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="false" ordering="unordered"/> + </class> + <class name="Siege" package="org.nuiton.eugene.test2.beangen"> + <stereotype name="bean"/> + <attribute name="noSerie" associationType="composite" visibility="public" type="int" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.eugene.test2.beangen.Voiture" reverseAttributeName="" reverseMaxMultiplicity="4" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <interface name="Vehicule" package="org.nuiton.eugene.test2.beangen"> + <operation name="start" visibility="public"> + <returnParameter type="void"/> + </operation> + </interface> + <class name="Contact2" package="org.nuiton.eugene.test2.deletetest"> + <stereotype name="entity"/> + <attribute name="contactValue" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="type" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <operation name="findAllByCompany" visibility="public"> + <returnParameter type="java.util.Set<Contact2>"/> + <parameter name="company" type="org.nuiton.eugene.test2.Company"/> + <stereotype name="dao"/> + </operation> + <attribute visibility="public" type="org.nuiton.eugene.test2.Party2" reverseAttributeName="contacts" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Telephone2" package="org.nuiton.eugene.test2.deletetest"> + <stereotype name="entity"/> + <superclass name="org.nuiton.eugene.test2.Contact2" discriminator=""/> + <attribute name="prefix" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="country" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + </class> + <class name="Party2" package="org.nuiton.eugene.test2.deletetest"> + <stereotype name="entity"/> + <attribute name="contacts" visibility="public" type="org.nuiton.eugene.test2.Contact2" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Person" package="org.nuiton.topia.test.entities"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="firstname" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.topia.test.entities.Pet" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="0" maxMultiplicity="-1" navigable="true" ordering="unordered"/> + </class> + <class name="Pet" package="org.nuiton.topia.test.entities"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute name="type" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.topia.test.entities.Person" reverseAttributeName="" reverseMaxMultiplicity="-1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + <attribute visibility="public" type="org.nuiton.topia.test.entities.Race" reverseAttributeName="" associationType="composite" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="true" ordering="unordered"/> + </class> + <class name="Race" package="org.nuiton.topia.test.entities"> + <stereotype name="entity"/> + <attribute name="name" associationType="composite" visibility="public" type="java.lang.String" minMultiplicity="1" maxMultiplicity="1"/> + <attribute visibility="public" type="org.nuiton.topia.test.entities.Pet" reverseAttributeName="" reverseMaxMultiplicity="1" minMultiplicity="1" maxMultiplicity="1" navigable="false" ordering="unordered"/> + </class> + <class name="Set<Contact2>" package="java.util"/> +</objectModel> Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,36 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -# Global logging configuration -log4j.rootLogger=ERROR, stdout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n - -# package level -log4j.logger.org.nuiton.eugene=DEBUG -log4j.logger.org.nuiton.eugene.test=DEBUG -log4j.logger.org.nuiton.processor=DEBUG Copied: trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/src/test/resources/log4j.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,36 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout + +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.org.nuiton.eugene=DEBUG +log4j.logger.org.nuiton.eugene.test=DEBUG +log4j.logger.org.nuiton.processor=DEBUG Deleted: trunk/eugene-maven-plugin/src/it/generate/generators/verify.groovy =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/verify.groovy 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/generators/verify.groovy 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,29 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -//TODO - -return true; - Copied: trunk/eugene-maven-plugin/src/it/generate/generators/verify.groovy (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/generators/verify.groovy) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/generators/verify.groovy (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/generators/verify.groovy 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,29 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +//TODO + +return true; + Deleted: trunk/eugene-maven-plugin/src/it/generate/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/goals.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1 +0,0 @@ -clean install \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean install \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo/README.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/README.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,16 +0,0 @@ -On teste ici le goal generate-model-files avec en include que des includes sans protocol -des writers connus : - -<execution> - <phase>generate-sources</phase> - <configuration> - <modelType>objectmodel</modelType> - <includes> - <include>src/main/zargo:**/*.zargo</include> - </includes> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - </configuration> - <goals> - <goal>generate-model</goal> - </goals> -</execution> \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo/README.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/README.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo/README.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,16 @@ +On teste ici le goal generate-model-files avec en include que des includes sans protocol +des writers connus : + +<execution> + <phase>generate-sources</phase> + <configuration> + <modelType>objectmodel</modelType> + <includes> + <include>src/main/zargo:**/*.zargo</include> + </includes> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + </configuration> + <goals> + <goal>generate-model</goal> + </goals> +</execution> \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1 +0,0 @@ -clean generate-sources \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean generate-sources \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,128 +0,0 @@ -<?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" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <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> - - -  -  -  - - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - -  -  -  - - <packaging>jar</packaging> - - <properties> - - <eugeneVersion>@pom.version@</eugeneVersion> - -  - <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>xmi,model</skipInputs> - </configuration> - <executions> - <execution> - <id>Zargo to xmi</id> - <phase>generate-sources</phase> - <configuration> - <inputs>zargo</inputs> - <outputDirectory>target/generated-sources-xmi</outputDirectory> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>Zargo to xmi 2</id> - <phase>generate-sources</phase> - <configuration> - <inputs>src/main/zargo:**/*.zargo</inputs> - <outputDirectory>target/generated-sources-xmi2</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> - - Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,128 @@ +<?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" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <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> + + +  +  +  + + <name>EUGene Test :: testIncludeWithOnlyProtocol</name> + +  +  +  + + <packaging>jar</packaging> + + <properties> + + <eugeneVersion>@pom.version@</eugeneVersion> + +  + <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>xmi,model</skipInputs> + </configuration> + <executions> + <execution> + <id>Zargo to xmi</id> + <phase>generate-sources</phase> + <configuration> + <inputs>zargo</inputs> + <outputDirectory>target/generated-sources-xmi</outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Zargo to xmi 2</id> + <phase>generate-sources</phase> + <configuration> + <inputs>src/main/zargo:**/*.zargo</inputs> + <outputDirectory>target/generated-sources-xmi2</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> + + Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,25 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.zargo =================================================================== (Binary files differ) Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.zargo (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/src/main/xmi/topiatest.zargo) =================================================================== (Binary files differ) Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,25 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.zargo =================================================================== (Binary files differ) Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.zargo (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/src/main/zargo/topiatest.zargo) =================================================================== (Binary files differ) Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,49 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - - -// Zargo to xmi - -assert new File(basedir, 'target/generated-sources-xmi').exists(); -assert new File(basedir, 'target/generated-sources-xmi/xmi').exists(); -assert new File(basedir, 'target/generated-sources-xmi/xmi/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi/xmi/topiatest.xmi').exists(); - -assert !new File(basedir, 'target/generated-sources-xmi/models').exists(); -assert !new File(basedir, 'target/generated-sources-xmi/java').exists(); - -// Zargo to xmi 2 - -assert new File(basedir, 'target/generated-sources-xmi2').exists(); - -assert new File(basedir, 'target/generated-sources-xmi2/xmi').exists(); -assert new File(basedir, 'target/generated-sources-xmi2/xmi/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2/xmi/topiatest.xmi').exists(); - -assert !new File(basedir, 'target/generated-sources-xmi2/models').exists(); -assert !new File(basedir, 'target/generated-sources-xmi2/java').exists(); - -return true; - Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo/verify.groovy 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,49 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + + +// Zargo to xmi + +assert new File(basedir, 'target/generated-sources-xmi').exists(); +assert new File(basedir, 'target/generated-sources-xmi/xmi').exists(); +assert new File(basedir, 'target/generated-sources-xmi/xmi/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi/xmi/topiatest.xmi').exists(); + +assert !new File(basedir, 'target/generated-sources-xmi/models').exists(); +assert !new File(basedir, 'target/generated-sources-xmi/java').exists(); + +// Zargo to xmi 2 + +assert new File(basedir, 'target/generated-sources-xmi2').exists(); + +assert new File(basedir, 'target/generated-sources-xmi2/xmi').exists(); +assert new File(basedir, 'target/generated-sources-xmi2/xmi/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2/xmi/topiatest.xmi').exists(); + +assert !new File(basedir, 'target/generated-sources-xmi2/models').exists(); +assert !new File(basedir, 'target/generated-sources-xmi2/java').exists(); + +return true; + Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,16 +0,0 @@ -On teste ici le goal generate-model-files avec en include que des includes sans protocol -des writers connus : - -<execution> - <phase>generate-sources</phase> - <configuration> - <modelType>objectmodel</modelType> - <includes> - <include>src/main/zargo:**/*.zargo</include> - </includes> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - </configuration> - <goals> - <goal>generate-model</goal> - </goals> -</execution> \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/README.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,16 @@ +On teste ici le goal generate-model-files avec en include que des includes sans protocol +des writers connus : + +<execution> + <phase>generate-sources</phase> + <configuration> + <modelType>objectmodel</modelType> + <includes> + <include>src/main/zargo:**/*.zargo</include> + </includes> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + </configuration> + <goals> + <goal>generate-model</goal> + </goals> +</execution> \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -1 +0,0 @@ -clean generate-sources \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean generate-sources \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,153 +0,0 @@ -<?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" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <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> - - -  -  -  - - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - -  -  -  - - <packaging>jar</packaging> - - <properties> - - <eugeneVersion>@pom.version@</eugeneVersion> - -  - <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> - - Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,153 @@ +<?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" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <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> + + +  +  +  + + <name>EUGene Test :: testIncludeWithOnlyProtocol</name> + +  +  +  + + <packaging>jar</packaging> + + <properties> + + <eugeneVersion>@pom.version@</eugeneVersion> + +  + <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> + + Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,25 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,1334 +0,0 @@ -<?xml version = '1.0' encoding = 'UTF-8' ?> -<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:56:54 CEST 2009'> - <XMI.header> <XMI.documentation> - <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> - <XMI.exporterVersion>0.28.1(6) revised on $Date$ </XMI.exporterVersion> - </XMI.documentation> - <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> - <XMI.content> - <UML:Model xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000077B' - name = 'xmiTopiaTest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E3' - isSpecification = 'false'> - <UML:TaggedValue.dataValue>1.2</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4'/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Namespace.ownedElement> - <UML:TagDefinition xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4' - name = 'version' isSpecification = 'false' tagType = 'String'> - <UML:TagDefinition.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E6'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E5' - lower = '0' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:TagDefinition.multiplicity> - </UML:TagDefinition> - <UML:Stereotype xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7' - name = 'entity' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> - </UML:Stereotype> - <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090B' - name = 'org' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090C' - name = 'nuiton' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090D' - name = 'topiatest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA' - name = 'Personne' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:GeneralizableElement.generalization> - <UML:Generalization xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001020'/> - </UML:GeneralizableElement.generalization> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF9' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFD'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFC' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB0' - name = 'otherNames' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB8'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB7' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE' - name = 'Employe' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:GeneralizableElement.generalization> - <UML:Generalization xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E2'/> - </UML:GeneralizableElement.generalization> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D54' - name = 'salary' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5A'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D59' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0' - name = 'Company' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011BD' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011C5'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011C4' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008F9' - name = 'Address' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000903' - name = 'city' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF7'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF6' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CE8' - name = 'adress' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF3'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF2' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FB' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FC' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FD'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FE' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FF' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000900'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000901' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008F9'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Generalization xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E2' - isSpecification = 'false'> - <UML:Generalization.child> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:Generalization.parent> - </UML:Generalization> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFE' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFF' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102B' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D02' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102A'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001029' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B' - name = 'Department' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D25' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D29'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D28' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A' - name = 'Product' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D37' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D3F'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D3E' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5B' - name = 'Store' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D7D' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D83'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D82' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D40' - name = 'Type' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4D' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D53'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D52' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:AssociationClass xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D65' - name = 'Bill' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D66' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D89'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D88' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D69' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D8D'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D8C' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D6D' - name = 'cost' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D75'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D74' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D76' - name = 'date' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D7A'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D79' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000085F'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:AssociationClass> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D18' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D19' - name = 'lead' visibility = 'public' isSpecification = 'false' isNavigable = 'false' - ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D24'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D23' - lower = '0' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1C' - name = 'leader' visibility = 'public' isSpecification = 'false' isNavigable = 'true' - ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1D'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1E' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0D' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0E' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0F'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D10' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D11' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D17'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D16' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2C' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2D' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2E'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2F' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D30' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D36'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D35' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D42' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D43' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4B' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D46' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D47'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D48' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D40'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Package xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E71' - name = 'beangen' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72' - name = 'Voiture' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'true' isActive = 'false'> - <UML:ModelElement.clientDependency> - <UML:Abstraction xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E77'/> - </UML:ModelElement.clientDependency> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> - </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA1' - isSpecification = 'false'> - <UML:TaggedValue.dataValue>Doc for BeanA</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7C' - name = 'immatriculation' visibility = 'public' isSpecification = 'false' - ownerScope = 'instance' changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7D'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7E' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA2' - isSpecification = 'false'> - <UML:TaggedValue.dataValue>attrA of BeanA</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7F' - name = 'modele' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E80'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E81' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE6' - name = 'proprietaire' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE7'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE8' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E75' - name = 'Roue' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E85' - name = 'mount' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:BehavioralFeature.parameter> - <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E86' - name = 'return' isSpecification = 'false' kind = 'return'> - <UML:Parameter.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086B'/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - </UML:Operation> - <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E87' - name = 'getModel' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:BehavioralFeature.parameter> - <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E88' - name = 'return' isSpecification = 'false' kind = 'return'> - <UML:Parameter.type> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> - </UML:Parameter.type> - </UML:Parameter> - <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E89' - name = 'id' isSpecification = 'false'> - <UML:Parameter.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - </UML:Operation> - </UML:Classifier.feature> - </UML:Class> - <UML:Abstraction xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E77' - isSpecification = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E78'/> - </UML:ModelElement.stereotype> - <UML:Dependency.client> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> - </UML:Dependency.client> - <UML:Dependency.supplier> - <UML:Interface xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E76'/> - </UML:Dependency.supplier> - </UML:Abstraction> - <UML:Interface xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E76' - name = 'Vehicule' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false'> - <UML:Classifier.feature> - <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7A' - name = 'start' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:BehavioralFeature.parameter> - <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7B' - name = 'return' isSpecification = 'false' kind = 'return'> - <UML:Parameter.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086B'/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - </UML:Operation> - </UML:Classifier.feature> - </UML:Interface> - <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8A' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8B' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8D' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8E' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED2'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED1' - lower = '4' upper = '4'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E75'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAB' - name = 'RelationDTO' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAC' - name = 'idCompany' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAD'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAE' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAF' - name = 'idDepartement' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB0'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB1' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBB' - name = 'dateDebut' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBC'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBD' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000085F'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9' - name = 'PersonneDTO' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.clientDependency> - <UML:Dependency xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAA'/> - </UML:ModelElement.clientDependency> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74'/> - </UML:ModelElement.stereotype> - <UML:Namespace.ownedElement> - <UML:Dependency xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAA' - isSpecification = 'false'> - <UML:Dependency.client> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9'/> - </UML:Dependency.client> - <UML:Dependency.supplier> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:Dependency.supplier> - </UML:Dependency> - </UML:Namespace.ownedElement> - </UML:Class> - <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB2' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB3' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBA'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB9' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAB'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB6' - name = 'person' visibility = 'public' isSpecification = 'false' isNavigable = 'true' - ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB7'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB8' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED3' - name = 'Siege' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDB' - name = 'noSerie' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDC'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDD' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED4' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED5' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE5'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE4' - lower = '1' upper = '4'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED3'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED8' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED9'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDA' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Package xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100A' - name = 'deletetest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B' - name = 'Contact2' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001019' - name = 'contactValue' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101A'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101B' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101C' - name = 'type' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101D'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101E' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Operation xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102F' - name = 'findAllByCompany' visibility = 'public' isSpecification = 'false' - ownerScope = 'instance' isQuery = 'false' concurrency = 'sequential' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001034'/> - </UML:ModelElement.stereotype> - <UML:BehavioralFeature.parameter> - <UML:Parameter xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001030' - name = 'return' isSpecification = 'false' kind = 'return'> - <UML:Parameter.type> - <UML:Class xmi.idref = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001032'/> - </UML:Parameter.type> - </UML:Parameter> - <UML:Parameter xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001033' - name = 'company' isSpecification = 'false'> - <UML:Parameter.type> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> - </UML:Parameter.type> - </UML:Parameter> - </UML:BehavioralFeature.parameter> - </UML:Operation> - </UML:Classifier.feature> - </UML:Class> - <UML:Association xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100C' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100D' - name = 'contacts' visibility = 'public' isSpecification = 'false' isNavigable = 'true' - ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001026'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001025' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001010' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001028'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001027' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001017' - name = 'Telephone2' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:GeneralizableElement.generalization> - <UML:Generalization xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001018'/> - </UML:GeneralizableElement.generalization> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001021' - name = 'prefix' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001022'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001023' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001024' - name = 'country' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001025'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001026' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Generalization xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001018' - isSpecification = 'false'> - <UML:Generalization.child> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001017'/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B'/> - </UML:Generalization.parent> - </UML:Generalization> - <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F' - name = 'Party2' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - </UML:Class> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Generalization xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001020' - isSpecification = 'false'> - <UML:Generalization.child> - <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> - </UML:Generalization.child> - <UML:Generalization.parent> - <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F'/> - </UML:Generalization.parent> - </UML:Generalization> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121D' - name = 'topia' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121E' - name = 'test' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121F' - name = 'entities' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001220' - name = 'Person' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001228' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001229'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122A' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122B' - name = 'firstname' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122D' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Class xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221' - name = 'Pet' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001222' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001223'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001224' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001225' - name = 'type' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001226'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001227' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - <UML:Association xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001237' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001238' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001239'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123A' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001220'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123B' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123F'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123E' - lower = '0' upper = '-1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Association xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102A' - name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> - <UML:Association.connection> - <UML:AssociationEnd xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102B' - visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' - aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102D' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - <UML:AssociationEnd xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102E' - visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' - aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> - <UML:AssociationEnd.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102F'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001030' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:AssociationEnd.multiplicity> - <UML:AssociationEnd.participant> - <UML:Class xmi.idref = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001029'/> - </UML:AssociationEnd.participant> - </UML:AssociationEnd> - </UML:Association.connection> - </UML:Association> - <UML:Class xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001029' - name = 'Race' visibility = 'public' isSpecification = 'false' isRoot = 'false' - isLeaf = 'false' isAbstract = 'false' isActive = 'false'> - <UML:ModelElement.stereotype> - <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> - </UML:ModelElement.stereotype> - <UML:Classifier.feature> - <UML:Attribute xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001031' - name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' - changeability = 'changeable' targetScope = 'instance'> - <UML:StructuralFeature.multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001032'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001033' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </UML:StructuralFeature.multiplicity> - <UML:StructuralFeature.type> - <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> - </UML:StructuralFeature.type> - </UML:Attribute> - </UML:Classifier.feature> - </UML:Class> - </UML:Namespace.ownedElement> - </UML:Package> - </UML:Namespace.ownedElement> - </UML:Package> - </UML:Namespace.ownedElement> - </UML:Package> - </UML:Namespace.ownedElement> - </UML:Package> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73' - name = 'bean' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> - </UML:Stereotype> - <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74' - name = 'dto' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> - </UML:Stereotype> - <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E78' - name = 'realize' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> - </UML:Stereotype> - <UML:Package xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001031' - name = 'java.util' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Namespace.ownedElement> - <UML:Class xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001032' - name = 'Set<Contact2>' visibility = 'public' isSpecification = 'false' - isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> - </UML:Namespace.ownedElement> - </UML:Package> - <UML:Stereotype xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001034' - name = 'dao' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' - isAbstract = 'false'> - <UML:Stereotype.baseClass>Operation</UML:Stereotype.baseClass> - </UML:Stereotype> - </UML:Namespace.ownedElement> - </UML:Model> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001233'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001234' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123C'> - <UML:Multiplicity.range> - <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123D' - lower = '1' upper = '1'/> - </UML:Multiplicity.range> - </UML:Multiplicity> - </XMI.content> -</XMI> Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/xmi/topiatest.xmi 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,1334 @@ +<?xml version = '1.0' encoding = 'UTF-8' ?> +<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Mon Oct 19 15:56:54 CEST 2009'> + <XMI.header> <XMI.documentation> + <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter> + <XMI.exporterVersion>0.28.1(6) revised on $Date$ </XMI.exporterVersion> + </XMI.documentation> + <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header> + <XMI.content> + <UML:Model xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000077B' + name = 'xmiTopiaTest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:ModelElement.taggedValue> + <UML:TaggedValue xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E3' + isSpecification = 'false'> + <UML:TaggedValue.dataValue>1.2</UML:TaggedValue.dataValue> + <UML:TaggedValue.type> + <UML:TagDefinition xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4'/> + </UML:TaggedValue.type> + </UML:TaggedValue> + </UML:ModelElement.taggedValue> + <UML:Namespace.ownedElement> + <UML:TagDefinition xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E4' + name = 'version' isSpecification = 'false' tagType = 'String'> + <UML:TagDefinition.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E6'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E5' + lower = '0' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:TagDefinition.multiplicity> + </UML:TagDefinition> + <UML:Stereotype xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7' + name = 'entity' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090B' + name = 'org' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090C' + name = 'nuiton' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:000000000000090D' + name = 'topiatest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA' + name = 'Personne' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:GeneralizableElement.generalization> + <UML:Generalization xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001020'/> + </UML:GeneralizableElement.generalization> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF9' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFD'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFC' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB0' + name = 'otherNames' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB8'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-67f6b63e:12187ee3a69:-8000:0000000000000EB7' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE' + name = 'Employe' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:GeneralizableElement.generalization> + <UML:Generalization xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E2'/> + </UML:GeneralizableElement.generalization> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D54' + name = 'salary' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5A'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D59' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0' + name = 'Company' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011BD' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011C5'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000011C4' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008F9' + name = 'Address' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000903' + name = 'city' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF7'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF6' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CE8' + name = 'adress' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF3'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CF2' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FB' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FC' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FD'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FE' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008FF' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000900'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000901' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008F9'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Generalization xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E2' + isSpecification = 'false'> + <UML:Generalization.child> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> + </UML:Generalization.child> + <UML:Generalization.parent> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:Generalization.parent> + </UML:Generalization> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFE' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000CFF' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102B' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D02' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102A'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001029' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B' + name = 'Department' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D25' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D29'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D28' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A' + name = 'Product' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D37' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D3F'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D3E' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5B' + name = 'Store' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D7D' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D83'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D82' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D40' + name = 'Type' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4D' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D53'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D52' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:AssociationClass xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D65' + name = 'Bill' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D66' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D89'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D88' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D69' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D8D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D8C' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D5B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D6D' + name = 'cost' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D75'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D74' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D76' + name = 'date' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D7A'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D79' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000085F'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:AssociationClass> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D18' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D19' + name = 'lead' visibility = 'public' isSpecification = 'false' isNavigable = 'false' + ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D24'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D23' + lower = '0' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1C' + name = 'leader' visibility = 'public' isSpecification = 'false' isNavigable = 'true' + ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D1E' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DE'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0D' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0E' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0F'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D10' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D11' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D17'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D16' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2C' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2D' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2E'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2F' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D0B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D30' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D36'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D35' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Association xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D42' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D43' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D4B' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D46' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D47'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D48' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D40'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Package xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E71' + name = 'beangen' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72' + name = 'Voiture' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'true' isActive = 'false'> + <UML:ModelElement.clientDependency> + <UML:Abstraction xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E77'/> + </UML:ModelElement.clientDependency> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> + </UML:ModelElement.stereotype> + <UML:ModelElement.taggedValue> + <UML:TaggedValue xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA1' + isSpecification = 'false'> + <UML:TaggedValue.dataValue>Doc for BeanA</UML:TaggedValue.dataValue> + <UML:TaggedValue.type> + <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> + </UML:TaggedValue.type> + </UML:TaggedValue> + </UML:ModelElement.taggedValue> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7C' + name = 'immatriculation' visibility = 'public' isSpecification = 'false' + ownerScope = 'instance' changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7E' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:ModelElement.taggedValue> + <UML:TaggedValue xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA2' + isSpecification = 'false'> + <UML:TaggedValue.dataValue>attrA of BeanA</UML:TaggedValue.dataValue> + <UML:TaggedValue.type> + <UML:TagDefinition href = 'http://argouml.org/profiles/uml14/default-uml14.xmi#.:000000000000087C'/> + </UML:TaggedValue.type> + </UML:TaggedValue> + </UML:ModelElement.taggedValue> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7F' + name = 'modele' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E80'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E81' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE6' + name = 'proprietaire' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE7'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE8' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E75' + name = 'Roue' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E85' + name = 'mount' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E86' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086B'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E87' + name = 'getModel' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E88' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:0000000000000D2A'/> + </UML:Parameter.type> + </UML:Parameter> + <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E89' + name = 'id' isSpecification = 'false'> + <UML:Parameter.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + </UML:Classifier.feature> + </UML:Class> + <UML:Abstraction xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E77' + isSpecification = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E78'/> + </UML:ModelElement.stereotype> + <UML:Dependency.client> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> + </UML:Dependency.client> + <UML:Dependency.supplier> + <UML:Interface xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E76'/> + </UML:Dependency.supplier> + </UML:Abstraction> + <UML:Interface xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E76' + name = 'Vehicule' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false'> + <UML:Classifier.feature> + <UML:Operation xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7A' + name = 'start' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + isQuery = 'false' concurrency = 'sequential' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E7B' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086B'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + </UML:Classifier.feature> + </UML:Interface> + <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8A' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8B' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8D' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E8E' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED2'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED1' + lower = '4' upper = '4'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E75'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAB' + name = 'RelationDTO' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAC' + name = 'idCompany' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAD'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAE' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAF' + name = 'idDepartement' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB0'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB1' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBB' + name = 'dateDebut' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBC'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBD' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000085F'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9' + name = 'PersonneDTO' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.clientDependency> + <UML:Dependency xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAA'/> + </UML:ModelElement.clientDependency> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74'/> + </UML:ModelElement.stereotype> + <UML:Namespace.ownedElement> + <UML:Dependency xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAA' + isSpecification = 'false'> + <UML:Dependency.client> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9'/> + </UML:Dependency.client> + <UML:Dependency.supplier> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:Dependency.supplier> + </UML:Dependency> + </UML:Namespace.ownedElement> + </UML:Class> + <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB2' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB3' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EBA'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB9' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EAB'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB6' + name = 'person' visibility = 'public' isSpecification = 'false' isNavigable = 'true' + ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB7'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EB8' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EA9'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED3' + name = 'Siege' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDB' + name = 'noSerie' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDC'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDD' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:DataType href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:000000000000086C'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Association xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED4' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED5' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE5'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EE4' + lower = '1' upper = '4'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED3'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED8' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000ED9'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000EDA' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E72'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Package xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100A' + name = 'deletetest' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B' + name = 'Contact2' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001019' + name = 'contactValue' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101A'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101B' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101C' + name = 'type' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101D'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101E' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Operation xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:000000000000102F' + name = 'findAllByCompany' visibility = 'public' isSpecification = 'false' + ownerScope = 'instance' isQuery = 'false' concurrency = 'sequential' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001034'/> + </UML:ModelElement.stereotype> + <UML:BehavioralFeature.parameter> + <UML:Parameter xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001030' + name = 'return' isSpecification = 'false' kind = 'return'> + <UML:Parameter.type> + <UML:Class xmi.idref = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001032'/> + </UML:Parameter.type> + </UML:Parameter> + <UML:Parameter xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001033' + name = 'company' isSpecification = 'false'> + <UML:Parameter.type> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E0'/> + </UML:Parameter.type> + </UML:Parameter> + </UML:BehavioralFeature.parameter> + </UML:Operation> + </UML:Classifier.feature> + </UML:Class> + <UML:Association xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100C' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100D' + name = 'contacts' visibility = 'public' isSpecification = 'false' isNavigable = 'true' + ordering = 'unordered' aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001026'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001025' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001010' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001028'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001027' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001017' + name = 'Telephone2' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:GeneralizableElement.generalization> + <UML:Generalization xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001018'/> + </UML:GeneralizableElement.generalization> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001021' + name = 'prefix' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001022'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001023' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001024' + name = 'country' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001025'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001026' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Generalization xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001018' + isSpecification = 'false'> + <UML:Generalization.child> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001017'/> + </UML:Generalization.child> + <UML:Generalization.parent> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000100B'/> + </UML:Generalization.parent> + </UML:Generalization> + <UML:Class xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F' + name = 'Party2' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + </UML:Class> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Generalization xmi.id = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:0000000000001020' + isSpecification = 'false'> + <UML:Generalization.child> + <UML:Class xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008DA'/> + </UML:Generalization.child> + <UML:Generalization.parent> + <UML:Class xmi.idref = '-64--88-99-15-7b62aac4:121aaa56ef3:-8000:000000000000101F'/> + </UML:Generalization.parent> + </UML:Generalization> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121D' + name = 'topia' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121E' + name = 'test' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Package xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000121F' + name = 'entities' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001220' + name = 'Person' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001228' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001229'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122A' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122B' + name = 'firstname' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000122D' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Class xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221' + name = 'Pet' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001222' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001223'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001224' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + <UML:Attribute xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001225' + name = 'type' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001226'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001227' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + <UML:Association xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001237' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001238' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001239'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123A' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001220'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123B' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123F'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123E' + lower = '0' upper = '-1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Association xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102A' + name = '' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'> + <UML:Association.connection> + <UML:AssociationEnd xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102B' + visibility = 'public' isSpecification = 'false' isNavigable = 'false' ordering = 'unordered' + aggregation = 'composite' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102D' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1-13652238:1219c622604:-8000:0000000000001221'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + <UML:AssociationEnd xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102E' + visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered' + aggregation = 'none' targetScope = 'instance' changeability = 'changeable'> + <UML:AssociationEnd.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:000000000000102F'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001030' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:AssociationEnd.multiplicity> + <UML:AssociationEnd.participant> + <UML:Class xmi.idref = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001029'/> + </UML:AssociationEnd.participant> + </UML:AssociationEnd> + </UML:Association.connection> + </UML:Association> + <UML:Class xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001029' + name = 'Race' visibility = 'public' isSpecification = 'false' isRoot = 'false' + isLeaf = 'false' isAbstract = 'false' isActive = 'false'> + <UML:ModelElement.stereotype> + <UML:Stereotype xmi.idref = '127-0-0-1-3f03561c:11667f969c5:-8000:00000000000008E7'/> + </UML:ModelElement.stereotype> + <UML:Classifier.feature> + <UML:Attribute xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001031' + name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance' + changeability = 'changeable' targetScope = 'instance'> + <UML:StructuralFeature.multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001032'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1--7876194c:121c66e8e17:-8000:0000000000001033' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </UML:StructuralFeature.multiplicity> + <UML:StructuralFeature.type> + <UML:Class href = 'http://argouml.org/profiles/uml14/default-java.xmi#.:0000000000000859'/> + </UML:StructuralFeature.type> + </UML:Attribute> + </UML:Classifier.feature> + </UML:Class> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Package> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E73' + name = 'bean' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E74' + name = 'dto' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Class</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Stereotype xmi.id = '-64--88-99-15-6093e433:1215d2d04f2:-8000:0000000000000E78' + name = 'realize' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Abstraction</UML:Stereotype.baseClass> + </UML:Stereotype> + <UML:Package xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001031' + name = 'java.util' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Namespace.ownedElement> + <UML:Class xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001032' + name = 'Set<Contact2>' visibility = 'public' isSpecification = 'false' + isRoot = 'false' isLeaf = 'false' isAbstract = 'false' isActive = 'false'/> + </UML:Namespace.ownedElement> + </UML:Package> + <UML:Stereotype xmi.id = '-64--88-99-15--164a0c3b:121af97fc30:-8000:0000000000001034' + name = 'dao' isSpecification = 'false' isRoot = 'false' isLeaf = 'false' + isAbstract = 'false'> + <UML:Stereotype.baseClass>Operation</UML:Stereotype.baseClass> + </UML:Stereotype> + </UML:Namespace.ownedElement> + </UML:Model> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001233'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:0000000000001234' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + <UML:Multiplicity xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123C'> + <UML:Multiplicity.range> + <UML:MultiplicityRange xmi.id = '127-0-0-1-13652238:1219c622604:-8000:000000000000123D' + lower = '1' upper = '1'/> + </UML:Multiplicity.range> + </UML:Multiplicity> + </XMI.content> +</XMI> Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,25 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,25 @@ +### +# #%L +# EUGene :: Maven plugin +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2006 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +model.tagvalue.generateOperatorForDAOHelper=true \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.zargo =================================================================== (Binary files differ) Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.zargo (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/src/main/zargo/topiatest.zargo) =================================================================== (Binary files differ) Deleted: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,73 +0,0 @@ -/* - * #%L - * EUGene :: Maven plugin - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -// Zargo to object model - -assert new File(basedir, 'target/generated-sources-zargo2ObjectModel').exists(); -assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/xmi').exists(); -assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/xmi/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/xmi/topiatest.xmi').exists(); - -assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/models').exists(); -assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/models/topiatest.objectmodel').exists(); - -assert !new File(basedir, 'target/generated-sources-zargo2ObjectModel/java').exists(); - -// Zargo to state model - -assert new File(basedir, 'target/generated-sources-zargo2StateModel').exists(); - -assert new File(basedir, 'target/generated-sources-zargo2StateModel/xmi').exists(); -assert new File(basedir, 'target/generated-sources-zargo2StateModel/xmi/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2StateModel/xmi/topiatest.xmi').exists(); - -assert new File(basedir, 'target/generated-sources-zargo2StateModel/models').exists(); -assert new File(basedir, 'target/generated-sources-zargo2StateModel/models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-zargo2StateModel/models/topiatest.statemodel').exists(); - -assert !new File(basedir, 'target/generated-sources-zargo2StateModel/java').exists(); - -// Xmi to object model - -assert new File(basedir, 'target/generated-sources-xmi2ObjectModel').exists(); -assert new File(basedir, 'target/generated-sources-xmi2ObjectModel/models').exists(); -assert new File(basedir, 'target/generated-sources-xmi2ObjectModel/models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2ObjectModel/models/topiatest.objectmodel').exists(); - -assert !new File(basedir, 'target/generated-sources-xmi2ObjectModel/java').exists(); - - -// Xmi to state model - -assert new File(basedir, 'target/generated-sources-xmi2StateModel').exists(); -assert new File(basedir, 'target/generated-sources-xmi2StateModel/models').exists(); -assert new File(basedir, 'target/generated-sources-xmi2StateModel/models/topiatest.properties').exists(); -assert new File(basedir, 'target/generated-sources-xmi2StateModel/models/topiatest.statemodel').exists(); - -assert !new File(basedir, 'target/generated-sources-xmi2StateModel/java').exists(); - -return true; - Copied: trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate/only-zargo-xmi/verify.groovy 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,73 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +// Zargo to object model + +assert new File(basedir, 'target/generated-sources-zargo2ObjectModel').exists(); +assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/xmi').exists(); +assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/xmi/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/xmi/topiatest.xmi').exists(); + +assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/models').exists(); +assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2ObjectModel/models/topiatest.objectmodel').exists(); + +assert !new File(basedir, 'target/generated-sources-zargo2ObjectModel/java').exists(); + +// Zargo to state model + +assert new File(basedir, 'target/generated-sources-zargo2StateModel').exists(); + +assert new File(basedir, 'target/generated-sources-zargo2StateModel/xmi').exists(); +assert new File(basedir, 'target/generated-sources-zargo2StateModel/xmi/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2StateModel/xmi/topiatest.xmi').exists(); + +assert new File(basedir, 'target/generated-sources-zargo2StateModel/models').exists(); +assert new File(basedir, 'target/generated-sources-zargo2StateModel/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-zargo2StateModel/models/topiatest.statemodel').exists(); + +assert !new File(basedir, 'target/generated-sources-zargo2StateModel/java').exists(); + +// Xmi to object model + +assert new File(basedir, 'target/generated-sources-xmi2ObjectModel').exists(); +assert new File(basedir, 'target/generated-sources-xmi2ObjectModel/models').exists(); +assert new File(basedir, 'target/generated-sources-xmi2ObjectModel/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2ObjectModel/models/topiatest.objectmodel').exists(); + +assert !new File(basedir, 'target/generated-sources-xmi2ObjectModel/java').exists(); + + +// Xmi to state model + +assert new File(basedir, 'target/generated-sources-xmi2StateModel').exists(); +assert new File(basedir, 'target/generated-sources-xmi2StateModel/models').exists(); +assert new File(basedir, 'target/generated-sources-xmi2StateModel/models/topiatest.properties').exists(); +assert new File(basedir, 'target/generated-sources-xmi2StateModel/models/topiatest.statemodel').exists(); + +assert !new File(basedir, 'target/generated-sources-xmi2StateModel/java').exists(); + +return true; + Copied: trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean generate-sources \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties =================================================================== --- trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/invoker.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean generate-sources - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml =================================================================== --- trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -24,139 +24,144 @@ #L% --> -<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> -  -  -  - - <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> + <groupId>org.nuiton.eugene.test</groupId> + <artifactId>testIncludeWithOnlyProtocol</artifactId> + <version>2.0.0</version> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugeneVersion}</version> + <scope>compile</scope> + </dependency> - </dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> -  -  -  - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> +  +  +  -  -  -  + <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - <packaging>jar</packaging> +  +  +  - <properties> - - <eugeneVersion>@pom.version@</eugeneVersion> + <packaging>jar</packaging> -  - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - </properties> + <properties> - <build> + <eugeneVersion>@pom.version@</eugeneVersion> - <plugins> +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <version>${eugeneVersion}</version> - <executions> - <execution> - <id>Zargo to object model</id> - <phase>generate-sources</phase> - <configuration> -  - <inputFiles> - <inputFile>src/main/zargo:**/*.zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Zargo to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>src/main/zargo:**/*.zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to object model</id> - <phase>generate-sources</phase> - <configuration> -  - <inputFiles> - <inputFile>src/main/xmi:**/*.xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>src/main/xmi:**/*.xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> + </properties> + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${eugeneVersion}</version> + <executions> + <execution> + <id>Zargo to object model</id> + <phase>generate-sources</phase> + <configuration> +  + <inputFiles> + <inputFile>src/main/zargo:**/*.zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <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> + <inputFiles> + <inputFile>src/main/zargo:**/*.zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <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> +  + <inputFiles> + <inputFile>src/main/xmi:**/*.xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <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> + <inputFiles> + <inputFile>src/main/xmi:**/*.xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <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> Copied: trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt) =================================================================== --- trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt (rev 0) +++ trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/goals.txt 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1 @@ +clean generate-test-sources \ No newline at end of file Deleted: trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties =================================================================== --- trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/invoker.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -1,45 +0,0 @@ -### -# #%L -# EUGene :: Maven plugin -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2006 - 2010 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Lesser Public License for more details. -# -# You should have received a copy of the GNU General Lesser Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -# A comma or space separated list of goals/phases to execute, may -# specify an empty list to execute the default goal of the IT project -invoker.goals=clean generate-test-sources - -# Optionally, a list of goals to run during further invocations of Maven -#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run - -# A comma or space separated list of profiles to activate -#invoker.profiles=run-all run-once - -# The value for the environment variable MAVEN_OPTS -#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m - -# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-fast - -# The expected result of the build, possible values are "success" (default) and "failure" -#invoker.buildResult=success - -# A boolean value controlling the -N flag, defaults to "false" -#invoker.nonRecursive=false Modified: trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml =================================================================== --- trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -24,203 +24,212 @@ #L% --> -<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> -  -  -  - - <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> + <groupId>org.nuiton.eugene.test</groupId> + <artifactId>testIncludeWithOnlyProtocol</artifactId> + <version>2.0.0</version> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>${eugeneVersion}</version> + <scope>compile</scope> + </dependency> - </dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> -  -  -  - <name>EUGene Test :: testIncludeWithOnlyProtocol</name> +  +  +  -  -  -  + <name>EUGene Test :: testIncludeWithOnlyProtocol</name> - <packaging>jar</packaging> +  +  +  - <properties> - - <eugeneVersion>@pom.version@</eugeneVersion> + <packaging>jar</packaging> -  - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - </properties> + <properties> - <build> + <eugeneVersion>@pom.version@</eugeneVersion> - <plugins> +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene-maven-plugin</artifactId> - <version>${eugeneVersion}</version> - <executions> - <execution> - <id>Zargo to object model</id> - <phase>generate-sources</phase> - <configuration> -  - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Zargo to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to object model</id> - <phase>generate-sources</phase> - <configuration> -  - <inputFiles> - <inputFile>xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to state model</id> - <phase>generate-sources</phase> - <configuration> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Zargo to object model (test phase)</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> -  - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Zargo to state model (test phase)</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>zargo</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> - <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to object model (test phase)</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> -  - <inputFiles> - <inputFile>xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - <execution> - <id>Xmi to state model (test phase)</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <modelType>statemodel</modelType> - <inputFiles> - <inputFile>xmi</inputFile> - </inputFiles> - <fullPackagePath>org.nuiton.topia</fullPackagePath> - <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> - </configuration> - <goals> - <goal>generate-model-files</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> + </properties> + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${eugeneVersion}</version> + <executions> + <execution> + <id>Zargo to object model</id> + <phase>generate-sources</phase> + <configuration> +  + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <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> + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <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> +  + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <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> + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <outputDirectory>target/generated-sources-xmi2StateModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Zargo to object model (test phase)</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> +  + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <outputDirectory>target/generated-sources-zargo2ObjectModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Zargo to state model (test phase)</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <modelType>statemodel</modelType> + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> + <outputDirectory>target/generated-sources-zargo2StateModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to object model (test phase)</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> +  + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <outputDirectory>target/generated-sources-xmi2ObjectModel + </outputDirectory> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + <execution> + <id>Xmi to state model (test phase)</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <modelType>statemodel</modelType> + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> + <fullPackagePath>org.nuiton.topia</fullPackagePath> + <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> Modified: trunk/eugene-maven-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/eugene-maven-plugin/src/license/THIRD-PARTY.properties 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/license/THIRD-PARTY.properties 2012-08-17 08:44:36 UTC (rev 1174) @@ -13,17 +13,18 @@ # - Mozilla Public License Version 1.0 # - Public Domain # - The Apache Software License, Version 2.0 +# - The SAX License +# - The W3C License +# - The Werken Company License # - http://classworlds.codehaus.org/license.html -# - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed Jan 04 15:16:57 CET 2012 +#Fri Aug 17 09:06:10 CEST 2012 classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/lice… commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD -jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html jdom--jdom--1.0=The Apache Software License, Version 2.0 org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/AvailableDataMojo.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -29,6 +29,10 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.nuiton.eugene.ModelPropertiesUtil; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.Template; @@ -50,12 +54,12 @@ * <p/> * * @author tchemit <chemit(a)codelutin.com> - * @goal available-data - * @requiresProject true - * @requiresDirectInvocation true - * @requiresDependencyResolution test * @since 2.0.0 */ +@Mojo(name = "available-data", + requiresProject = true, + requiresDirectInvocation = true, + requiresDependencyResolution = ResolutionScope.TEST) public class AvailableDataMojo extends AbstractMojo { /** @@ -74,46 +78,35 @@ * <p/> * <b>Note:</b> Let empty to display all data types. * - * @parameter expression="${dataTypes}" default-value="" * @since 2.0.0 */ + @Parameter(property = "dataTypes", defaultValue = "") protected String dataTypes; /** * All available models (obtain by plexus, keys are plexus roles, values * are a instance of corresponding model). - * - * @component role="org.nuiton.eugene.models.Model" */ + @Component(role = Model.class) protected Map<String, Model> modelTypes; - /** - * All available writers introspects via plexus - * - * @component role="org.nuiton.eugene.ModelReader" - */ + /** All available writers introspects via plexus. */ protected Map<String, ModelReader<?>> modelReaders; - /** - * All available templates introspects via plexus - * - * @component role="org.nuiton.eugene.Template" - */ + /** All available templates introspects via plexus. */ + @Component(role = Template.class) protected Map<String, Template<?>> modelTemplates; - /** - * All available writers introspects via plexus - * - * @component role="org.nuiton.eugene.writer.ChainedFileWriter" - */ + /** All available writers introspects via plexus. */ + @Component(role = ChainedFileWriter.class) protected Map<String, ChainedFileWriter> writers; /** - * All available model properties providers introspects via plexus + * All available model properties providers introspects via plexus. * - * @component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" * @since 2.3.1 */ + @Component(role = ModelPropertiesUtil.ModelPropertiesProvider.class) protected Map<String, ModelPropertiesUtil.ModelPropertiesProvider> modelPropertiesProviders; protected Map<String, ModelPropertiesUtil.ModelPropertiesProvider> loadedProviders; Copied: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java (from rev 1173, branches/eugene-2.4.3/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java) =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java (rev 0) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/GenerateMojo.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -0,0 +1,862 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.eugene.plugin; + +import org.apache.commons.lang3.StringUtils; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.model.Resource; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; +import org.apache.maven.project.MavenProject; +import org.apache.maven.settings.Settings; +import org.nuiton.eugene.DefaultTemplateConfiguration; +import org.nuiton.eugene.ModelPropertiesUtil; +import org.nuiton.eugene.ModelReader; +import org.nuiton.eugene.Template; +import org.nuiton.eugene.models.Model; +import org.nuiton.eugene.plugin.writer.BaseChainedFileWriter; +import org.nuiton.eugene.plugin.writer.ModelChainedFileWriter; +import org.nuiton.eugene.plugin.writer.XmiChainedFileWriter; +import org.nuiton.eugene.writer.ChainedFileWriter; +import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; +import org.nuiton.eugene.writer.ChainedFileWriterData; +import org.nuiton.eugene.writer.ChainedFileWriterEntry; +import org.nuiton.eugene.writer.ChainedWriterEngine; +import org.nuiton.eugene.writer.WriterReport; +import org.nuiton.plugin.AbstractPlugin; +import org.nuiton.plugin.PluginWithEncoding; +import org.nuiton.util.StringUtil; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Eugene generator plugin (a.k.a generate mojo) + * <p/> + * Fill inputs and mojo will chained needed writer. + * <p/> + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5 + */ +@Mojo(name = "generate", + requiresProject = true, + requiresDirectInvocation = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +public class GenerateMojo extends AbstractPlugin implements ChainedFileWriterConfiguration, PluginWithEncoding { + + /** + * Inputs files to used to generate the required model files. + * </p> + * An include has the following pattern : + * <pre> + * writer: + * </pre> + * when you want to use a specific writer with his default io values. + * <p/> + * Can also write : + * <pre> + * [writer:]directory:includes + * </pre> + * where {@code includes} is the pattern to find files from the directory + * given and must be terminated by the extension of files. + * <p/> + * Specifying the {@code writer} can be usefull when you want to use a + * writer for an unknown extension by any writer. + * <p/> + * Example : + * <pre> + * <inputs> + * <input>zargo:</input> + * <input>src/main/xmi2:**\/*.zargo</input> + * <input>zargo:src/main/xmi:**\/*.zargo2</input> + * </inputs> + * </pre> + * <p/> + * <b>Note:</b> If your using a single input, you can just write : + * <pre> + * <inputs>zargo</inputs> + * </pre> + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.inputs", required = true) + protected String[] inputs; + + /** + * List of input (protocol) not to treate separated by comma. + * <p/> + * Example : + * <pre> + * <skipInputs>xmi</skipInputs> + * <skipInputs>xmi,model</skipInputs> + * </pre> + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.skipInputs") + protected String skipInputs; + + /** + * Where to generate files. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.outputDirectory", defaultValue = "target/generated-sources", required = true) + protected File outputDirectory; + + /** + * Where to copy extracted files (when using class-path data). + * + * @since 2.1.3 + */ + @Parameter(property = "eugene.extractDirectory", defaultValue = "target/extracted-sources", required = true) + protected File extractDirectory; + + /** + * Ecrase les fichiers générés. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.overwrite", defaultValue = "false") + protected boolean overwrite; + + /** + * Pour activer le mode verbeux. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.verbose", defaultValue = "${maven.verbose}") + protected boolean verbose; + + /** + * Encoding to be used for generation of files. + * <p/> + * <b>Note:</b> If nothing is filled here, we will use the system + * property {@code file.encoding}. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.encoding", defaultValue = "${project.build.sourceEncoding}") + protected String encoding; + + /** + * A flag to mark the mojo to be used in a test phase. This will permits + * to add generated sources in test compile roots. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.testPhase", defaultValue = "false") + protected boolean testPhase; + + /** + * The type of model to be used. + * <p/> + * By default, use an {@code objectmodel}. + * + * @required + * @since 2.0.0 + */ + @Parameter(property = "eugene.modelType", defaultValue = "objectmodel", required = true) + protected String modelType; + + /** + * Properties to pass to writer. + * + * @parameter + * @since 2.0.0 + */ + @Parameter + protected Map<String, Object> properties; + + /** + * Ne génère rien, analyse juste la configuration. + * + * @since 2.0.0 + */ + @Parameter(property = "eugene.dryRun", defaultValue = "false") + protected boolean dryRun; + + /** + * Nom du paquetage pour les fichiers générés (xmi input sepcific). + * + * @since 2.0.0 + */ + @Parameter(property = "generator.fullPackagePath", defaultValue = "${project.groupId}.${project.artifactId}") + protected String fullPackagePath; + + /** + * Nom du resolver a utiliser pour les transformations xmi vers model + * (xmi input sepcific). + * + * @since 2.0.0 + */ + @Parameter(property = "generator.resolver", defaultValue = "org.nuiton.util.ResourceResolver") + protected String resolver; + + /** + * Templates à utiliser, séparés par des virgules pour les transformations + * depuis les models (model input sepcific). + * + * @since 0.50 + */ + @Parameter(property = "eugene.templates") + protected String templates; + + /** + * Templates à ne pas utiliser lors de la transformations des models + * (model input sepcific). + * + * @since 0.63 + */ + @Parameter(property = "eugene.excludeTemplates") + protected String[] excludeTemplates; + + /** + * Nom par défaut du paquetage généré (model input specific). + * + * @since 0.50 + */ + @Parameter(property = "eugene.defaultPackage", defaultValue = "${project.groupId}.${project.artifactId}") + protected String defaultPackage; + + /** + * List of packages to generate (comma separated). (model input specific). + * <p/> + * If the parameter is not filled, will generate all packages. + * + * @since 1.0.0-rc-8 + */ + @Parameter(property = "eugene.generatedPackages") + protected String generatedPackages; + + /** + * List of package to extract from xmi to models. (model input specific). + * <p/> + * If the parameter is not filled, will extract all packages. + * + * @since 1.0.0-rc-8 + */ + @Parameter(property = "eugene.extractedPackages", defaultValue = "${project.groupId}.${project.artifactId}") + protected String extractedPackages; + + /** + * Maven project. + * + * @since 2.0.0 + */ + @Component + protected MavenProject project; + + /** + * Le settings (pour obtenir le mode offline). + * + * @since 2.0.0 + */ + @Component + protected Settings settings; + + /** + * All available models (obtain by plexus, keys are plexus roles, + * values are a instance of corresponding model). + */ + @Component(role = Model.class) + protected Map<String, Model> _models; + + /** All available writers introspects via plexus. */ + @Component(role = ChainedFileWriter.class) + protected Map<String, ChainedFileWriter> writers; + + /** All available writers introspects via plexus. */ + @Component(role = ModelReader.class) + protected Map<String, ModelReader<?>> modelReaders; + + /** All available templates introspects via plexus. */ + @Component(role = Template.class) + protected Map<String, Template<?>> modelTemplates; + + /** + * All available model properties providers introspects via plexus. + * + * @since 2.3 + */ + @Component(role = ModelPropertiesUtil.ModelPropertiesProvider.class) + protected Map<String, ModelPropertiesUtil.ModelPropertiesProvider> modelPropertiesProviders; + + /** The engine to compute {@link ChainedFileWriter} from inputs entries. */ + @Component(role = ChainedWriterEngine.class) + protected ChainedWriterEngine engine; + + /** fixed classloader */ + protected ClassLoader fixedClassLoader; + + @Override + protected void init() throws Exception { + + if (getLog().isDebugEnabled()) { + verbose = true; + } + + modelType = modelType.trim().toLowerCase(); + + // Check model type is accepted + // pouvoir associé un nom à un type de service). + Model model = _models.get(modelType); + if (model == null) { + throw new MojoExecutionException( + "No modelType named '" + modelType + "', use one of " + + _models.keySet()); + } + + if (inputs.length == 0) { + throw new MojoExecutionException( + "Must specify something to include using the includes " + + "property"); + } + //FIXME-TC20091217 use a configurator in plexus ? + // Actually we obtain a different instance of the mojo conflit with + // mojo and plexus :) + engine.setConfiguration(this); + + Set<ChainedFileWriter> availableWriters = engine.getAvailableWriters(); + + if (availableWriters.isEmpty()) { + throw new MojoExecutionException( + "Could not find any writer in class-path."); + } + + for (ChainedFileWriter writer : availableWriters) { + if (writer instanceof BaseChainedFileWriter) { + // add log support + ((BaseChainedFileWriter) writer).setLog(getLog()); + } + writer.setWriterReport(new WriterReport() { + @Override + public void addFile(String entry, File file, boolean b) { + super.addFile(entry, file, b); + if (b || isVerbose()) { + getLog().info("Will generate " + file); + } + if (getLog().isDebugEnabled()) { + getLog().debug(String.format("[%1$s] Will generate %2$s", entry, file)); + } + } + }); + } + + // detect top level writers + for (String include : inputs) { + + if (isVerbose()) { + getLog().info("Register include : " + include); + } + engine.registerInclude(include); + } + + if (engine.getSelectedWriters().isEmpty()) { + return; + } + + if (properties == null) { + properties = new LinkedHashMap<String, Object>(); + } + + if (engine.containsWriter("xmi")) { + + // add xmi writer support + + properties.put(XmiChainedFileWriter.PROP_FULL_PACKAGE_PATH, + fullPackagePath); + properties.put(XmiChainedFileWriter.PROP_EXTRACTED_PACKAGES, extractedPackages); + properties.put(XmiChainedFileWriter.PROP_RESOLVER, resolver); + } + + if (engine.containsWriter("model")) { + + // add model writer support + + properties.put(ModelChainedFileWriter.PROP_DEFAULT_PACKAGE, + defaultPackage); + properties.put(ModelChainedFileWriter.PROP_GENERATED_PACKAGES, + generatedPackages); + properties.put(ModelChainedFileWriter.PROP_TEMPLATES, templates); + properties.put(ModelChainedFileWriter.PROP_EXCLUDE_TEMPLATES, + getExcludeTemplatesAsString()); + properties.put(ModelChainedFileWriter.PROP_MODEL_PROPERTIES_PROVIDER, + getModelPropertiesProvider()); + + DefaultTemplateConfiguration configuration = + new DefaultTemplateConfiguration(); + configuration.setEncoding(getEncoding()); + configuration.setLoader(getClassLoader()); + configuration.setOverwrite(isOverwrite()); + configuration.setVerbose(isVerbose()); + properties.put(ModelChainedFileWriter.PROP_TEMPLATE_CONFIGURATION, + configuration); + } + } + + @Override + protected boolean checkSkip() { + if (engine.getSelectedWriters().isEmpty()) { + getLog().warn("No phase was detected, skip the goal."); + return false; + } + return true; + } + + @Override + protected void doAction() throws Exception { + if (dryRun) { + getLog().warn("dryRun property is set, no file will be generated."); + } + if (isVerbose()) { + if (isTestPhase()) { + getLog().info(" using testPhase"); + } + } + try { + + List<String> skipInputList = new ArrayList<String>(); + + if (!StringUtils.isEmpty(skipInputs)) { + + for (String s : skipInputs.split(",")) { + skipInputList.add(s.trim()); + } + } + + // launch writers in incoming order of dicovering of them + + for (ChainedFileWriter writer : engine.getSelectedWriters()) { + if (skipInputList.contains(writer.getInputProtocol())) { + getLog().info("Skip phase [" + writer.getInputProtocol() + + "] as required in skipInputs configuration."); + continue; + } + long t0 = System.nanoTime(); + int size = writer.getEntries().size(); + if (size == 1) { + getLog().info( + "Process phase [" + writer.getInputProtocol() + + "] for one entry."); + } else { + getLog().info( + "Process phase [" + writer.getInputProtocol() + + "] for " + size + " entries."); + } + if (dryRun || isVerbose()) { + for (ChainedFileWriterEntry entry : writer.getEntries()) { + getLog().info(" entry : " + entry); + } + if (dryRun) { + continue; + } + } + if (getLog().isDebugEnabled()) { + getLog().debug("Generating files and copying resources..."); + } + + // obtains data to react for this writer + ChainedFileWriterData data = engine.getData(writer); + + // launch generation + writer.generate(this, data); + + String message = reportGeneratedFiles(writer, t0); + getLog().info(message); + + if ("model".equals(writer.getInputProtocol())) { + + // must fix source compile roots + File outputDir = writer.getOutputDirectory( + getOutputDirectory(), isTestPhase()); + + fixCompileSourceRoots(outputDir); + } + } + + } finally { + // always clear everything to avoid side-effects in goal is + // invoked more than once + properties.clear(); + engine.clear(); + } + } + + + public String reportGeneratedFiles(ChainedFileWriter writer, long t0) { + WriterReport writerReport = writer.getWriterReport(); + int nbFiles = writerReport.getFilesCount(); + + if (nbFiles == 0) { + return "No file generated."; + } + + long delay = System.nanoTime() - t0; + if (nbFiles == 1) { + return "Generate one file in " + StringUtil.convertTime(delay) + "."; + } + return "Generate " + nbFiles + " files in " + StringUtil.convertTime(delay) + "."; + } + + /** + * Add a single input to the {@link #inputs} property. + * <p/> + * <b>Note:</b> This is a convinient way to allow in pom to write + * <pre> + * <inputs>zargo</inputs> + * </pre> + * in stead of array notation : + * <pre> + * <inputs> + * <input>zargo:</input> + * </inputs> + * </pre> + * + * @param inputs unique input to add + */ + public void setInputs(String inputs) { + this.inputs = new String[]{inputs}; + } + + @Override + public File getOutputDirectory() { + return outputDirectory; + } + + @Override + public File getExtractDirectory() { + return extractDirectory; + } + + @Override + public Map<String, Object> getProperties() { + return properties; + } + + @Override + public ClassLoader getClassLoader() { + try { + return getFixedClassLoader(); + } catch (MojoExecutionException e) { + throw new IllegalStateException("could not obtain classLoader", e); + } + } + + @Override + public MavenProject getProject() { + return project; + } + + @Override + public void setProject(MavenProject project) { + this.project = project; + } + + @Override + public boolean isVerbose() { + return verbose; + } + + @Override + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } + + @Override + public String getEncoding() { + return encoding; + } + + @Override + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + @Override + public boolean isOverwrite() { + return overwrite; + } + + @Override + public boolean isOffline() { + return settings.isOffline(); + } + + @Override + public boolean isTestPhase() { + return testPhase; + } + + @Override + public String getModelType() { + return modelType; + } + + @Override + public Map<String, ChainedFileWriter> getWriters() { + return writers; + } + + @Override + public Map<String, ModelReader<?>> getModelReaders() { + return modelReaders; + } + + @Override + public Map<String, Template<?>> getModelTemplates() { + return modelTemplates; + } + + @Override + public File getBasedir() { + return getProject().getBasedir(); + } + + /** + * @return the string representation of excludesTemplates + * (separated by comma) + */ + protected String getExcludeTemplatesAsString() { + String result = ""; + for (int i = 0; i < excludeTemplates.length; i++) { + result += excludeTemplates[i]; + if (i != excludeTemplates.length - 1) { + result += ","; + } + } + return result; + } + + /** + * Prepare le classLoader a utiliser dans le generateur. + * <p/> + * Si le mojo est en phase de test {@link #testPhase} a été renseigné, + * target/classes est rajouté. + * <p/> + * Si des références à des sibling modules, ils seront rajoutés aussi. + * + * @return le class loader modifie + * @throws MojoExecutionException if any pb + */ + + public ClassLoader getFixedClassLoader() throws MojoExecutionException { + if (fixedClassLoader == null) { + Set<String> urlsAsString = new HashSet<String>(); + List<URL> urls = new ArrayList<URL>(); + try { + ClassLoader loader; + + if (testPhase) { + File extraClassPathDirectory = new File( + getProject().getBuild().getOutputDirectory()); + if (verbose) { + getLog().info("Add in generator's classLoader : " + + extraClassPathDirectory); + } + addDirectoryToUrlsList( + extraClassPathDirectory, + urls, + urlsAsString + ); + + addDirectoryToUrlsList( + new File(getProject().getBuild().getTestSourceDirectory()), + urls, + urlsAsString + ); + } else { + + addDirectoryToUrlsList( + new File(getProject().getBuild().getSourceDirectory()), + urls, + urlsAsString + ); + } + + if (project.getProjectReferences() != null) { + // this case is for multi-module when calling from a + // parent module + for (Object o : + project.getProjectReferences().entrySet()) { + Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o; + MavenProject relatedProject = + (MavenProject) entry.getValue(); + if (verbose) { + getLog().info("Add project reference in " + + "generator's classLoader : '" + + relatedProject.getArtifact() + "'"); + } + //TODO il faudrait peut-etre aussi ajouter les + //TODO dependances ? + if (relatedProject.getArtifact().getFile() != null) { + addDirectoryToUrlsList( + relatedProject.getArtifact().getFile(), + urls, + urlsAsString + ); + } + } + } + if (!project.getArtifacts().isEmpty()) { + // this is a special case when artifacts were resolved + // (for example in site phase) + if (isVerbose()) { + getLog().info( + "Use resolved artifacts to build class-path"); + } + for (Object o : project.getArtifacts()) { + Artifact a = (Artifact) o; + if (!a.getScope().equals("provided")) { + addDirectoryToUrlsList( + a.getFile(), + urls, + urlsAsString + ); + } + } + } + // we ask to add the directory in classloader + loader = getClass().getClassLoader(); + if (isVerbose()) { + getLog().info("original classloader " + loader); + } + if (loader instanceof URLClassLoader) { + // on reinjecte les urls de loader de base + // car sinon on risque de ne pas retrouver les resources... + for (URL u : ((URLClassLoader) loader).getURLs()) { + addUrlToUrlsList(u, urls, urlsAsString); + if (isVerbose()) { + getLog().debug("original cp entry: " + u); + } + } + // et on force l'utilisation du classloader parent + // s'il existe + if (loader.getParent() != null) { + loader = loader.getParent(); + } + } + if (!urls.isEmpty()) { + loader = new URLClassLoader( + urls.toArray(new URL[urls.size()]), + loader); + } + if (isVerbose()) { + for (URL u : urls) { + getLog().info("cp entry: " + u); + } + } + fixedClassLoader = loader; + } catch (MalformedURLException e) { + throw new MojoExecutionException(e.getMessage()); + } finally { + urls.clear(); + urlsAsString.clear(); + } + } + return fixedClassLoader; + } + + /** + * permet d'ajout le répertoire de génération des fichiers java dans + * les répertoires de compilation du projet Maven. + * + * @param destDirGen le repertoire a traiter + */ + protected void fixCompileSourceRoots(File destDirGen) { + + //FIXME-TC20091215 : should never have a null project, this is not + //FIXME-TC20091215 : normal + if (project == null) { + // no project defined, can not fix anything + // this case could appears if we wanted to do some tests of the + // plugin + return; + } + + //TODO-TC20091016 should use AbstractPlugin api + if (isTestPhase()) { + if (!project.getTestCompileSourceRoots().contains( + destDirGen.getPath())) { + getLog().info("Add test compile source root : " + destDirGen); + project.addTestCompileSourceRoot(destDirGen.getPath()); + Resource resources = new Resource(); + resources.setDirectory(destDirGen.getAbsolutePath()); + resources.setExcludes(Arrays.asList("**/*.java")); + getLog().info("Add test resource root :" + resources); + project.addTestResource(resources); + } + } else { + if (!project.getCompileSourceRoots().contains( + destDirGen.getPath())) { + getLog().info("Add compile source root : " + destDirGen); + project.addCompileSourceRoot(destDirGen.getPath()); + Resource resources = new Resource(); + resources.setDirectory(destDirGen.getAbsolutePath()); + resources.setExcludes(Arrays.asList("**/*.java")); + getLog().info("Add resource root :" + resources); + project.addResource(resources); + } + } + } + + protected ModelPropertiesUtil.ModelPropertiesProvider getModelPropertiesProvider() throws MojoExecutionException { + + ModelPropertiesUtil.ModelPropertiesProvider provider; + + if (modelPropertiesProviders == null || + modelPropertiesProviders.isEmpty() || + isTestPhase()) { + + // could not find any model properties via plexus + // try to obtain them by ServiceLoader + + provider = ModelPropertiesUtil.newStore( + getFixedClassLoader(), + verbose + ); + } else { + provider = ModelPropertiesUtil.newStore( + modelPropertiesProviders.values(), + verbose + ); + } + return provider; + } +} Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2012-08-17 08:44:36 UTC (rev 1174) @@ -25,851 +25,39 @@ package org.nuiton.eugene.plugin; -import org.apache.commons.lang3.StringUtils; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.model.Resource; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; -import org.apache.maven.settings.Settings; -import org.nuiton.eugene.DefaultTemplateConfiguration; -import org.nuiton.eugene.ModelPropertiesUtil; -import org.nuiton.eugene.ModelReader; -import org.nuiton.eugene.Template; -import org.nuiton.eugene.models.Model; -import org.nuiton.eugene.plugin.writer.BaseChainedFileWriter; -import org.nuiton.eugene.plugin.writer.ModelChainedFileWriter; -import org.nuiton.eugene.plugin.writer.XmiChainedFileWriter; -import org.nuiton.eugene.writer.ChainedFileWriter; -import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; -import org.nuiton.eugene.writer.ChainedFileWriterData; -import org.nuiton.eugene.writer.ChainedFileWriterEntry; -import org.nuiton.eugene.writer.ChainedWriterEngine; -import org.nuiton.eugene.writer.WriterReport; -import org.nuiton.plugin.AbstractPlugin; -import org.nuiton.plugin.PluginWithEncoding; -import org.nuiton.util.StringUtil; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Smart file generator. * <p/> * Fill inputs and mojo will chained needed writer. * <p/> - * User: chemit - * Date: 24 nov. 2009 - * Time: 00:22:37 * - * @goal smart-generate - * @requiresProject true - * @requiresDependencyResolution compile + * @author tchemit <chemit(a)codelutin.com> + * @deprecated since 2.5, prefer use now the {@code generate} goal. */ -public class SmartGenerateMojo extends AbstractPlugin implements ChainedFileWriterConfiguration, PluginWithEncoding { +@Mojo(name = "smart-generate", + requiresProject = true, + requiresDirectInvocation = true, + requiresDependencyResolution = ResolutionScope.COMPILE) +@Deprecated +public class SmartGenerateMojo extends GenerateMojo { - /** - * Inputs files to used to generate the required model files. - * </p> - * An include has the following pattern : - * <pre> - * writer: - * </pre> - * when you want to use a specific writer with his default io values. - * <p/> - * Can also write : - * <pre> - * [writer:]directory:includes - * </pre> - * where {@code includes} is the pattern to find files from the directory - * given and must be terminated by the extension of files. - * <p/> - * Specifying the {@code writer} can be usefull when you want to use a - * writer for an unknown extension by any writer. - * <p/> - * Example : - * <pre> - * <inputs> - * <input>zargo:</input> - * <input>src/main/xmi2:**\/*.zargo</input> - * <input>zargo:src/main/xmi:**\/*.zargo2</input> - * </inputs> - * </pre> - * <p/> - * <b>Note:</b> If your using a single input, you can just write : - * <pre> - * <inputs>zargo</inputs> - * </pre> - * - * @parameter expression="${eugene.inputs}" - * @required - * @since 2.0.0 - */ - protected String[] inputs; - - /** - * List of input (protocol) not to treate separated by comma. - * <p/> - * Example : - * <pre> - * <skipInputs>xmi</skipInputs> - * <skipInputs>xmi,model</skipInputs> - * </pre> - * - * @parameter expression="${eugene.skipInputs}" - * @since 2.0.0 - */ - protected String skipInputs; - - /** - * Where to generate files. - * - * @parameter expression="${eugene.outputDirectory}" default-value="target/generated-sources" - * @required - * @since 2.0.0 - */ - protected File outputDirectory; - - /** - * Where to copy extracted files (when using class-path data). - * - * @parameter expression="${eugene.extractDirectory}" default-value="target/extracted-sources" - * @required - * @since 2.1.3 - */ - protected File extractDirectory; - - /** - * Ecrase les fichiers générés. - * - * @parameter expression="${eugene.overwrite}" default-value="false" - * @since 2.0.0 - */ - protected boolean overwrite; - - /** - * Pour activer le mode verbeux. - * - * @parameter expression="${eugene.verbose}" default-value="${maven.verbose}" - * @since 2.0.0 - */ - protected boolean verbose; - - /** - * Encoding to be used for generation of files. - * <p/> - * <b>Note:</b> If nothing is filled here, we will use the system - * property {@code file.encoding}. - * - * @parameter expression="${eugene.encoding}" default-value="${project.build.sourceEncoding}" - * @since 2.0.0 - */ - protected String encoding; - - /** - * A flag to mark the mojo to be used in a test phase. This will permits - * to add generated sources in test compile roots. - * - * @parameter expression="${eugene.testPhase}" default-value="false" - * @since 2.0.0 - */ - protected boolean testPhase; - - /** - * The type of model to be used. - * <p/> - * By default, use an {@code objectmodel}. - * - * @parameter expression="${eugene.modelType}" default-value="objectmodel" - * @required - * @since 2.0.0 - */ - protected String modelType; - - /** - * Properties to pass to writer. - * - * @parameter - * @since 2.0.0 - */ - protected Map<String, Object> properties; - - /** - * Ne génère rien, analyse juste la configuration. - * - * @parameter expression="${eugene.dryRun}" default-value="false" - * @since 2.0.0 - */ - protected boolean dryRun; - - /** - * Nom du paquetage pour les fichiers générés (xmi input sepcific). - * - * @parameter expression="${generator.fullPackagePath}" default-value="${project.groupId}.${project.artifactId}" - * @since 2.0.0 - */ - protected String fullPackagePath; - - /** - * Nom du resolver a utiliser pour les transformations xmi vers model - * (xmi input sepcific). - * - * @parameter expression="${generator.resolver}" default-value="org.nuiton.util.ResourceResolver" - * @since 2.0.0 - */ - protected String resolver; - - /** - * Templates à utiliser, séparés par des virgules pour les transformations - * depuis les models (model input sepcific). - * - * @parameter expression="${eugene.templates}" - * @since 0.50 - */ - protected String templates; - - /** - * Templates à ne pas utiliser lors de la transformations des models - * (model input sepcific). - * - * @parameter expression="${eugene.excludeTemplates}" - * @since 0.63 - */ - protected String[] excludeTemplates; - - /** - * Nom par défaut du paquetage généré (model input specific). - * - * @parameter expression="${eugene.defaultPackage}" default-value="${project.groupId}.${project.artifactId}" - * @since 0.50 - */ - protected String defaultPackage; - - /** - * List of packages to generate (comma separated). (model input specific). - * <p/> - * If the parameter is not filled, will generate all packages. - * - * @parameter expression="${eugene.generatedPackages}" - * @since 1.0.0-rc-8 - */ - protected String generatedPackages; - - /** - * List of package to extract from xmi to models. (model input specific). - * <p/> - * If the parameter is not filled, will extract all packages. - * - * @parameter expression="${eugene.extractedPackages}" default-value="${project.groupId}.${project.artifactId}" - * @since 1.0.0-rc-8 - */ - protected String extractedPackages; - - /** - * Maven project. - * - * @parameter default-value="${project}" - * @readonly - * @since 2.0.0 - */ - protected MavenProject project; - - /** - * Le settings (pour obtenir le mode offline). - * - * @parameter default-value="${settings}" - * @readonly - * @since 2.0.0 - */ - protected Settings settings; - - /** - * All available models (obtain by plexus, keys are plexus roles, - * values are a instance of corresponding model). - * - * @component role="org.nuiton.eugene.models.Model" - */ - protected Map<String, Model> _models; - - /** - * All available writers introspects via plexus - * - * @component role="org.nuiton.eugene.writer.ChainedFileWriter" - */ - protected Map<String, ChainedFileWriter> writers; - - /** - * All available writers introspects via plexus - * - * @component role="org.nuiton.eugene.ModelReader" - */ - protected Map<String, ModelReader<?>> modelReaders; - - /** - * All available templates introspects via plexus - * - * @component role="org.nuiton.eugene.Template" - */ - protected Map<String, Template<?>> modelTemplates; - - /** - * All available model properties providers introspects via plexus - * - * @component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" - * @since 2.3 - */ - protected Map<String, ModelPropertiesUtil.ModelPropertiesProvider> modelPropertiesProviders; - - /** - * The engine to compute {@link ChainedFileWriter} from inputs entries. - * - * @component role="org.nuiton.eugene.writer.ChainedWriterEngine" - */ - protected ChainedWriterEngine engine; - - /** fixed classloader */ - protected ClassLoader fixedClassLoader; - @Override protected void init() throws Exception { - if (getLog().isDebugEnabled()) { - verbose = true; - } + getLog().warn("================================================================================"); + getLog().warn(""); + getLog().warn("Since version 2.5, smart-generate is deprecated (it will be removed in version 3.0)."); + getLog().warn("Prefer use now the generate goal."); + getLog().warn(""); + getLog().warn("See http://maven-site.nuiton.org/eugene/eugene-maven-plugin/generate-mojo.html"); + getLog().warn("See http://nuiton.org/issues/2251"); + getLog().warn(""); + getLog().warn("================================================================================"); - modelType = modelType.trim().toLowerCase(); - - // Check model type is accepted - // pouvoir associé un nom à un type de service). - Model model = _models.get(modelType); - if (model == null) { - throw new MojoExecutionException( - "No modelType named '" + modelType + "', use one of " + - _models.keySet()); - } - - if (inputs.length == 0) { - throw new MojoExecutionException( - "Must specify something to include using the includes " + - "property"); - } - //FIXME-TC20091217 use a configurator in plexus ? - // Actually we obtain a different instance of the mojo conflit with - // mojo and plexus :) - engine.setConfiguration(this); - - Set<ChainedFileWriter> availableWriters = engine.getAvailableWriters(); - - if (availableWriters.isEmpty()) { - throw new MojoExecutionException( - "Could not find any writer in class-path."); - } - - for (ChainedFileWriter writer : availableWriters) { - if (writer instanceof BaseChainedFileWriter) { - // add log support - ((BaseChainedFileWriter) writer).setLog(getLog()); - } - writer.setWriterReport(new WriterReport() { - @Override - public void addFile(String entry, File file, boolean b) { - super.addFile(entry, file, b); - if (b || isVerbose()) { - getLog().info("Will generate " + file); - } - if (getLog().isDebugEnabled()) { - getLog().debug(String.format("[%1$s] Will generate %2$s", entry, file)); - } - } - }); - } - - // detect top level writers - for (String include : inputs) { - - if (isVerbose()) { - getLog().info("Register include : " + include); - } - engine.registerInclude(include); - } - - if (engine.getSelectedWriters().isEmpty()) { - return; - } - - if (properties == null) { - properties = new LinkedHashMap<String, Object>(); - } - - if (engine.containsWriter("xmi")) { - - // add xmi writer support - - properties.put(XmiChainedFileWriter.PROP_FULL_PACKAGE_PATH, - fullPackagePath); - properties.put(XmiChainedFileWriter.PROP_EXTRACTED_PACKAGES, extractedPackages); - properties.put(XmiChainedFileWriter.PROP_RESOLVER, resolver); - } - - if (engine.containsWriter("model")) { - - // add model writer support - - properties.put(ModelChainedFileWriter.PROP_DEFAULT_PACKAGE, - defaultPackage); - properties.put(ModelChainedFileWriter.PROP_GENERATED_PACKAGES, - generatedPackages); - properties.put(ModelChainedFileWriter.PROP_TEMPLATES, templates); - properties.put(ModelChainedFileWriter.PROP_EXCLUDE_TEMPLATES, - getExcludeTemplatesAsString()); - properties.put(ModelChainedFileWriter.PROP_MODEL_PROPERTIES_PROVIDER, - getModelPropertiesProvider()); - - DefaultTemplateConfiguration configuration = - new DefaultTemplateConfiguration(); - configuration.setEncoding(getEncoding()); - configuration.setLoader(getClassLoader()); - configuration.setOverwrite(isOverwrite()); - configuration.setVerbose(isVerbose()); - properties.put(ModelChainedFileWriter.PROP_TEMPLATE_CONFIGURATION, - configuration); - } + super.init(); } - @Override - protected boolean checkSkip() { - if (engine.getSelectedWriters().isEmpty()) { - getLog().warn("No phase was detected, skip the goal."); - return false; - } - return true; - } - - @Override - protected void doAction() throws Exception { - if (dryRun) { - getLog().warn("dryRun property is set, no file will be generated."); - } - if (isVerbose()) { - if (isTestPhase()) { - getLog().info(" using testPhase"); - } - } - try { - - List<String> skipInputList = new ArrayList<String>(); - - if (!StringUtils.isEmpty(skipInputs)) { - - for (String s : skipInputs.split(",")) { - skipInputList.add(s.trim()); - } - } - - // launch writers in incoming order of dicovering of them - - for (ChainedFileWriter writer : engine.getSelectedWriters()) { - if (skipInputList.contains(writer.getInputProtocol())) { - getLog().info("Skip phase [" + writer.getInputProtocol() + - "] as required in skipInputs configuration."); - continue; - } - long t0 = System.nanoTime(); - int size = writer.getEntries().size(); - if (size == 1) { - getLog().info( - "Process phase [" + writer.getInputProtocol() + - "] for one entry."); - } else { - getLog().info( - "Process phase [" + writer.getInputProtocol() + - "] for " + size + " entries."); - } - if (dryRun || isVerbose()) { - for (ChainedFileWriterEntry entry : writer.getEntries()) { - getLog().info(" entry : " + entry); - } - if (dryRun) { - continue; - } - } - if (getLog().isDebugEnabled()) { - getLog().debug("Generating files and copying resources..."); - } - - // obtains data to react for this writer - ChainedFileWriterData data = engine.getData(writer); - - // launch generation - writer.generate(this, data); - - String message = reportGeneratedFiles(writer, t0); - getLog().info(message); - - if ("model".equals(writer.getInputProtocol())) { - - // must fix source compile roots - File outputDir = writer.getOutputDirectory( - getOutputDirectory(), isTestPhase()); - - fixCompileSourceRoots(outputDir); - } - } - - } finally { - // always clear everything to avoid side-effects in goal is - // invoked more than once - properties.clear(); - engine.clear(); - } - } - - - public String reportGeneratedFiles(ChainedFileWriter writer, long t0) { - WriterReport writerReport = writer.getWriterReport(); - int nbFiles = writerReport.getFilesCount(); - - if (nbFiles == 0) { - return "No file generated."; - } - - long delay = System.nanoTime() - t0; - if (nbFiles == 1) { - return "Generate one file in " + StringUtil.convertTime(delay) + "."; - } - return "Generate " + nbFiles + " files in " + StringUtil.convertTime(delay) + "."; - } - - /** - * Add a single input to the {@link #inputs} property. - * <p/> - * <b>Note:</b> This is a convinient way to allow in pom to write - * <pre> - * <inputs>zargo</inputs> - * </pre> - * in stead of array notation : - * <pre> - * <inputs> - * <input>zargo:</input> - * </inputs> - * </pre> - * - * @param inputs unique input to add - */ - public void setInputs(String inputs) { - this.inputs = new String[]{inputs}; - } - - @Override - public File getOutputDirectory() { - return outputDirectory; - } - - @Override - public File getExtractDirectory() { - return extractDirectory; - } - - @Override - public Map<String, Object> getProperties() { - return properties; - } - - @Override - public ClassLoader getClassLoader() { - try { - return getFixedClassLoader(); - } catch (MojoExecutionException e) { - throw new IllegalStateException("could not obtain classLoader", e); - } - } - - @Override - public MavenProject getProject() { - return project; - } - - @Override - public void setProject(MavenProject project) { - this.project = project; - } - - @Override - public boolean isVerbose() { - return verbose; - } - - @Override - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - @Override - public String getEncoding() { - return encoding; - } - - @Override - public void setEncoding(String encoding) { - this.encoding = encoding; - } - - @Override - public boolean isOverwrite() { - return overwrite; - } - - @Override - public boolean isOffline() { - return settings.isOffline(); - } - - @Override - public boolean isTestPhase() { - return testPhase; - } - - @Override - public String getModelType() { - return modelType; - } - - @Override - public Map<String, ChainedFileWriter> getWriters() { - return writers; - } - - @Override - public Map<String, ModelReader<?>> getModelReaders() { - return modelReaders; - } - - @Override - public Map<String, Template<?>> getModelTemplates() { - return modelTemplates; - } - - @Override - public File getBasedir() { - return getProject().getBasedir(); - } - - /** - * @return the string representation of excludesTemplates - * (separated by comma) - */ - protected String getExcludeTemplatesAsString() { - String result = ""; - for (int i = 0; i < excludeTemplates.length; i++) { - result += excludeTemplates[i]; - if (i != excludeTemplates.length - 1) { - result += ","; - } - } - return result; - } - - /** - * Prepare le classLoader a utiliser dans le generateur. - * <p/> - * Si le mojo est en phase de test {@link #testPhase} a été renseigné, - * target/classes est rajouté. - * <p/> - * Si des références à des sibling modules, ils seront rajoutés aussi. - * - * @return le class loader modifie - * @throws MojoExecutionException if any pb - */ - - public ClassLoader getFixedClassLoader() throws MojoExecutionException { - if (fixedClassLoader == null) { - Set<String> urlsAsString = new HashSet<String>(); - List<URL> urls = new ArrayList<URL>(); - try { - ClassLoader loader; - - if (testPhase) { - File extraClassPathDirectory = new File( - getProject().getBuild().getOutputDirectory()); - if (verbose) { - getLog().info("Add in generator's classLoader : " + - extraClassPathDirectory); - } - addDirectoryToUrlsList( - extraClassPathDirectory, - urls, - urlsAsString - ); - - addDirectoryToUrlsList( - new File(getProject().getBuild().getTestSourceDirectory()), - urls, - urlsAsString - ); - } else { - - addDirectoryToUrlsList( - new File(getProject().getBuild().getSourceDirectory()), - urls, - urlsAsString - ); - } - - if (project.getProjectReferences() != null) { - // this case is for multi-module when calling from a - // parent module - for (Object o : - project.getProjectReferences().entrySet()) { - Map.Entry<?, ?> entry = (Map.Entry<?, ?>) o; - MavenProject relatedProject = - (MavenProject) entry.getValue(); - if (verbose) { - getLog().info("Add project reference in " + - "generator's classLoader : '" + - relatedProject.getArtifact() + "'"); - } - //TODO il faudrait peut-etre aussi ajouter les - //TODO dependances ? - if (relatedProject.getArtifact().getFile() != null) { - addDirectoryToUrlsList( - relatedProject.getArtifact().getFile(), - urls, - urlsAsString - ); - } - } - } - if (!project.getArtifacts().isEmpty()) { - // this is a special case when artifacts were resolved - // (for example in site phase) - if (isVerbose()) { - getLog().info( - "Use resolved artifacts to build class-path"); - } - for (Object o : project.getArtifacts()) { - Artifact a = (Artifact) o; - if (!a.getScope().equals("provided")) { - addDirectoryToUrlsList( - a.getFile(), - urls, - urlsAsString - ); - } - } - } - // we ask to add the directory in classloader - loader = getClass().getClassLoader(); - if (isVerbose()) { - getLog().info("original classloader " + loader); - } - if (loader instanceof URLClassLoader) { - // on reinjecte les urls de loader de base - // car sinon on risque de ne pas retrouver les resources... - for (URL u : ((URLClassLoader) loader).getURLs()) { - addUrlToUrlsList(u, urls, urlsAsString); - if (isVerbose()) { - getLog().debug("original cp entry: " + u); - } - } - // et on force l'utilisation du classloader parent - // s'il existe - if (loader.getParent() != null) { - loader = loader.getParent(); - } - } - if (!urls.isEmpty()) { - loader = new URLClassLoader( - urls.toArray(new URL[urls.size()]), - loader); - } - if (isVerbose()) { - for (URL u : urls) { - getLog().info("cp entry: " + u); - } - } - fixedClassLoader = loader; - } catch (MalformedURLException e) { - throw new MojoExecutionException(e.getMessage()); - } finally { - urls.clear(); - urlsAsString.clear(); - } - } - return fixedClassLoader; - } - - /** - * permet d'ajout le répertoire de génération des fichiers java dans - * les répertoires de compilation du projet Maven. - * - * @param destDirGen le repertoire a traiter - */ - protected void fixCompileSourceRoots(File destDirGen) { - - //FIXME-TC20091215 : should never have a null project, this is not - //FIXME-TC20091215 : normal - if (project == null) { - // no project defined, can not fix anything - // this case could appears if we wanted to do some tests of the - // plugin - return; - } - - //TODO-TC20091016 should use AbstractPlugin api - if (isTestPhase()) { - if (!project.getTestCompileSourceRoots().contains( - destDirGen.getPath())) { - getLog().info("Add test compile source root : " + destDirGen); - project.addTestCompileSourceRoot(destDirGen.getPath()); - Resource resources = new Resource(); - resources.setDirectory(destDirGen.getAbsolutePath()); - resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("Add test resource root :" + resources); - project.addTestResource(resources); - } - } else { - if (!project.getCompileSourceRoots().contains( - destDirGen.getPath())) { - getLog().info("Add compile source root : " + destDirGen); - project.addCompileSourceRoot(destDirGen.getPath()); - Resource resources = new Resource(); - resources.setDirectory(destDirGen.getAbsolutePath()); - resources.setExcludes(Arrays.asList("**/*.java")); - getLog().info("Add resource root :" + resources); - project.addResource(resources); - } - } - } - - protected ModelPropertiesUtil.ModelPropertiesProvider getModelPropertiesProvider() throws MojoExecutionException { - - ModelPropertiesUtil.ModelPropertiesProvider provider; - - if (modelPropertiesProviders == null || - modelPropertiesProviders.isEmpty() || - isTestPhase()) { - - // could not find any model properties via plexus - // try to obtain them by ServiceLoader - - provider = ModelPropertiesUtil.newStore( - getFixedClassLoader(), - verbose - ); - } else { - provider = ModelPropertiesUtil.newStore( - modelPropertiesProviders.values(), - verbose - ); - } - return provider; - } } Modified: trunk/eugene-maven-plugin/src/site/fr/rst/example.rst.vm =================================================================== --- trunk/eugene-maven-plugin/src/site/fr/rst/example.rst.vm 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/site/fr/rst/example.rst.vm 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======== Examples ======== @@ -52,6 +54,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> + <version>${project.version}</version> <executions> @@ -71,7 +74,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -80,6 +83,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> </dependency> </dependencies> </plugin> @@ -117,7 +121,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -134,7 +138,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -150,7 +154,7 @@ <templates>org.nuiton.topia.generator.BeanTransformer</templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> Modified: trunk/eugene-maven-plugin/src/site/fr/rst/index.rst =================================================================== (Binary files differ) Property changes on: trunk/eugene-maven-plugin/src/site/fr/rst/index.rst ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/maven-eugene-plugin/src/site/fr/rst/index.rst:641-651 /branches/eugene-2.0/maven-eugene-plugin/src/site/fr/rst/index.rst:682-754 + /branches/1.0.1-Javabuilder/maven-eugene-plugin/src/site/fr/rst/index.rst:641-651 /branches/eugene-2.0/maven-eugene-plugin/src/site/fr/rst/index.rst:682-754 /branches/eugene-2.4.3/eugene-maven-plugin/src/site/fr/rst/index.rst:1151-1173 Modified: trunk/eugene-maven-plugin/src/site/fr/rst/usage.rst =================================================================== --- trunk/eugene-maven-plugin/src/site/fr/rst/usage.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/site/fr/rst/usage.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +===== Usage ===== @@ -32,8 +34,8 @@ .. contents:: -smart-generate --------------- +generate +-------- Ce 'goal' permet de lancer une génération intelligente, en chaînant les différentes phases de génération. @@ -76,7 +78,7 @@ <inputs>zargo</inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -92,7 +94,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -117,7 +119,7 @@ <inputs>classpath:zargo:/myzargo:.*\.zargo</inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -144,7 +146,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -164,7 +166,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -232,7 +234,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -255,7 +257,7 @@ <skipInputs>xmi,model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -287,7 +289,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -324,7 +326,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -391,37 +393,3 @@ [objectmodel] with implementation 'org.nuiton.eugene.models.object.ObjectModelReader' Found one modeltemplate : [org.nuiton.eugene.java.JavaGenerator] with implementation 'org.nuiton.eugene.java.JavaGenerator' - -copyVersionFiles ----------------- - -Ce 'goal' permet de garder les mappings hibernate intacts pour chaque version du -model. - -zargo2xmi ---------- - -Génération 'stupide' de zargo vers xmi sans chaînage des générations. - -Utilisez plutôt le 'goal' *smart-generate*. - -xmi2objectmodel ---------------- - -Génération 'stupide' de xmi vers objectmodel sans chaînage des générations. - -Utilisez plutôt le 'goal' *smart-generate*. - -xmi2statemodel --------------- - -Génération 'stupide' de xmi vers statemodel sans chaînage des générations. - -Utilisez plutôt le 'goal' *smart-generate*. - -generate --------- - -Génération 'stupide' de model vers java et autres sans chaînage des générations. - -Utilisez plutôt le 'goal' *smart-generate*. Modified: trunk/eugene-maven-plugin/src/site/rst/example.rst.vm =================================================================== --- trunk/eugene-maven-plugin/src/site/rst/example.rst.vm 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/site/rst/example.rst.vm 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======== Examples ======== @@ -55,7 +57,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - + <version>${project.version}</version> <executions> <execution> @@ -74,7 +76,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> @@ -83,6 +85,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> </dependency> </dependencies> </plugin> @@ -119,7 +122,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -136,7 +139,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -152,7 +155,7 @@ <templates>org.nuiton.topia.generator.BeanTransformer</templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> Modified: trunk/eugene-maven-plugin/src/site/rst/index.rst =================================================================== (Binary files differ) Modified: trunk/eugene-maven-plugin/src/site/rst/usage.rst =================================================================== --- trunk/eugene-maven-plugin/src/site/rst/usage.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/site/rst/usage.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +===== Usage ===== @@ -37,8 +39,8 @@ This page describes the usage of the goals of the eugene plugin. -smart-generate --------------- +generate +-------- This goal permits to launch a smart (understood as intelligent) generation, chaining different generation phases. @@ -80,7 +82,7 @@ <inputs>zargo</inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -97,7 +99,7 @@ </inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -118,7 +120,7 @@ <inputs>zargo:src/main/myzargo2:**/*.zargo2</inputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -157,7 +159,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -180,7 +182,7 @@ <skipInputs>xmi,model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -212,7 +214,7 @@ <skipInputs>model</skipInputs> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -249,7 +251,7 @@ </templates> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> @@ -317,36 +319,3 @@ [objectmodel] with implementation 'org.nuiton.eugene.models.object.ObjectModelReader' Found one modeltemplate : [org.nuiton.eugene.java.JavaGenerator] with implementation 'org.nuiton.eugene.java.JavaGenerator' - -copyVersionFiles ----------------- - -This goal permits to keep hibernate mappings for each version of model version. - -zargo2xmi ---------- - -'Stupid' generation from zargo to xmi files with no chained stuff. - -Prefer using the *smart-generate* goal. - -xmi2objectmodel ---------------- - -'Stupid' generation from xmi files to object model files with no chained stuff. - -Prefer using the *smart-generate* goal. - -xmi2statemodel --------------- - -'Stupid' generation from xmi files to state model files with no chained stuff. - -Prefer using the *smart-generate* goal. - -generate --------- - -'Stupid' generation from model files to java and other files with no chained stuff. - -Prefer using the *smart-generate* goal. Modified: trunk/eugene-maven-plugin/src/site/site_en.xml =================================================================== --- trunk/eugene-maven-plugin/src/site/site_en.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/site/site_en.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -26,68 +26,56 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <body> - <links> - <item name="[fr" href="fr/index.html" /> - <item name="en]" href="index.html" /> - </links> + <body> - <breadcrumbs> - <item name="${project.name}" href="index.html" /> - </breadcrumbs> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> - <menu ref="parent"/> - - <menu name="User"> - <item href="index.html" name="Index"/> - <item href="usage.html" name="Usage"/> - <item href="example.html" name="Examples"/> - <item name="Goals" href="plugin-info.html"> - <item name="smart-generate" href="smart-generate-mojo.html"/> - <item name="available-data" href="available-data-mojo.html"/> - <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> - <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> - <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> - <item name="generate-model-files" href="generate-model-files-mojo.html"/> - <item name="generate" href="generate-mojo.html"/> - <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> + <links> + <item name="[fr" href="fr/index.html"/> + <item name="en]" href="index.html"/> + </links> - <menu name="Download"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Library (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> - - <menu ref="reports"/> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <footer> + <menu ref="parent"/> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu name="User"> + <item href="index.html" name="Index"/> + <item href="usage.html" name="Usage"/> + <item href="example.html" name="Examples"/> + <item name="Goals" href="plugin-info.html"> + <item name="generate" href="generate-mojo.html"/> + <item name="available-data" href="available-data-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <menu ref="reports"/> - </body> + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> </project> Modified: trunk/eugene-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/eugene-maven-plugin/src/site/site_fr.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/eugene-maven-plugin/src/site/site_fr.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -26,72 +26,60 @@ <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> - <body> - <links> - <item name="[fr" href="index.html"/> - <item name="en]" href="../index.html"/> - </links> + <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> -  -  - <menu name="Parent Projet"> - <item name="Eugene" href="../../fr/index.html"/> - </menu> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="../index.html"/> + </links> - <menu name="Utilisateur"> - <item href="index.html" name="Accueil"/> - <item href="usage.html" name="Utilisation"/> - <item href="example.html" name="Examples"/> - <item name="Goals" href="plugin-info.html"> - <item name="smart-generate" href="smart-generate-mojo.html"/> - <item name="available-data" href="available-data-mojo.html"/> - <item name="zargo2xmi" href="zargo2xmi-mojo.html"/> - <item name="xmi2statemodel" href="xmi2statemodel-mojo.html"/> - <item name="xmi2objectmodel" href="xmi2objectmodel-mojo.html"/> - <item name="generate-model-files" href="generate-model-files-mojo.html"/> - <item name="generate" href="generate-mojo.html"/> - <item name="copyVersionFiles" href="copyVersionFiles-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu name="Téléchargement"> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}.jar" - name="Librairie (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" - name="Javadoc (jar)"/> - <item href="${repository.home.url}/org/nuiton/eugene/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" - name="Sources (jar)"/> - </menu> +  +  + <menu name="Parent Projet"> + <item name="Eugene" href="../../fr/index.html"/> + </menu> - <menu ref="reports"/> + <menu name="Utilisateur"> + <item href="index.html" name="Accueil"/> + <item href="usage.html" name="Utilisation"/> + <item href="example.html" name="Examples"/> + <item name="Goals" href="plugin-info.html"> + <item name="generate" href="generate-mojo.html"/> + <item name="available-data" href="available-data-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> - <footer> + <menu ref="reports"/> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <footer> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> - </body> + </body> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/pom.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -36,12 +36,12 @@ </parent> <artifactId>eugene</artifactId> - <version>2.4.3-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> <modules> <module>eugene</module> <module>eugene-maven-plugin</module> - <module>ant-eugene-task</module> +  </modules> <dependencyManagement> @@ -276,6 +276,13 @@ </dependency> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${pluginPluginVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>1.5.15</version> @@ -297,9 +304,10 @@ <developer> <name>Benjamin Poussin</name> <id>bpoussin</id> - <email>poussin(a)codelutin.com</email> + <email>poussin at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> <role>Debian packager</role> @@ -309,9 +317,10 @@ <developer> <name>Arnaud Thimel</name> <id>athimel</id> - <email>thimel(a)codelutin.com</email> + <email>thimel at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -320,9 +329,10 @@ <developer> <name>Julien Ruchaud</name> <id>jruchaud</id> - <email>ruchaud(a)codelutin.com</email> + <email>ruchaud at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -331,29 +341,22 @@ <developer> <name>Eric Chatellier</name> <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> + <email>chatellier at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> </developer> <developer> - <name>Stéphane Chorlet</name> - <id>schorlet</id> - <timezone>+2</timezone> - <roles> - <role>developer</role> - </roles> - </developer> - - <developer> <name>Tony Chemit</name> <id>tchemit</id> - <email>chemit(a)codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -362,15 +365,26 @@ <developer> <name>Florian Desbois</name> <id>fdesbois</id> - <email>fdesbois(a)codelutin.com</email> + <email>fdesbois at codelutin dot com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> </developer> </developers> + <contributors> + <contributor> + <name>Stéphane Chorlet</name> + <timezone>Europe/Paris</timezone> + <roles> + <role>developer</role> + </roles> + </contributor> + </contributors> +    @@ -382,13 +396,9 @@ <projectId>eugene</projectId> <processorPluginVersion>1.2.2</processorPluginVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> -  - <antVersion>1.8.4</antVersion> - <jrstPluginVersion>1.5</jrstPluginVersion> -  <locales>en,fr</locales> @@ -451,7 +461,6 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> <developerConnection> scm:svn:http://svn.nuiton.org/svn/eugene/trunk @@ -519,12 +528,12 @@ <tasks> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> - <include name="**/*.xsd"/> + <include name="**/*.xsd" /> </fileset> </copy> <copy todir="target/site/dtd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/dtd"> - <include name="**/*.dtd"/> + <include name="**/*.dtd" /> </fileset> </copy> </tasks> Modified: trunk/src/site/fr/rst/01-introduction.rst =================================================================== --- trunk/src/site/fr/rst/01-introduction.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/01-introduction.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +============ Introduction ============ @@ -72,6 +74,7 @@ EUGene permet la manipulation et la génération des modèles. Il fournit les fonctionnalités de bases suivantes : + * lecture d'un modèle de classe UML en XMI indépendant de la modélisation * template de génération * transformation de modèles @@ -95,7 +98,7 @@ | | | | | | Format | | | Générateur | Indépendance | Build | Plugin | de sortie | +=========+=====================+============================+==============+=========+===========+ -| EUGene | Template en java | Outils de développement | Maven/Ant | Eclipse | Tout | +| EUGene | Template en java | Outils de développement | Maven | Eclipse | Tout | +---------+---------------------+----------------------------+--------------+---------+-----------+ | Acceleo | Template spécifique | Lié à la pateforme Eclipse | Pas possible | Eclipse | Tout | +---------+---------------------+----------------------------+--------------+---------+-----------+ Modified: trunk/src/site/fr/rst/02-objectmodel.rst =================================================================== --- trunk/src/site/fr/rst/02-objectmodel.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/02-objectmodel.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =========== ObjectModel =========== Property changes on: trunk/src/site/fr/rst/02-objectmodel.rst ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/site/fr/rst/ObjectModel.rst:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/fr/rst/ObjectModel.rst:652-681 /branches/eugene-2.0/eugene/src/site/fr/rst/ObjectModel.rst:682-754 + /branches/1.0.1-Javabuilder/eugene/src/site/fr/rst/ObjectModel.rst:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/fr/rst/ObjectModel.rst:652-681 /branches/eugene-2.0/eugene/src/site/fr/rst/ObjectModel.rst:682-754 /branches/eugene-2.4.3/src/site/fr/rst/02-objectmodel.rst:1151-1173 Modified: trunk/src/site/fr/rst/03-generation.rst =================================================================== --- trunk/src/site/fr/rst/03-generation.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/03-generation.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================= Processus de génération ======================= Modified: trunk/src/site/fr/rst/04-templates.rst =================================================================== --- trunk/src/site/fr/rst/04-templates.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/04-templates.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========= Templates ========= Modified: trunk/src/site/fr/rst/05-execution.rst.vm =================================================================== --- trunk/src/site/fr/rst/05-execution.rst.vm 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/05-execution.rst.vm 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========= Execution ========= @@ -36,7 +38,8 @@ Ant --- -Consultez la documentation dans le `module ant`_. +Ce module est désactivité depuis la version 2.5. +::Consultez la documentation dans le `module ant`_. Maven ----- @@ -59,4 +62,4 @@ et la documentation du plugin`_ . .. _les exemples et la documentation du plugin: ../eugene-maven-plugin/fr/example.html -.. _module ant: ../ant-eugene-task/fr/ +::.. _module ant: ../ant-eugene-task/fr/ Modified: trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst =================================================================== --- trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/06-fonctionnalites-avancees.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================== Fonctionnalités avancées ======================== Modified: trunk/src/site/fr/rst/07-glossaire.rst =================================================================== --- trunk/src/site/fr/rst/07-glossaire.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/07-glossaire.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,13 +22,15 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========= Glossaire ========= MDA --- -**M**odel **D**riven **A**rchitecture : technique de programmation basé sur +Model Driven Architecture : technique de programmation basé sur les modèles. Refs : `MDA`_ , `Introduction EUGene`_ @@ -39,7 +41,7 @@ UML --- -**U**nified **M**odeling **L**anguage : langage de modélisation. +Unified Modeling Language : langage de modélisation. Refs : `Site officiel UML`_ , `ObjectModel EUGene`_ @@ -49,7 +51,7 @@ XMI --- -**X**ML **M**etadata **I**nterchange : norme XML pour le langage UML. +XML Metadata Interchange : norme XML pour le langage UML. Refs : `Site officiel XMI`_ , `ObjectModel EUGene`_ Modified: trunk/src/site/fr/rst/08-FAQ.rst =================================================================== --- trunk/src/site/fr/rst/08-FAQ.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/08-FAQ.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + === FAQ === Property changes on: trunk/src/site/fr/rst/08-FAQ.rst ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/site/fr/rst/FAQ.rst:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/fr/rst/FAQ.rst:652-681 /branches/eugene-2.0/eugene/src/site/fr/rst/FAQ.rst:682-754 + /branches/1.0.1-Javabuilder/eugene/src/site/fr/rst/FAQ.rst:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/fr/rst/FAQ.rst:652-681 /branches/eugene-2.0/eugene/src/site/fr/rst/FAQ.rst:682-754 /branches/eugene-2.4.3/src/site/fr/rst/08-FAQ.rst:1151-1173 Modified: trunk/src/site/fr/rst/09-tutoriel-index.rst =================================================================== --- trunk/src/site/fr/rst/09-tutoriel-index.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/09-tutoriel-index.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============== Tutorial index ============== Modified: trunk/src/site/fr/rst/eugene-plan.rst =================================================================== --- trunk/src/site/fr/rst/eugene-plan.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/eugene-plan.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============================= Plan documentation EUGene 2.0 ============================= @@ -57,7 +58,7 @@ - Build - * Ant + * Ant (désactivé depuis la version 2.5) * Maven - Fonctionnalités avancées Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/fr/rst/index.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,11 +22,12 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ====== EUGene ====== -**E**fficient **U**niversal **Gene**rator +Efficient Universal GENErator Vous trouverez dans cette documentation : Property changes on: trunk/src/site/resources/objectmodel/Hotel.objectmodel.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/Hotel.objectmodel.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/Hotel.objectmodel.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/Hotel.objectmodel.png:682-754 + /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/Hotel.objectmodel.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/Hotel.objectmodel.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/Hotel.objectmodel.png:682-754 /branches/eugene-2.4.3/src/site/resources/objectmodel/Hotel.objectmodel.png:1151-1173 Property changes on: trunk/src/site/resources/objectmodel/Hotel.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/Hotel.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/Hotel.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/Hotel.png:682-754 + /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/Hotel.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/Hotel.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/Hotel.png:682-754 /branches/eugene-2.4.3/src/site/resources/objectmodel/Hotel.png:1151-1173 Property changes on: trunk/src/site/resources/objectmodel/ObjectModel.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/ObjectModel.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/ObjectModel.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/ObjectModel.png:682-754 + /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/ObjectModel.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/ObjectModel.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/ObjectModel.png:682-754 /branches/eugene-2.4.3/src/site/resources/objectmodel/ObjectModel.png:1151-1173 Property changes on: trunk/src/site/resources/objectmodel/ObjectModel_Generator.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/ObjectModel_Generator.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/ObjectModel_Generator.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/ObjectModel_Generator.png:682-754 + /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/ObjectModel_Generator.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/ObjectModel_Generator.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/ObjectModel_Generator.png:682-754 /branches/eugene-2.4.3/src/site/resources/objectmodel/ObjectModel_Generator.png:1151-1173 Property changes on: trunk/src/site/resources/objectmodel/ObjectModel_Interfaces.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/ObjectModel_Interfaces.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/ObjectModel_Interfaces.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/ObjectModel_Interfaces.png:682-754 + /branches/1.0.1-Javabuilder/eugene/src/site/resources/images/ObjectModel_Interfaces.png:641-651 /branches/1.1.0-Javabuilder/eugene/src/site/resources/images/ObjectModel_Interfaces.png:652-681 /branches/eugene-2.0/eugene/src/site/resources/images/ObjectModel_Interfaces.png:682-754 /branches/eugene-2.4.3/src/site/resources/objectmodel/ObjectModel_Interfaces.png:1151-1173 Modified: trunk/src/site/rst/01-introduction.rst =================================================================== --- trunk/src/site/rst/01-introduction.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/01-introduction.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +============ Introduction ============ @@ -86,7 +88,7 @@ | | | | | | Output | | | Generator | Independence | Build | Plugin | format | +=========+======================+============================+==============+=========+========+ -| EUGene | java template | Development tools | Maven/Ant | Eclipse | All | +| EUGene | java template | Development tools | Maven | Eclipse | All | +---------+----------------------+----------------------------+--------------+---------+--------+ | Acceleo | specific template | Linked to Eclipse platform | Not possible | Eclipse | All | +---------+----------------------+----------------------------+--------------+---------+--------+ Modified: trunk/src/site/rst/02-objectmodel.rst =================================================================== --- trunk/src/site/rst/02-objectmodel.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/02-objectmodel.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + =========== ObjectModel =========== Modified: trunk/src/site/rst/03-generation.rst =================================================================== --- trunk/src/site/rst/03-generation.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/03-generation.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +================== Generation process ================== Modified: trunk/src/site/rst/04-templates.rst =================================================================== --- trunk/src/site/rst/04-templates.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/04-templates.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +========= Templates ========= Modified: trunk/src/site/rst/05-execution.rst.vm =================================================================== --- trunk/src/site/rst/05-execution.rst.vm 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/05-execution.rst.vm 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ========= Execution ========= @@ -37,8 +38,10 @@ Ant --- -See documentation in `ant module`_. +This module was removed since version 2.5. +::See documentation in `ant module`_. + Maven ----- @@ -58,4 +61,4 @@ files using the maven plugin. See `plugin documentation and examples`_ . .. _plugin documentation and examples: eugene-maven-plugin/example.html -.. _ant module: ant-eugene-task/ +::.. _ant module: ant-eugene-task/ Modified: trunk/src/site/rst/06-fonctionnalites-avancees.rst =================================================================== --- trunk/src/site/rst/06-fonctionnalites-avancees.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/06-fonctionnalites-avancees.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,8 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======================== Advanced functionalities ======================== @@ -147,9 +149,9 @@ use those constants in the generated code. So the constant's name calculation from a property come quite often and is cached by this extension. -.. _ArgoUML: http://argouml.tigris.org/ -.. _TopCased: http://www.topcased.org/ -.. _Templates: 04-templates.html +.. _argouml: http://argouml.tigris.org/ +.. _topcased: http://www.topcased.org/ +.. _Templates: ./04-templates.html .. _Ref ModelReader: eugene/apidocs/org/nuiton/eugene/ModelReader.html .. _ObjectModelReader: eugene/apidocs/org/nuiton/eugene/models/object/ObjectModelReader.html Modified: trunk/src/site/rst/07-glossaire.rst =================================================================== --- trunk/src/site/rst/07-glossaire.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/07-glossaire.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,13 +22,15 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + +======== Glossary ======== MDA --- -**M**odel **D**riven **A**rchitecture : programming technique based on models. +Model Driven Architecture : programming technique based on models. Refs : `MDA`_ , `Introduction EUGene`_ @@ -38,7 +40,7 @@ UML --- -**U**nified **M**odeling **L**anguage : modeling language. +Unified Modeling Language : modeling language. Refs : `UML official website`_ , `ObjectModel EUGene`_ @@ -48,7 +50,7 @@ XMI --- -**X**ML **M**etadata **I**nterchange : XML norm for UML language. +XML Metadata Interchange : XML norm for UML language. Refs : `XMI official website`_ , `ObjectModel EUGene`_ Modified: trunk/src/site/rst/08-FAQ.rst =================================================================== --- trunk/src/site/rst/08-FAQ.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/08-FAQ.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + === FAQ === Modified: trunk/src/site/rst/09-tutoriel-index.rst =================================================================== --- trunk/src/site/rst/09-tutoriel-index.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/09-tutoriel-index.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============== Tutoriel index ============== Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/rst/index.rst 2012-08-17 08:44:36 UTC (rev 1174) @@ -22,11 +22,12 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ====== EUGene ====== -**E**fficient **U**niversal **Gene**rator +Efficient Universal GENErator You will find in this documentation : Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/site_en.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -26,101 +26,110 @@ <project name="${project.name}"> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.2</version> + </skin> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> - <publishDate position="right" /> - <version position="right" /> + <publishDate position="right"/> + <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/logos/restructuredtext-logo.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" + img="${project.url}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="${project.url}/images/logos/restructuredtext-logo.png"/> + </poweredBy> - <body> - - <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/index.html" /> - </breadcrumbs> + <body> - <links> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - </links> + <breadcrumbs> + <item name="${project.name}" + href="http://maven-site.nuiton.org/eugene/index.html"/> + </breadcrumbs> - <menu name="Documentation"> - <item name="French version" href="fr/index.html" /> - <item name="Home" href="index.html" /> - <item name="Introduction" href="01-introduction.html" /> - <item name="ObjectModel" href="02-objectmodel.html" /> - <item name="Generation process" href="03-generation.html" /> - <item name="Templates" href="04-templates.html" /> - <item name="Execution" href="05-execution.html" /> - <item name="Advanced functionalities" href="06-fonctionnalites-avancees.html" /> - <item name="Glossary" href="07-glossaire.html" /> - <item name="FAQ" href="08-FAQ.html" /> - </menu> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> - <menu name="Project"> - <item name="Home" href="http://nuiton.org/projects/show/eugene" /> - <item name="Download" href="http://nuiton.org/projects/eugene/files" /> - <item name="Trackers" href="http://nuiton.org/projects/eugene/issues" /> - </menu> + <links> + <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> - <menu name="Links"> - <item name="Nuiton-processor" href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> - <item name="ArgoUML" href="http://argouml.tigris.org/"/> - <item name="UML" href="http://www.uml.org/"/> - <item name="XMI" href="http://www.omg.org/spec/XMI/"/> - </menu> - - <menu ref="modules"/> + <menu name="Documentation"> + <item name="French version" href="fr/index.html"/> + <item name="Home" href="index.html"/> + <item name="Introduction" href="01-introduction.html"/> + <item name="ObjectModel" href="02-objectmodel.html"/> + <item name="Generation process" href="03-generation.html"/> + <item name="Templates" href="04-templates.html"/> + <item name="Execution" href="05-execution.html"/> + <item name="Advanced functionalities" + href="06-fonctionnalites-avancees.html"/> + <item name="Glossary" href="07-glossaire.html"/> + <item name="FAQ" href="08-FAQ.html"/> + </menu> - <menu ref="reports"/> + <menu name="Project"> + <item name="Home" href="http://nuiton.org/projects/show/eugene"/> + <item name="Download" href="http://nuiton.org/projects/eugene/files"/> + <item name="Trackers" href="http://nuiton.org/projects/eugene/issues"/> + </menu> - <footer> + <menu name="Links"> + <item name="Nuiton-processor" + href="http://maven-site.nuiton.org/processor"/> + <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + <item name="ArgoUML" href="http://argouml.tigris.org/"/> + <item name="UML" href="http://www.uml.org/"/> + <item name="XMI" href="http://www.omg.org/spec/XMI/"/> + </menu> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu ref="modules"/> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - </body> + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-17 07:59:47 UTC (rev 1173) +++ trunk/src/site/site_fr.xml 2012-08-17 08:44:36 UTC (rev 1174) @@ -26,107 +26,117 @@ <project name="${project.name}"> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.2</version> + </skin> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> - <publishDate position="right" /> - <version position="right" /> + <publishDate position="right"/> + <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="${project.url}/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/logos/restructuredtext-logo.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" + img="${project.url}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="${project.url}/images/logos/restructuredtext-logo.png"/> + </poweredBy> - <body> - - <breadcrumbs> - <item name="${project.name}" href="http://maven-site.nuiton.org/eugene/index.html" /> - </breadcrumbs> + <body> - <links> - <item name="Nuiton.org" href="http://nuiton.org"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> + <breadcrumbs> + <item name="${project.name}" + href="http://maven-site.nuiton.org/eugene/index.html"/> + </breadcrumbs> - <menu name="Documentation"> - <item name="English version" href="../index.html" /> - <item name="Accueil" href="index.html" /> - <item name="Introduction" href="01-introduction.html" /> - <item name="ObjectModel" href="02-objectmodel.html" /> - <item name="Processus de génération" href="03-generation.html" /> - <item name="Templates" href="04-templates.html" /> - <item name="Execution" href="05-execution.html" /> - <item name="Fonctionnalités avancées" href="06-fonctionnalites-avancees.html" /> - <item name="Glossaire" href="07-glossaire.html" /> - <item name="FAQ" href="08-FAQ.html" /> - </menu> + <head> + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + </head> - <menu name="Projet"> - <item name="Accueil" href="http://nuiton.org/projects/show/eugene" /> - <item name="Téléchargement" href="http://nuiton.org/projects/eugene/files" /> - <item name="Trackers" href="http://nuiton.org/projects/eugene/issues" /> - </menu> + <links> + <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> - <menu name="Liens"> - <item name="Nuiton-processor" href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> - <item name="ArgoUML" href="http://argouml.tigris.org/"/> - <item name="UML" href="http://www.uml.org/"/> - <item name="XMI" href="http://www.omg.org/spec/XMI/"/> - </menu> + <menu name="Documentation"> + <item name="English version" href="../index.html"/> + <item name="Accueil" href="index.html"/> + <item name="Introduction" href="01-introduction.html"/> + <item name="ObjectModel" href="02-objectmodel.html"/> + <item name="Processus de génération" href="03-generation.html"/> + <item name="Templates" href="04-templates.html"/> + <item name="Execution" href="05-execution.html"/> + <item name="Fonctionnalités avancées" + href="06-fonctionnalites-avancees.html"/> + <item name="Glossaire" href="07-glossaire.html"/> + <item name="FAQ" href="08-FAQ.html"/> + </menu> -  - <menu ref="modules"/> -  -  -  -  -  + <menu name="Projet"> + <item name="Accueil" href="http://nuiton.org/projects/show/eugene"/> + <item name="Téléchargement" + href="http://nuiton.org/projects/eugene/files"/> + <item name="Trackers" href="http://nuiton.org/projects/eugene/issues"/> + </menu> - <menu ref="reports"/> + <menu name="Liens"> + <item name="Nuiton-processor" + href="http://maven-site.nuiton.org/processor"/> + <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + <item name="ArgoUML" href="http://argouml.tigris.org/"/> + <item name="UML" href="http://www.uml.org/"/> + <item name="XMI" href="http://www.omg.org/spec/XMI/"/> + </menu> - <footer> +  + <menu ref="modules"/> +  +  +  +  +  - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> + <menu ref="reports"/> - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - </body> + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>

1 0

r1173 - in branches/eugene-2.4.3: . eugene eugene-maven-plugin
by maven-release＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: maven-release Date: 2012-08-17 09:59:47 +0200 (Fri, 17 Aug 2012) New Revision: 1173 Url: http://nuiton.org/repositories/revision/eugene/1173 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/eugene-2.4.3/eugene-maven-plugin/pom.xml branches/eugene-2.4.3/eugene/pom.xml branches/eugene-2.4.3/pom.xml Modified: branches/eugene-2.4.3/eugene/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene/pom.xml 2012-08-17 07:59:45 UTC (rev 1172) +++ branches/eugene-2.4.3/eugene/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.4.3/eugene-maven-plugin/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/pom.xml 2012-08-17 07:59:45 UTC (rev 1172) +++ branches/eugene-2.4.3/eugene-maven-plugin/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.4.3/pom.xml =================================================================== --- branches/eugene-2.4.3/pom.xml 2012-08-17 07:59:45 UTC (rev 1172) +++ branches/eugene-2.4.3/pom.xml 2012-08-17 07:59:47 UTC (rev 1173) @@ -36,7 +36,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.5</version> + <version>2.6-SNAPSHOT</version> <modules> <module>eugene</module> @@ -467,11 +467,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.5</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/branches/eugene-2.4.3</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.5 + scm:svn:http://svn.nuiton.org/svn/eugene/branches/eugene-2.4.3 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.5</url> + <url>http://www.nuiton.org/repositories/browse/eugene/branches/eugene-2.4.3</url> </scm> <distributionManagement>

1 0

r1172 - in tags: . eugene-2.5
by maven-release＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: maven-release Date: 2012-08-17 09:59:45 +0200 (Fri, 17 Aug 2012) New Revision: 1172 Url: http://nuiton.org/repositories/revision/eugene/1172 Log: [maven-release-plugin] copy for tag eugene-2.5 Added: tags/eugene-2.5/ Property changes on: tags/eugene-2.5 ___________________________________________________________________ Added: svn:ignore + target .settings bin .classpath .project *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/1.0.1-Javabuilder:641-651 /branches/1.1.0-Javabuilder:652-681 /branches/eugene-2.0:682-754

1 0

r1171 - in branches/eugene-2.4.3: . eugene eugene-maven-plugin
by maven-release＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: maven-release Date: 2012-08-17 09:59:43 +0200 (Fri, 17 Aug 2012) New Revision: 1171 Url: http://nuiton.org/repositories/revision/eugene/1171 Log: [maven-release-plugin] prepare release eugene-2.5 Modified: branches/eugene-2.4.3/eugene-maven-plugin/pom.xml branches/eugene-2.4.3/eugene/pom.xml branches/eugene-2.4.3/pom.xml Modified: branches/eugene-2.4.3/eugene/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene/pom.xml 2012-08-17 07:56:56 UTC (rev 1170) +++ branches/eugene-2.4.3/eugene/pom.xml 2012-08-17 07:59:43 UTC (rev 1171) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.4.3/eugene-maven-plugin/pom.xml =================================================================== --- branches/eugene-2.4.3/eugene-maven-plugin/pom.xml 2012-08-17 07:56:56 UTC (rev 1170) +++ branches/eugene-2.4.3/eugene-maven-plugin/pom.xml 2012-08-17 07:59:43 UTC (rev 1171) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: branches/eugene-2.4.3/pom.xml =================================================================== --- branches/eugene-2.4.3/pom.xml 2012-08-17 07:56:56 UTC (rev 1170) +++ branches/eugene-2.4.3/pom.xml 2012-08-17 07:59:43 UTC (rev 1171) @@ -36,7 +36,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5</version> <modules> <module>eugene</module> @@ -467,11 +467,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/branches/eugene-2.4.3</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.5</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/branches/eugene-2.4.3 + scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.5 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/branches/eugene-2.4.3</url> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.5</url> </scm> <distributionManagement>

1 0

r1170 - branches/eugene-2.4.3
by maven-release＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: maven-release Date: 2012-08-17 09:56:56 +0200 (Fri, 17 Aug 2012) New Revision: 1170 Url: http://nuiton.org/repositories/revision/eugene/1170 Log: fix scm Modified: branches/eugene-2.4.3/pom.xml Modified: branches/eugene-2.4.3/pom.xml =================================================================== --- branches/eugene-2.4.3/pom.xml 2012-08-17 07:55:45 UTC (rev 1169) +++ branches/eugene-2.4.3/pom.xml 2012-08-17 07:56:56 UTC (rev 1170) @@ -467,11 +467,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/branches/eugene-2.4.3</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:http://svn.nuiton.org/svn/eugene/branches/eugene-2.4.3 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <url>http://www.nuiton.org/repositories/browse/eugene/branches/eugene-2.4.3</url> </scm> <distributionManagement>

1 0

r1169 - tags
by maven-release＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: maven-release Date: 2012-08-17 09:55:45 +0200 (Fri, 17 Aug 2012) New Revision: 1169 Url: http://nuiton.org/repositories/revision/eugene/1169 Log: bad release tag Removed: tags/eugene-2.5/

1 0