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

r1145 - in trunk: . src/site/rst
by tchemit＠users.nuiton.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 10:32:18 +0200 (Mon, 28 May 2012) New Revision: 1145 Url: http://nuiton.org/repositories/revision/eugene/1145 Log: updates some libs fixes site links Modified: trunk/pom.xml trunk/src/site/rst/index.rst Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 08:19:42 UTC (rev 1144) +++ trunk/pom.xml 2012-05-28 08:32:18 UTC (rev 1145) @@ -72,7 +72,7 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> + <version>2.10.0</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -111,14 +111,14 @@ <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - <version>1.0.b2</version> + <version>1.4.01</version> </dependency>  <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> - <version>1.1.1</version> + <version>1.1.3</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -374,9 +374,13 @@ <projectId>eugene</projectId> <processorPluginVersion>1.2.1</processorPluginVersion> - <nuitonUtilsVersion>2.3</nuitonUtilsVersion> - <nuitonI18nVersion>2.3.2</nuitonI18nVersion> + <nuitonUtilsVersion>2.4</nuitonUtilsVersion> + <nuitonI18nVersion>2.4</nuitonI18nVersion> + +  + <antVersion>1.8.3</antVersion> +  <locales>en,fr</locales> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-05-28 08:19:42 UTC (rev 1144) +++ trunk/src/site/rst/index.rst 2012-05-28 08:32:18 UTC (rev 1145) @@ -56,9 +56,9 @@ * `ant-eugene-task`_ * `maven-eugene-plugin`_ -.. _eugene-api: eugene/fr/index.html -.. _ant-eugene-task: ant-eugene-task/fr/index.html -.. _maven-eugene-plugin: maven-eugene-plugin/fr/index.html +.. _eugene-api: eugene/index.html +.. _ant-eugene-task: ant-eugene-task/index.html +.. _maven-eugene-plugin: maven-eugene-plugin/index.html More info on the project on `nuiton's forge`_ .

1 0

r1144 - in trunk: . ant-eugene-task/src/site eugene/src/site maven-eugene-plugin/src/site src/site src/site/resources src/site/resources/images src/site/resources/images/logos
by tchemit＠users.nuiton.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 10:19:42 +0200 (Mon, 28 May 2012) New Revision: 1144 Url: http://nuiton.org/repositories/revision/eugene/1144 Log: fixes T?\195?\162che #2109: Updates to mavenpom 3.3.2 fixes T?\195?\162che #2110: Migrate site to fluido Added: trunk/src/site/resources/images/ trunk/src/site/resources/images/logos/ trunk/src/site/resources/images/logos/jrst-logo.png trunk/src/site/resources/images/logos/restructuredtext-logo.png Modified: trunk/ant-eugene-task/src/site/site_en.xml trunk/ant-eugene-task/src/site/site_fr.xml trunk/eugene/src/site/site_en.xml trunk/eugene/src/site/site_fr.xml trunk/maven-eugene-plugin/src/site/site_en.xml trunk/maven-eugene-plugin/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/ant-eugene-task/src/site/site_en.xml =================================================================== --- trunk/ant-eugene-task/src/site/site_en.xml 2012-05-23 12:44:33 UTC (rev 1143) +++ trunk/ant-eugene-task/src/site/site_en.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -70,5 +70,23 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project> Modified: trunk/ant-eugene-task/src/site/site_fr.xml =================================================================== --- trunk/ant-eugene-task/src/site/site_fr.xml 2012-05-23 12:44:33 UTC (rev 1143) +++ trunk/ant-eugene-task/src/site/site_fr.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -74,5 +74,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + 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_en.xml =================================================================== --- trunk/eugene/src/site/site_en.xml 2012-05-23 12:44:33 UTC (rev 1143) +++ trunk/eugene/src/site/site_en.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -71,5 +71,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + 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-05-23 12:44:33 UTC (rev 1143) +++ trunk/eugene/src/site/site_fr.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -83,5 +83,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/maven-eugene-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_en.xml 2012-05-23 12:44:33 UTC (rev 1143) +++ trunk/maven-eugene-plugin/src/site/site_en.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -70,5 +70,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/maven-eugene-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-eugene-plugin/src/site/site_fr.xml 2012-05-23 12:44:33 UTC (rev 1143) +++ trunk/maven-eugene-plugin/src/site/site_fr.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -74,5 +74,24 @@ <menu ref="reports"/> + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-23 12:44:33 UTC (rev 1143) +++ trunk/pom.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.2</version> + <version>3.3.2</version> </parent> <artifactId>eugene</artifactId> @@ -464,6 +464,35 @@ </property> </activation> + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + <build> <plugins> <plugin> Added: trunk/src/site/resources/images/logos/jrst-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/jrst-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/images/logos/restructuredtext-logo.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/images/logos/restructuredtext-logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-05-23 12:44:33 UTC (rev 1143) +++ trunk/src/site/site_en.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -26,11 +26,35 @@ <project name="${project.name}"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + <bannerLeft> <name>${project.name}</name> - <href>/</href> + <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <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/jrst-logo.png"/> @@ -77,5 +101,24 @@ <menu ref="modules"/> <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + 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-05-23 12:44:33 UTC (rev 1143) +++ trunk/src/site/site_fr.xml 2012-05-28 08:19:42 UTC (rev 1144) @@ -26,11 +26,35 @@ <project name="${project.name}"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + <bannerLeft> <name>${project.name}</name> - <href>/</href> + <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <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/jrst-logo.png"/> @@ -83,5 +107,24 @@ </menu> <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project>

