From edc8e5a33c5962020cfcf389c46ba027c45a2728 Mon Sep 17 00:00:00 2001 From: Florian Hoelzl <hoelzl@fortiss.org> Date: Sat, 30 Jun 2012 08:38:58 +0000 Subject: [PATCH] Juno Upgrade: kernel materialize works --- org.fortiss.tooling.kernel/trunk/model/kernel.ecore | 6 ++---- .../trunk/model/kernel.genmodel | 12 +++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore index a84e422af..c82943dad 100644 --- a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore +++ b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" - nsURI="http://www.fortiss.org/tooling/kernel" nsPrefix="org-fortiss-tooling-kernel"> +<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://www.fortiss.org/tooling/kernel" nsPrefix="org-fortiss-tooling-kernel"> <eClassifiers xsi:type="ecore:EClass" name="INamedElement" abstract="true" interface="true" eSuperTypes="#//IIdLabeled"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel index 2d1c3b6c7..2418eba35 100644 --- a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel +++ b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<genmodel:GenModel xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="(c) 2011 ForTISS GmbH" - modelDirectory="/org.fortiss.tooling.kernel/generated-src" editDirectory="org.fortiss.tooling.kernel.edit/src" - editorDirectory="/org.fortiss.tooling.kernel.editor/src" modelPluginID="org.fortiss.tooling.kernel" - modelName="Model" modelPluginClass="" editPluginClass="org.fortiss.tooling.kernel.model.provider.ModelEditPlugin" - editorPluginClass="org.fortiss.tooling.kernel.model.presentation.ModelEditorPlugin" +<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="(c) 2011 ForTISS GmbH" modelDirectory="/org.fortiss.tooling.kernel/generated-src" + editDirectory="org.fortiss.tooling.kernel.edit/src" editorDirectory="/org.fortiss.tooling.kernel.editor/src" + modelPluginID="org.fortiss.tooling.kernel" modelName="Model" modelPluginClass="" + editPluginClass="org.fortiss.tooling.kernel.model.provider.ModelEditPlugin" editorPluginClass="org.fortiss.tooling.kernel.model.presentation.ModelEditorPlugin" testsDirectory="/org.fortiss.tooling.kernel.tests/test-src" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false"> <foreignModel>kernel.ecore</foreignModel> -- GitLab