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

r1324 - in trunk: . eugene eugene-java-templates eugene-maven-plugin eugene-plantuml-templates eugene-yaml-templates
by athimel＠users.nuiton.org April 15, 2014

April 15, 2014

Author: athimel Date: 2014-04-15 11:05:35 +0200 (Tue, 15 Apr 2014) New Revision: 1324 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1324 Log: Back to version 2.7.5-SNAPSHOT Modified: trunk/eugene-java-templates/pom.xml trunk/eugene-maven-plugin/pom.xml trunk/eugene-plantuml-templates/pom.xml trunk/eugene-yaml-templates/pom.xml trunk/eugene/pom.xml trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-java-templates/pom.xml =================================================================== --- trunk/eugene-java-templates/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene-java-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-maven-plugin/pom.xml =================================================================== --- trunk/eugene-maven-plugin/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene-maven-plugin/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-plantuml-templates/pom.xml =================================================================== --- trunk/eugene-plantuml-templates/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene-plantuml-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/eugene-yaml-templates/pom.xml =================================================================== --- trunk/eugene-yaml-templates/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/eugene-yaml-templates/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.eugene</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-07 09:55:24 UTC (rev 1323) +++ trunk/pom.xml 2014-04-15 09:05:35 UTC (rev 1324) @@ -28,11 +28,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0</version> + <version>5.0.6-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.7.5-SNAPSHOT</version> <packaging>pom</packaging> <name>EUGene</name> <description>Efficient Universal Generator</description>

1 0

r1323 - trunk/eugene/src/main/java/org/nuiton/eugene/writer
by dcosse＠users.nuiton.org April 7, 2014

April 7, 2014

Author: dcosse Date: 2014-04-07 11:55:24 +0200 (Mon, 07 Apr 2014) New Revision: 1323 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1323 Log: refs #3135 comment added Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 09:31:12 UTC (rev 1322) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 09:55:24 UTC (rev 1323) @@ -454,9 +454,18 @@ String path = url.getPath(); + // case where file is extracted from jar, "!" found into url, ex: + // url: /home/.../agrosyst-api/target/agrosyst-api-1.0.1-SNAPSHOT.jar!/agrosyst.objectmodel + // path: /home/.../agrosyst-services/target/extracted-sources/model/agrosyst.objectmodel + + // case where file is no extracted from jar, "!" not found into url, ex: + // url: /home/.../agrosyst-api/target/classes/agrosyst.objectmodel + // path: /home/.../agrosyst-services/target/extracted-sources/model/agrosyst.objectmodel + int index = path.indexOf("!"); if (index == -1) { - index = path.lastIndexOf("/") - 1; + // case where file is no extracted from jar: + index = path.lastIndexOf("/") - 1; // -1: because we need to keep the last "/" from path } String relativePath = path.substring(index + 1);

1 0

r1322 - trunk/eugene/src/main/java/org/nuiton/eugene/writer
by dcosse＠users.nuiton.org April 7, 2014

April 7, 2014

Author: dcosse Date: 2014-04-07 11:31:12 +0200 (Mon, 07 Apr 2014) New Revision: 1322 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1322 Log: fixes #3135 corrige la phase de compilation ou les fichiers ne sont pas extraits d'un jar Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 08:41:35 UTC (rev 1321) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 09:31:12 UTC (rev 1322) @@ -454,14 +454,10 @@ String path = url.getPath(); - - //TODO david cossé 04/04/2014 : from 459 to 462, fix bug #3135 within windows. Find a better way to do this. - if (path.contains("/C:/")){ - int startFileName = path.lastIndexOf("/"); - path = path.substring(startFileName + 1); - } - int index = path.indexOf("!"); + if (index == -1) { + index = path.lastIndexOf("/") - 1; + } String relativePath = path.substring(index + 1); File f = new File(extractDirectory, relativePath);

1 0

r1321 - in trunk/eugene/src: main/java/org/nuiton/eugene/writer test/java/org/nuiton/eugene/models/object
by dcosse＠users.nuiton.org April 7, 2014

April 7, 2014