1 0

r1143 - trunk/eugene/src/main/java/org/nuiton/eugene
by tchemit＠users.nuiton.org May 23, 2012

May 23, 2012

Author: tchemit Date: 2012-05-23 14:44:33 +0200 (Wed, 23 May 2012) New Revision: 1143 Url: http://nuiton.org/repositories/revision/eugene/1143 Log: fixes #2102: Execution of maven plugin are not well isolated Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2012-05-11 09:21:27 UTC (rev 1142) +++ trunk/eugene/src/main/java/org/nuiton/eugene/Transformer.java 2012-05-23 12:44:33 UTC (rev 1143) @@ -94,7 +94,8 @@ // build output template configuration // merge input configuration + output properties - Properties properties = getConfiguration().getProperties(); + Properties properties = + new Properties(getConfiguration().getProperties()); properties.putAll(getOutputProperties()); TemplateConfiguration outconfig =

1 0

r1142 - in trunk: maven-eugene-plugin/src/site/fr/rst src/site/fr/rst src/site/rst
by ymartel＠users.nuiton.org May 11, 2012

May 11, 2012

Author: ymartel Date: 2012-05-11 11:21:27 +0200 (Fri, 11 May 2012) New Revision: 1142 Url: http://nuiton.org/repositories/revision/eugene/1142 Log: add some doc around zargo file renaming Modified: trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst trunk/src/site/fr/rst/08-FAQ.rst trunk/src/site/rst/08-FAQ.rst Modified: trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst =================================================================== --- trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst 2012-03-29 09:46:06 UTC (rev 1141) +++ trunk/maven-eugene-plugin/src/site/fr/rst/usage.rst 2012-05-11 09:21:27 UTC (rev 1142) @@ -243,7 +243,7 @@ Phase zargo ~~~~~~~~~~~ -This phase permits to take some zargo files to extract form them the xmi files. +Cette phase permet de prendre des fichiers zargo pour en extraire les fichiers xmi. Example: Modified: trunk/src/site/fr/rst/08-FAQ.rst =================================================================== --- trunk/src/site/fr/rst/08-FAQ.rst 2012-03-29 09:46:06 UTC (rev 1141) +++ trunk/src/site/fr/rst/08-FAQ.rst 2012-05-11 09:21:27 UTC (rev 1142) @@ -78,3 +78,13 @@ .. _ToPIA: http://nuiton.org/projects/show/topia .. _maven-eugene-plugin: ../maven-eugene-plugin/fr/index.html + +Pourquoi la génération ne marche plus après renommage des fichiers .zargo et properties +======================================================================================= + +Lorsque l'on renomme les fichiers .zargo et .properties correspondant, les +propriétés peuvent ne plus être prises en compte lors de la génération. En fait, +le fichier .zargo est une archive qui contient plusieurs fichiers dont le +fichier .xmi utilisé par la génération. Ce fichier n'est pas renommé avec le +fichier .zargo et il est donc nécessaire d'éditer le fichier .zargo afin de +synchroniser les noms de fichier qu'il contient. \ No newline at end of file Modified: trunk/src/site/rst/08-FAQ.rst =================================================================== --- trunk/src/site/rst/08-FAQ.rst 2012-03-29 09:46:06 UTC (rev 1141) +++ trunk/src/site/rst/08-FAQ.rst 2012-05-11 09:21:27 UTC (rev 1142) @@ -81,3 +81,11 @@ .. _ToPIA: http://nuiton.org/projects/show/topia .. _maven-eugene-plugin: maven-eugene-plugin/index.html + +Why properties are not taken during generation after renomming .zargo file ? +============================================================================ + +The .zargo file is an archive that contains some files, including .xmi file that +is used in the xmi phase after zargo phase. But when we change .zargo file name, +those included files are not renamed. The .zargo file must be edited to +synchronized all its included files. \ No newline at end of file

