[358558] Only get UML.merged.uml from plugin

Also regenerate from UML2 4.0 *.uml files
eclipse-ocl · Sep 24, 2011 · cb07c5a · cb07c5a
1 parent bffedf0
commit cb07c5a
Show file tree

Hide file tree

Showing 12 changed files with 5,972 additions and 5,938 deletions.
diff --git a/features/org.eclipse.ocl.tests-feature/feature.xml b/features/org.eclipse.ocl.tests-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ocl.tests"
       label="%featureName"
-      version="3.1.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.ocl.license"
       license-feature-version="1.0.0.qualifier">

diff --git a/plugins/org.eclipse.ocl.uml/model/OCLUML.ecore b/plugins/org.eclipse.ocl.uml/model/OCLUML.ecore
diff --git a/plugins/org.eclipse.ocl.uml/model/OCLUML.genmodel b/plugins/org.eclipse.ocl.uml/model/OCLUML.genmodel
diff --git a/plugins/org.eclipse.ocl.uml/model/OCLUML.uml b/plugins/org.eclipse.ocl.uml/model/OCLUML.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
   <uml:Model xmi:id="_O6JI4Np9Eduf94aRL_gBBg" name="ocl">
     <packagedElement xmi:type="uml:Package" xmi:id="_O6JI4dp9Eduf94aRL_gBBg" name="uml">
       <packagedElement xmi:type="uml:Class" xmi:id="_O6JI4tp9Eduf94aRL_gBBg" name="AnyType">

diff --git a/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ocl;singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/plugins/org.eclipse.ocl/model/OCL.ecore b/plugins/org.eclipse.ocl/model/OCL.ecore
diff --git a/plugins/org.eclipse.ocl/model/OCL.genmodel b/plugins/org.eclipse.ocl/model/OCL.genmodel
diff --git a/plugins/org.eclipse.ocl/model/OCL.uml b/plugins/org.eclipse.ocl/model/OCL.uml
diff --git a/plugins/org.eclipse.ocl/model/OCLCST.ecore b/plugins/org.eclipse.ocl/model/OCLCST.ecore
diff --git a/plugins/org.eclipse.ocl/model/OCLCST.genmodel b/plugins/org.eclipse.ocl/model/OCLCST.genmodel
diff --git a/plugins/org.eclipse.ocl/model/OCLCST.uml b/plugins/org.eclipse.ocl/model/OCLCST.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/4" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/4 pathmap://UML_PROFILES/Ecore.profile.uml#_B7dOIMEREduRdatXodjBjA">
+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/4" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/4 pathmap://UML_PROFILES/Ecore.profile.uml#_B7dOIMEREduRdatXodjBjA">
   <uml:Model xmi:id="_qdx8sQ8fEduhWtVvKtiQ7w" name="ocl">
     <packagedElement xmi:type="uml:Package" xmi:id="_qdx8sP8fEduhWtVvKtiQ7w" name="cst">
       <elementImport xmi:id="_5DyD0LD5Ed6LkdYdYK9_JA"/>

diff --git a/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestReflection.java b/tests/org.eclipse.ocl.uml.tests/src/org/eclipse/ocl/uml/tests/UMLTestReflection.java
@@ -91,28 +91,24 @@ public TestReflection<EObject, Package, Type, Classifier, Class, DataType, Primi
 		}
 
 		public ResourceSet createResourceSet() {
-			Environment.Registry.INSTANCE.registerEnvironment(new UMLEnvironmentFactory().createEnvironment());
+			Environment.Registry.INSTANCE.registerEnvironment(
+				new UMLEnvironmentFactory().createEnvironment());
 			ResourceSet resourceSet = new ResourceSetImpl();
-			resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
-			Map<URI, URI> uriMap = resourceSet.getURIConverter().getURIMap();		
-			URI oclPluginURI;
+		    OCL.initialize(resourceSet);
+//			URI oclPluginURI;
 			URI umlPluginURI;
-			URI umlResourcesPluginURI;
+//			URI umlResourcesPluginURI;
 			if (!GenericTestSuite.eclipseIsRunning()) {
 				Map<String, URI> platformResourceMap = EcorePlugin.getPlatformResourceMap();
-				oclPluginURI = platformResourceMap.get("org.eclipse.ocl.uml");
+//				oclPluginURI = platformResourceMap.get("org.eclipse.ocl.uml");
 				umlPluginURI = platformResourceMap.get("org.eclipse.uml2.uml");
-				umlResourcesPluginURI = platformResourceMap.get("org.eclipse.uml2.uml.resources");
+//				umlResourcesPluginURI = platformResourceMap.get("org.eclipse.uml2.uml.resources");
 			}
 			else {
-				oclPluginURI = URI.createPlatformPluginURI("/org.eclipse.ocl.uml/", true);
+//				oclPluginURI = URI.createPlatformPluginURI("/org.eclipse.ocl.uml/", true);
 				umlPluginURI = URI.createPlatformPluginURI("/org.eclipse.uml2.uml/", true);
-				umlResourcesPluginURI = URI.createPlatformPluginURI("/org.eclipse.uml2.uml.resources/", true);				
+//				umlResourcesPluginURI = URI.createPlatformPluginURI("/org.eclipse.uml2.uml.resources/", true);				
 			}
-			uriMap.put(URI.createURI(UMLEnvironment.OCL_STANDARD_LIBRARY_NS_URI), URI.createURI("model/oclstdlib.uml").resolve(oclPluginURI)); //$NON-NLS-1$
-			uriMap.put(URI.createURI(UMLResource.PROFILES_PATHMAP), URI.createURI("profiles/").resolve(umlResourcesPluginURI)); //$NON-NLS-1$
-			uriMap.put(URI.createURI(UMLResource.METAMODELS_PATHMAP), URI.createURI("metamodels/").resolve(umlResourcesPluginURI)); //$NON-NLS-1$
-			uriMap.put(URI.createURI(UMLResource.LIBRARIES_PATHMAP), URI.createURI("libraries/").resolve(umlResourcesPluginURI)); //$NON-NLS-1$
 
 			// Make sure that the UML metamodel and primitive types
 			//   libraries are loaded