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

r945 - trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer
by tchemit＠users.nuiton.org Aug. 7, 2010

Aug. 7, 2010

Author: tchemit Date: 2010-08-07 16:12:40 +0200 (Sat, 07 Aug 2010) New Revision: 945 Url: http://nuiton.org/repositories/revision/eugene/945 Log: Anomalie #801: NPE when no model found Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-07-19 06:33:20 UTC (rev 944) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ModelChainedFileWriter.java 2010-08-07 14:12:40 UTC (rev 945) @@ -293,6 +293,12 @@ } List<File> currentFiles = PluginHelper.getIncludedFiles( srcDirGen, includePatterns, null); + + if (currentFiles.isEmpty()) { + getLog().info("No model to use."); + return; + } + if (currentFiles.size() == 1) { getLog().info("Using one model :"); } else {

1 0

r944 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org July 19, 2010

July 19, 2010

Author: tchemit Date: 2010-07-19 08:33:20 +0200 (Mon, 19 Jul 2010) New Revision: 944 Url: http://nuiton.org/repositories/revision/eugene/944 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-07-19 06:33:18 UTC (rev 943) +++ trunk/ant-eugene-task/pom.xml 2010-07-19 06:33:20 UTC (rev 944) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-07-19 06:33:18 UTC (rev 943) +++ trunk/eugene/pom.xml 2010-07-19 06:33:20 UTC (rev 944) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-07-19 06:33:18 UTC (rev 943) +++ trunk/maven-eugene-plugin/pom.xml 2010-07-19 06:33:20 UTC (rev 944) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-19 06:33:18 UTC (rev 943) +++ trunk/pom.xml 2010-07-19 06:33:20 UTC (rev 944) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.1.1</version> + <version>2.1.2-SNAPSHOT</version> <modules> <module>eugene</module> @@ -321,9 +321,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.1.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> </project>

1 0

r943 - in tags: . eugene-2.1.1
by tchemit＠users.nuiton.org July 19, 2010

July 19, 2010

Author: tchemit Date: 2010-07-19 08:33:18 +0200 (Mon, 19 Jul 2010) New Revision: 943 Url: http://nuiton.org/repositories/revision/eugene/943 Log: [maven-release-plugin] copy for tag eugene-2.1.1 Added: tags/eugene-2.1.1/ Property changes on: tags/eugene-2.1.1 ___________________________________________________________________ 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

r942 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org July 19, 2010

July 19, 2010

Author: tchemit Date: 2010-07-19 08:33:16 +0200 (Mon, 19 Jul 2010) New Revision: 942 Url: http://nuiton.org/repositories/revision/eugene/942 Log: [maven-release-plugin] prepare release eugene-2.1.1 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-07-18 11:27:53 UTC (rev 941) +++ trunk/ant-eugene-task/pom.xml 2010-07-19 06:33:16 UTC (rev 942) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-07-18 11:27:53 UTC (rev 941) +++ trunk/eugene/pom.xml 2010-07-19 06:33:16 UTC (rev 942) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-07-18 11:27:53 UTC (rev 941) +++ trunk/maven-eugene-plugin/pom.xml 2010-07-19 06:33:16 UTC (rev 942) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-18 11:27:53 UTC (rev 941) +++ trunk/pom.xml 2010-07-19 06:33:16 UTC (rev 942) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> <modules> <module>eugene</module> @@ -321,9 +321,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.1.1</url> </scm> </project>

1 0

r941 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org July 18, 2010

July 18, 2010

Author: tchemit Date: 2010-07-18 13:27:53 +0200 (Sun, 18 Jul 2010) New Revision: 941 Url: http://nuiton.org/repositories/revision/eugene/941 Log: Anomalie #772: No enumeration generated Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-07-09 08:14:13 UTC (rev 940) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java 2010-07-18 11:27:53 UTC (rev 941) @@ -236,6 +236,11 @@ } } + public void generateFromEnumeration(Writer output, + ObjectModelEnumeration input) throws IOException { + //FIXME tchemit 20100718 I don't understand why having two methods FromEnum and FromEnumeration ? + generateFromEnum(output, input); + } @Override public void generateFromEnum(Writer output, ObjectModelEnumeration input) throws IOException {

1 0

r940 - in trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin: . writer
by echatellier＠users.nuiton.org July 9, 2010

July 9, 2010

