[omg] Generate into more useful folder structureLuna_M6

19 files changed, 2 insertions, 2 deletions

diff --git a/plugins/org.eclipse.qvt/model/ecore/EMOF.uml b/plugins/org.eclipse.qvt/model/uml/EMOF.uml
index de9694f10..de9694f10 100644
--- a/plugins/org.eclipse.qvt/model/ecore/EMOF.uml
+++ b/plugins/org.eclipse.qvt/model/uml/EMOF.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/EssentialOCL.uml b/plugins/org.eclipse.qvt/model/uml/EssentialOCL.uml
index 9c561b004..9c561b004 100644
--- a/plugins/org.eclipse.qvt/model/ecore/EssentialOCL.uml
+++ b/plugins/org.eclipse.qvt/model/uml/EssentialOCL.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/ImperativeOCL.uml b/plugins/org.eclipse.qvt/model/uml/ImperativeOCL.uml
index 5328966cc..5328966cc 100644
--- a/plugins/org.eclipse.qvt/model/ecore/ImperativeOCL.uml
+++ b/plugins/org.eclipse.qvt/model/uml/ImperativeOCL.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/PrimitiveTypes.uml b/plugins/org.eclipse.qvt/model/uml/PrimitiveTypes.uml
index 5d65046e1..5d65046e1 100644
--- a/plugins/org.eclipse.qvt/model/ecore/PrimitiveTypes.uml
+++ b/plugins/org.eclipse.qvt/model/uml/PrimitiveTypes.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTBase.uml b/plugins/org.eclipse.qvt/model/uml/QVTBase.uml
index 7488d9b0e..7488d9b0e 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTBase.uml
+++ b/plugins/org.eclipse.qvt/model/uml/QVTBase.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTCore.uml b/plugins/org.eclipse.qvt/model/uml/QVTCore.uml
index 33409d36a..33409d36a 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTCore.uml
+++ b/plugins/org.eclipse.qvt/model/uml/QVTCore.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTOperational.uml b/plugins/org.eclipse.qvt/model/uml/QVTOperational.uml
index 88e4a3637..88e4a3637 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTOperational.uml
+++ b/plugins/org.eclipse.qvt/model/uml/QVTOperational.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTRelation.uml b/plugins/org.eclipse.qvt/model/uml/QVTRelation.uml
index 18682658f..18682658f 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTRelation.uml
+++ b/plugins/org.eclipse.qvt/model/uml/QVTRelation.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTTemplate.uml b/plugins/org.eclipse.qvt/model/uml/QVTTemplate.uml
index 14c5e3a47..14c5e3a47 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTTemplate.uml
+++ b/plugins/org.eclipse.qvt/model/uml/QVTTemplate.uml
diff --git a/plugins/org.eclipse.qvt/model/ecore/EMOF.xmi b/plugins/org.eclipse.qvt/model/xmi/EMOF.xmi
index dc951362b..dc951362b 100644
--- a/plugins/org.eclipse.qvt/model/ecore/EMOF.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/EMOF.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/EssentialOCL.xmi b/plugins/org.eclipse.qvt/model/xmi/EssentialOCL.xmi
index b044bbde7..b044bbde7 100644
--- a/plugins/org.eclipse.qvt/model/ecore/EssentialOCL.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/EssentialOCL.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/ImperativeOCL.xmi b/plugins/org.eclipse.qvt/model/xmi/ImperativeOCL.xmi
index 1718f2520..1718f2520 100644
--- a/plugins/org.eclipse.qvt/model/ecore/ImperativeOCL.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/ImperativeOCL.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/PrimitiveTypes.xmi b/plugins/org.eclipse.qvt/model/xmi/PrimitiveTypes.xmi
index a261d8e85..a261d8e85 100644
--- a/plugins/org.eclipse.qvt/model/ecore/PrimitiveTypes.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/PrimitiveTypes.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTBase.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTBase.xmi
index 05b60e08c..05b60e08c 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTBase.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/QVTBase.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTCore.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTCore.xmi
index d8b4959b2..d8b4959b2 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTCore.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/QVTCore.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTOperational.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTOperational.xmi
index 6db1c3d3b..6db1c3d3b 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTOperational.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/QVTOperational.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTRelation.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTRelation.xmi
index 02de19707..02de19707 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTRelation.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/QVTRelation.xmi
diff --git a/plugins/org.eclipse.qvt/model/ecore/QVTTemplate.xmi b/plugins/org.eclipse.qvt/model/xmi/QVTTemplate.xmi
index e37a125c5..e37a125c5 100644
--- a/plugins/org.eclipse.qvt/model/ecore/QVTTemplate.xmi
+++ b/plugins/org.eclipse.qvt/model/xmi/QVTTemplate.xmi
diff --git a/plugins/org.eclipse.qvt/src/org/eclipse/qvt/tools/Ecore2UML.java b/plugins/org.eclipse.qvt/src/org/eclipse/qvt/tools/Ecore2UML.java
index 20086cea1..9e7b7f9ba 100644
--- a/plugins/org.eclipse.qvt/src/org/eclipse/qvt/tools/Ecore2UML.java
+++ b/plugins/org.eclipse.qvt/src/org/eclipse/qvt/tools/Ecore2UML.java
@@ -105,7 +105,7 @@ public class Ecore2UML {
 		UMLResourcesUtil.init(umlResourceSet);
 		for (Resource ecoreResource : new ArrayList<Resource>(ecoreResourceSet.getResources())) {	// Ignore any profiles that aappear
 			URI ecoreURI = ecoreResource.getURI();
-			URI umlURI = ecoreURI.trimFileExtension().appendFileExtension("uml");
+			URI umlURI = URI.createPlatformResourceURI("/org.eclipse.qvt/model/uml/" + ecoreURI.trimFileExtension().lastSegment() + ".uml", true);
 			Resource umlResource = umlResourceSet.createResource(umlURI);
 			for (EObject eObject : ecoreResource.getContents()) {
 				Element umlElement = ecore2umlConverter.get(eObject);
@@ -135,7 +135,7 @@ public class Ecore2UML {
 		ResourceSet xmiResourceSet = new ResourceSetImpl();
 		xmiResourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl());
 		for (Resource umlResource : umlResourceSet.getResources()) {
-			URI xmiURI = umlResource.getURI().trimFileExtension().appendFileExtension("xmi");
+			URI xmiURI = URI.createPlatformResourceURI("/org.eclipse.qvt/model/xmi/" + umlResource.getURI().trimFileExtension().lastSegment() + ".xmi", true);
 			XMIResource xmiResource = (XMIResource) xmiResourceSet.createResource(xmiURI);
 		    xmiResource.setXMIVersion("20110701");
 			xmiResource.getContents().addAll(umlResource.getContents());