Author: dcosse Date: 2014-04-07 10:41:35 +0200 (Mon, 07 Apr 2014) New Revision: 1321 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1321 Log: fixes ##3135 corrige les probl?\195?\168mes d'ex?\195?\169cution d'eugene sous Windows Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java Modified: trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 08:37:19 UTC (rev 1320) +++ trunk/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java 2014-04-07 08:41:35 UTC (rev 1321) @@ -453,13 +453,23 @@ } String path = url.getPath(); + + + //TODO david cossé 04/04/2014 : from 459 to 462, fix bug #3135 within windows. Find a better way to do this. + if (path.contains("/C:/")){ + int startFileName = path.lastIndexOf("/"); + path = path.substring(startFileName + 1); + } + int index = path.indexOf("!"); String relativePath = path.substring(index + 1); + File f = new File(extractDirectory, relativePath); if (log.isDebugEnabled()) { log.debug("extract " + url + " to " + f); } File parentFile = f.getParentFile(); + boolean b = parentFile.exists() || parentFile.mkdirs(); if (!b) { throw new IOException("Could not create directory " + f); Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java 2014-04-07 08:37:19 UTC (rev 1320) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/ModelMergeTest.java 2014-04-07 08:41:35 UTC (rev 1321) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.eugene.models.object.reader.XmlObjectModelReader; import org.nuiton.util.Resource; import java.io.File; @@ -89,9 +90,12 @@ files[j - 1] = new File(url.toURI()); } - ObjectModelReader reader = new ObjectModelReader(); - ObjectModel objectModel = reader.read(files); - return objectModel; + XmlObjectModelReader generator = new XmlObjectModelReader(); + ObjectModel model = generator.read(files); + return model; +// ObjectModelReader reader = new ObjectModelReader(); +// ObjectModel objectModel = reader.read(files); +// return objectModel; // generator.generate(files, new File("target")); // return generator.getModel(); Modified: trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java =================================================================== --- trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java 2014-04-07 08:37:19 UTC (rev 1320) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI12ToObjectModelTest.java 2014-04-07 08:41:35 UTC (rev 1321) @@ -29,6 +29,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.eugene.TestHelper; +import org.nuiton.eugene.models.object.reader.XmlObjectModelReader; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; import org.nuiton.util.ResourceResolver; @@ -110,9 +111,12 @@ */ protected ObjectModel loadModel(File modelFile) throws IOException { // ObjectModelGenerator generator = new ObjectModelGenerator(); - ObjectModelReader reader = new ObjectModelReader(); - ObjectModel model = reader.read(modelFile); + XmlObjectModelReader generator = new XmlObjectModelReader(); + ObjectModel model = generator.read(modelFile); return model; +// ObjectModelReader reader = new ObjectModelReader(); +// ObjectModel model = reader.read(modelFile); +// return model; // generator.applyTemplate(model); // generator.generate(new File[] { modelFile }, new File("output")); // ObjectModel objectModel = generator.getModel();

1 0

r1320 - trunk/eugene/src/test/java/org/nuiton/eugene/models/object
by dcosse＠users.nuiton.org April 7, 2014

April 7, 2014

Author: dcosse Date: 2014-04-07 10:37:19 +0200 (Mon, 07 Apr 2014) New Revision: 1320 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1320 Log: fixes #3136 ce test n'est plus d'actualit?\195?\169 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 2014-02-27 21:45:30 UTC (rev 1319) +++ trunk/eugene/src/test/java/org/nuiton/eugene/models/object/XMI21ToObjectModelTest.java 2014-04-07 08:37:19 UTC (rev 1320) @@ -26,9 +26,11 @@ package org.nuiton.eugene.models.object; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.TestHelper; +import org.nuiton.eugene.models.object.reader.XmlObjectModelReader; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; import org.nuiton.util.ResourceResolver; @@ -119,9 +121,11 @@ * @return object model */ protected ObjectModel loadModel(File modelFile) throws IOException { - ObjectModelReader reader = new ObjectModelReader(); - ObjectModel model = reader.read(modelFile); + XmlObjectModelReader generator = new XmlObjectModelReader(); + ObjectModel model = generator.read(modelFile); return model; +// ObjectModelReader reader = new ObjectModelReader(); +// ObjectModel model = reader.read(modelFile); // ObjectModelGenerator generator = new ObjectModelGenerator(); // generator.generate(new File[] { modelFile }, new File("output")); // ObjectModel objectModel = generator.getModel(); @@ -252,6 +256,7 @@ assertTrue(opFindAllByContent.get(0).hasStereotype("Remote")); } + @Ignore("Test doesn't work on Windows OS ticket:http://nuiton.org/issues/3136") @Test public void testExtractCmsCore() throws Exception {

1 0