Author: echatellier Date: 2010-07-09 10:14:13 +0200 (Fri, 09 Jul 2010) New Revision: 940 Url: http://nuiton.org/repositories/revision/eugene/940 Log: Restore extractedPackages Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2010-07-08 08:10:40 UTC (rev 939) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2010-07-09 08:14:13 UTC (rev 940) @@ -235,7 +235,7 @@ protected String[] excludeTemplates; /** - * Nom par défaut du paquetage généré (model input sepcific). + * 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 @@ -243,7 +243,7 @@ protected String defaultPackage; /** - * List of packages to generate (comma separated). (model input sepcific). + * List of packages to generate (comma separated). (model input specific). * <p/> * If the parameter is not filled, will generate all packages. * @@ -251,6 +251,16 @@ * @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. @@ -386,7 +396,7 @@ properties.put(XmiChainedFileWriter.PROP_FULL_PACKAGE_PATH, fullPackagePath); - //properties.put("extractedPackages", extractedPackages); + properties.put(XmiChainedFileWriter.PROP_EXTRACTED_PACKAGES, extractedPackages); properties.put(XmiChainedFileWriter.PROP_RESOLVER, resolver); } Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java 2010-07-08 08:10:40 UTC (rev 939) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java 2010-07-09 08:14:13 UTC (rev 940) @@ -68,11 +68,15 @@ public static final String PROP_FULL_PACKAGE_PATH = "fullPackagePath"; + public static final String PROP_EXTRACTED_PACKAGES = "extraPackages"; + public XmiChainedFileWriter() { super(PROP_RESOLVER, "resolver", PROP_FULL_PACKAGE_PATH, - "fullPackagePath" + "fullPackagePath", + PROP_EXTRACTED_PACKAGES, + "extraPackages" ); } @@ -135,6 +139,10 @@ public String getFullPackagePath() { return getProperty(PROP_FULL_PACKAGE_PATH, String.class); } + + public String getExtractedPackages() { + return getProperty(PROP_EXTRACTED_PACKAGES, String.class); + } public String getResolver() { return getProperty(PROP_RESOLVER, String.class); @@ -236,6 +244,9 @@ transformer.setParameter(PROP_FULL_PACKAGE_PATH, getFullPackagePath() ); + transformer.setParameter(PROP_EXTRACTED_PACKAGES, + getExtractedPackages() + ); transformer.setURIResolver(fileResolver); FileOutputStream output = new FileOutputStream(result);

1 0

r939 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org July 8, 2010

July 8, 2010

Author: tchemit Date: 2010-07-08 10:10:40 +0200 (Thu, 08 Jul 2010) New Revision: 939 Url: http://nuiton.org/repositories/revision/eugene/939 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-07-08 08:10:38 UTC (rev 938) +++ trunk/ant-eugene-task/pom.xml 2010-07-08 08:10:40 UTC (rev 939) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-07-08 08:10:38 UTC (rev 938) +++ trunk/eugene/pom.xml 2010-07-08 08:10:40 UTC (rev 939) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-07-08 08:10:38 UTC (rev 938) +++ trunk/maven-eugene-plugin/pom.xml 2010-07-08 08:10:40 UTC (rev 939) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-08 08:10:38 UTC (rev 938) +++ trunk/pom.xml 2010-07-08 08:10:40 UTC (rev 939) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.1</version> + <version>2.1.1-SNAPSHOT</version> <modules> <module>eugene</module> @@ -321,9 +321,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.1</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> </scm> </project>

1 0

r938 - in tags: . eugene-2.1
by tchemit＠users.nuiton.org July 8, 2010

July 8, 2010

Author: tchemit Date: 2010-07-08 10:10:38 +0200 (Thu, 08 Jul 2010) New Revision: 938 Url: http://nuiton.org/repositories/revision/eugene/938 Log: [maven-release-plugin] copy for tag eugene-2.1 Added: tags/eugene-2.1/ Property changes on: tags/eugene-2.1 ___________________________________________________________________ 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

r937 - in trunk: . ant-eugene-task eugene maven-eugene-plugin
by tchemit＠users.nuiton.org July 8, 2010

July 8, 2010

Author: tchemit Date: 2010-07-08 10:10:36 +0200 (Thu, 08 Jul 2010) New Revision: 937 Url: http://nuiton.org/repositories/revision/eugene/937 Log: [maven-release-plugin] prepare release eugene-2.1 Modified: trunk/ant-eugene-task/pom.xml trunk/eugene/pom.xml trunk/maven-eugene-plugin/pom.xml trunk/pom.xml Modified: trunk/ant-eugene-task/pom.xml =================================================================== --- trunk/ant-eugene-task/pom.xml 2010-07-07 12:13:19 UTC (rev 936) +++ trunk/ant-eugene-task/pom.xml 2010-07-08 08:10:36 UTC (rev 937) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2010-07-07 12:13:19 UTC (rev 936) +++ trunk/eugene/pom.xml 2010-07-08 08:10:36 UTC (rev 937) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2010-07-07 12:13:19 UTC (rev 936) +++ trunk/maven-eugene-plugin/pom.xml 2010-07-08 08:10:36 UTC (rev 937) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-07 12:13:19 UTC (rev 936) +++ trunk/pom.xml 2010-07-08 08:10:36 UTC (rev 937) @@ -37,7 +37,7 @@ </parent> <artifactId>eugene</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> <modules> <module>eugene</module> @@ -321,9 +321,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/eugene/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/eugene/tags/eugene-2.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/eugene/tags/eugene-2.1</url> </scm> </project>

1 0

r936 - trunk/eugene/src/main/java/org/nuiton/eugene/java
by tchemit＠users.nuiton.org July 7, 2010

July 7, 2010

Author: tchemit Date: 2010-07-07 14:13:19 +0200 (Wed, 07 Jul 2010) New Revision: 936 Url: http://nuiton.org/repositories/revision/eugene/936 Log: Anomalie #757: Can not use multiple super class on a interface Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-07-01 13:15:39 UTC (rev 935) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java 2010-07-07 12:13:19 UTC (rev 936) @@ -69,11 +69,8 @@ } // extend interface - Iterator<ObjectModelInterface> it = - input.getInterfaces().iterator(); - if (it.hasNext()) { - ObjectModelInterface extend = it.next(); + for (ObjectModelInterface extend : input.getInterfaces()) { addInterface(output, extend.getQualifiedName()); }

1 0