1 0

r1141 - trunk
by tchemit＠users.nuiton.org March 29, 2012

March 29, 2012

Author: tchemit Date: 2012-03-29 11:46:06 +0200 (Thu, 29 Mar 2012) New Revision: 1141 Url: http://nuiton.org/repositories/revision/eugene/1141 Log: updates to mavenpom 3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-03 11:20:07 UTC (rev 1140) +++ trunk/pom.xml 2012-03-29 09:46:06 UTC (rev 1141) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <artifactId>eugene</artifactId>

1 0

r1140 - in trunk/eugene/src: main/java/org/nuiton/eugene/models/object/xml test/java/org/nuiton/eugene/models/object
by bpoussin＠users.nuiton.org March 3, 2012

March 3, 2012

Author: bpoussin Date: 2012-03-03 12:20:07 +0100 (Sat, 03 Mar 2012) New Revision: 1140 Url: http://nuiton.org/repositories/revision/eugene/1140 Log: On revient en arriere en fait unique peut tres bien etre toujours true, il faut juste faire attention que cela n'impacte que les collections Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2012-03-03 10:45:35 UTC (rev 1139) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2012-03-03 11:20:07 UTC (rev 1140) @@ -46,9 +46,12 @@ // protected String ordering = "unspecified"; /** - * default value is false since version 2.4.3 + * Unique n'est utile que pour les collections pour indiquer que la + * collection ne peut prendre qu'une valeur identique (Set) si unique + * est false la collection peut prendre plusieurs fois la meme valeur + * (List) */ - protected boolean unique = false; + protected boolean unique = true; protected boolean ordered; protected String defaultValue; Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2012-03-03 10:45:35 UTC (rev 1139) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2012-03-03 11:20:07 UTC (rev 1140) @@ -342,7 +342,7 @@ assertEquals("String", strings.getType()); assertEquals(1, strings.getMinMultiplicity()); assertEquals(-1, strings.getMaxMultiplicity()); - assertFalse(strings.isUnique()); + assertTrue(strings.isUnique()); assertFalse(strings.isOrdered()); // doubles @@ -351,7 +351,7 @@ assertEquals("org.nuiton.eugene.test21.double", doubles.getType()); assertEquals(1, doubles.getMinMultiplicity()); assertEquals(5, doubles.getMaxMultiplicity()); - assertFalse(doubles.isUnique()); + assertTrue(doubles.isUnique()); assertTrue(doubles.isOrdered()); // dataTypes @@ -371,7 +371,7 @@ assertEquals("String", op.getReturnParameter().getType()); assertEquals(1, op.getReturnParameter().getMinMultiplicity()); assertEquals(-1, op.getReturnParameter().getMaxMultiplicity()); - assertFalse(op.getReturnParameter().isUnique()); + assertTrue(op.getReturnParameter().isUnique()); assertTrue(op.getReturnParameter().isOrdered()); @@ -394,7 +394,7 @@ assertEquals("org.nuiton.eugene.test21.DataType1", op.getReturnParameter().getType()); assertEquals(0, op.getReturnParameter().getMinMultiplicity()); assertEquals(-1, op.getReturnParameter().getMaxMultiplicity()); - assertFalse(op.getReturnParameter().isUnique()); + assertTrue(op.getReturnParameter().isUnique()); assertFalse(op.getReturnParameter().isOrdered()); // addAndGetAll @@ -405,7 +405,7 @@ assertEquals("org.nuiton.eugene.test21.DataType1", op.getReturnParameter().getType()); assertEquals(3, op.getReturnParameter().getMinMultiplicity()); assertEquals(19, op.getReturnParameter().getMaxMultiplicity()); - assertFalse(op.getReturnParameter().isUnique()); + assertTrue(op.getReturnParameter().isUnique()); assertFalse(op.getReturnParameter().isOrdered()); // param strings @@ -414,7 +414,7 @@ assertEquals("String", param.getType()); assertEquals(1, param.getMinMultiplicity()); assertEquals(-1, param.getMaxMultiplicity()); - assertFalse(param.isUnique()); + assertTrue(param.isUnique()); assertFalse(param.isOrdered()); // param doubles @@ -423,7 +423,7 @@ assertEquals("org.nuiton.eugene.test21.double", param.getType()); assertEquals(5, param.getMinMultiplicity()); assertEquals(-1, param.getMaxMultiplicity()); - assertFalse(param.isUnique()); + assertTrue(param.isUnique()); assertTrue(param.isOrdered()); // param dataTypes

