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();