1 0

r1139 - trunk/eugene/src/test/java/org/nuiton/eugene/models/object
by bpoussin＠users.nuiton.org March 3, 2012

March 3, 2012

Author: bpoussin Date: 2012-03-03 11:45:35 +0100 (Sat, 03 Mar 2012) New Revision: 1139 Url: http://nuiton.org/repositories/revision/eugene/1139 Log: Change test after change default value of unique Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2012-03-03 10:37:30 UTC (rev 1138) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2012-03-03 10:45:35 UTC (rev 1139) @@ -342,7 +342,7 @@ assertEquals("String", strings.getType()); assertEquals(1, strings.getMinMultiplicity()); assertEquals(-1, strings.getMaxMultiplicity()); - assertTrue(strings.isUnique()); + assertFalse(strings.isUnique()); assertFalse(strings.isOrdered()); // doubles @@ -351,7 +351,7 @@ assertEquals("org.nuiton.eugene.test21.double", doubles.getType()); assertEquals(1, doubles.getMinMultiplicity()); assertEquals(5, doubles.getMaxMultiplicity()); - assertTrue(doubles.isUnique()); + assertFalse(doubles.isUnique()); assertTrue(doubles.isOrdered()); // dataTypes @@ -371,7 +371,7 @@ assertEquals("String", op.getReturnParameter().getType()); assertEquals(1, op.getReturnParameter().getMinMultiplicity()); assertEquals(-1, op.getReturnParameter().getMaxMultiplicity()); - assertTrue(op.getReturnParameter().isUnique()); + assertFalse(op.getReturnParameter().isUnique()); assertTrue(op.getReturnParameter().isOrdered()); @@ -394,7 +394,7 @@ assertEquals("org.nuiton.eugene.test21.DataType1", op.getReturnParameter().getType()); assertEquals(0, op.getReturnParameter().getMinMultiplicity()); assertEquals(-1, op.getReturnParameter().getMaxMultiplicity()); - assertTrue(op.getReturnParameter().isUnique()); + assertFalse(op.getReturnParameter().isUnique()); assertFalse(op.getReturnParameter().isOrdered()); // addAndGetAll @@ -405,7 +405,7 @@ assertEquals("org.nuiton.eugene.test21.DataType1", op.getReturnParameter().getType()); assertEquals(3, op.getReturnParameter().getMinMultiplicity()); assertEquals(19, op.getReturnParameter().getMaxMultiplicity()); - assertTrue(op.getReturnParameter().isUnique()); + assertFalse(op.getReturnParameter().isUnique()); assertFalse(op.getReturnParameter().isOrdered()); // param strings @@ -414,7 +414,7 @@ assertEquals("String", param.getType()); assertEquals(1, param.getMinMultiplicity()); assertEquals(-1, param.getMaxMultiplicity()); - assertTrue(param.isUnique()); + assertFalse(param.isUnique()); assertFalse(param.isOrdered()); // param doubles @@ -423,7 +423,7 @@ assertEquals("org.nuiton.eugene.test21.double", param.getType()); assertEquals(5, param.getMinMultiplicity()); assertEquals(-1, param.getMaxMultiplicity()); - assertTrue(param.isUnique()); + assertFalse(param.isUnique()); assertTrue(param.isOrdered()); // param dataTypes

1 0

r1138 - trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml
by bpoussin＠users.nuiton.org March 3, 2012

March 3, 2012

Author: bpoussin Date: 2012-03-03 11:37:30 +0100 (Sat, 03 Mar 2012) New Revision: 1138 Url: http://nuiton.org/repositories/revision/eugene/1138 Log: change unique default value to false ATTENTION check that modification don't change anything in your project generation Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2012-02-29 13:01:57 UTC (rev 1137) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelParameterImpl.java 2012-03-03 10:37:30 UTC (rev 1138) @@ -46,9 +46,9 @@ // protected String ordering = "unspecified"; /** - * FIXME tchemit 2010-11-28 Why the default value is true ? + * default value is false since version 2.4.3 */ - protected boolean unique = true; + protected boolean unique = false; protected boolean ordered; protected String defaultValue;

1 0

r1137 - in trunk: . maven-eugene-plugin
by tchemit＠users.nuiton.org Feb. 29, 2012

Feb. 29, 2012

Author: tchemit Date: 2012-02-29 14:01:57 +0100 (Wed, 29 Feb 2012) New Revision: 1137 Url: http://nuiton.org/repositories/revision/eugene/1137 Log: updates to helper-m-p Modified: trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2012-02-29 12:51:33 UTC (rev 1136) +++ trunk/maven-eugene-plugin/pom.xml 2012-02-29 13:01:57 UTC (rev 1137) @@ -102,7 +102,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> </dependency> <dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-29 12:51:33 UTC (rev 1136) +++ trunk/pom.xml 2012-02-29 13:01:57 UTC (rev 1137) @@ -152,7 +152,7 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <version>${helperPluginVersion}</version> <exclusions> <exclusion>

1 0

r1136 - trunk
by tchemit＠users.nuiton.org Feb. 29, 2012

Feb. 29, 2012

Author: tchemit Date: 2012-02-29 13:51:33 +0100 (Wed, 29 Feb 2012) New Revision: 1136 Url: http://nuiton.org/repositories/revision/eugene/1136 Log: updates to mavenpom 3.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-22 13:56:12 UTC (rev 1135) +++ trunk/pom.xml 2012-02-29 12:51:33 UTC (rev 1136) @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.7</version> + <version>3.1.1</version> </parent> <artifactId>eugene</artifactId>

1 0