From 55ecb9d0e2980126efc83c53f9b28a7acda87c80 Mon Sep 17 00:00:00 2001 From: tkuehn <thomas.kuehn3@tu-dresden.de> Date: Thu, 20 Sep 2018 17:00:44 +0200 Subject: [PATCH] updated version numbers --- .../plugin.properties | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../plugin.properties | 4 ++-- org.framed.iorm.featuremodel/build.properties | 5 ++++- org.framed.iorm.model.edit/META-INF/MANIFEST.MF | 2 +- org.framed.iorm.model.edit/plugin.properties | 4 ++-- org.framed.iorm.model/META-INF/MANIFEST.MF | 7 +++++-- org.framed.iorm.model/plugin.properties | 4 ++-- .../impl/FeaturemodelPackageImpl.java | 16 ++++++++-------- .../framed/iorm/model/impl/OrmPackageImpl.java | 17 +++++++++-------- .../META-INF/MANIFEST.MF | 6 +++--- .../plugin.properties | 4 ++-- .../META-INF/MANIFEST.MF | 9 +++++---- org.framed.iorm.ui/META-INF/MANIFEST.MF | 9 +++++---- 14 files changed, 52 insertions(+), 43 deletions(-) diff --git a/org.framed.iorm.editpolicymodel.tests/plugin.properties b/org.framed.iorm.editpolicymodel.tests/plugin.properties index ab1f467c..baf45be9 100644 --- a/org.framed.iorm.editpolicymodel.tests/plugin.properties +++ b/org.framed.iorm.editpolicymodel.tests/plugin.properties @@ -1,4 +1,4 @@ # -pluginName = editpolicymodel Tests -providerName = www.example.org +pluginName = Generic Editpolicy Model Tests +providerName = TU Dresden diff --git a/org.framed.iorm.editpolicymodel/META-INF/MANIFEST.MF b/org.framed.iorm.editpolicymodel/META-INF/MANIFEST.MF index bbe2e668..76b289fa 100644 --- a/org.framed.iorm.editpolicymodel/META-INF/MANIFEST.MF +++ b/org.framed.iorm.editpolicymodel/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.framed.iorm.editpolicymodel;singleton:=true -Bundle-Version: 0.1.0.qualifier +Bundle-Version: 1.0.0 Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.codegen.ecore, - org.framed.iorm.model;bundle-version="1.0.0";visibility:=reexport, + org.framed.iorm.model;bundle-version="2.2.0";visibility:=reexport, org.framed.iorm.featuremodel;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.framed.iorm.editpolicymodel/plugin.properties b/org.framed.iorm.editpolicymodel/plugin.properties index 89807962..72ea0125 100644 --- a/org.framed.iorm.editpolicymodel/plugin.properties +++ b/org.framed.iorm.editpolicymodel/plugin.properties @@ -1,4 +1,4 @@ # -pluginName = Editpolicymodel Model -providerName = framed +pluginName = General Editpolicy Model +providerName = TU Dresden diff --git a/org.framed.iorm.featuremodel/build.properties b/org.framed.iorm.featuremodel/build.properties index 41eb6ade..076250ce 100644 --- a/org.framed.iorm.featuremodel/build.properties +++ b/org.framed.iorm.featuremodel/build.properties @@ -1,4 +1,7 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + model.xml +src.includes = model.xml,\ + META-INF/ diff --git a/org.framed.iorm.model.edit/META-INF/MANIFEST.MF b/org.framed.iorm.model.edit/META-INF/MANIFEST.MF index 010c6ac2..01ac6333 100644 --- a/org.framed.iorm.model.edit/META-INF/MANIFEST.MF +++ b/org.framed.iorm.model.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.framed.iorm.model.edit;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.framed.iorm.model.provider.ORMEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/org.framed.iorm.model.edit/plugin.properties b/org.framed.iorm.model.edit/plugin.properties index 5c0cf603..9f334749 100644 --- a/org.framed.iorm.model.edit/plugin.properties +++ b/org.framed.iorm.model.edit/plugin.properties @@ -1,7 +1,7 @@ # -pluginName = ORM Edit Support -providerName = www.example.org +pluginName = Object Relation Model Edit Support +providerName = TU Dresden _UI_CreateChild_text = {0} _UI_CreateChild_text2 = {1} {0} diff --git a/org.framed.iorm.model/META-INF/MANIFEST.MF b/org.framed.iorm.model/META-INF/MANIFEST.MF index bd3313a6..2c829801 100644 --- a/org.framed.iorm.model/META-INF/MANIFEST.MF +++ b/org.framed.iorm.model/META-INF/MANIFEST.MF @@ -2,12 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.framed.iorm.model;singleton:=true -Bundle-Version: 1.0.0.qualifier +Automatic-Module-Name: org.framed.iorm.model +Bundle-Version: 2.2.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.framed.iorm.featuremodel;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util", +Export-Package: org.framed.iorm.featuremodel; + uses:="org.eclipse.emf.ecore, + org.eclipse.emf.common.util", org.framed.iorm.featuremodel.impl; uses:="org.eclipse.emf.ecore, org.eclipse.emf.ecore.impl, diff --git a/org.framed.iorm.model/plugin.properties b/org.framed.iorm.model/plugin.properties index 05eda190..5ca250e7 100644 --- a/org.framed.iorm.model/plugin.properties +++ b/org.framed.iorm.model/plugin.properties @@ -1,4 +1,4 @@ # -pluginName = ORM Model -providerName = www.example.org +pluginName = Object Relation Model +providerName = TU Dresden diff --git a/org.framed.iorm.model/src/org/framed/iorm/featuremodel/impl/FeaturemodelPackageImpl.java b/org.framed.iorm.model/src/org/framed/iorm/featuremodel/impl/FeaturemodelPackageImpl.java index a282c526..0d970d59 100644 --- a/org.framed.iorm.model/src/org/framed/iorm/featuremodel/impl/FeaturemodelPackageImpl.java +++ b/org.framed.iorm.model/src/org/framed/iorm/featuremodel/impl/FeaturemodelPackageImpl.java @@ -76,7 +76,7 @@ public class FeaturemodelPackageImpl extends EPackageImpl implements Featuremode /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link FeaturemodelPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -91,17 +91,17 @@ public class FeaturemodelPackageImpl extends EPackageImpl implements Featuremode return (FeaturemodelPackage) EPackage.Registry.INSTANCE.getEPackage(FeaturemodelPackage.eNS_URI); // Obtain or create and register package - FeaturemodelPackageImpl theFeaturemodelPackage = (FeaturemodelPackageImpl) (EPackage.Registry.INSTANCE - .get(eNS_URI) instanceof FeaturemodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) - : new FeaturemodelPackageImpl()); + Object registeredFeaturemodelPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FeaturemodelPackageImpl theFeaturemodelPackage = registeredFeaturemodelPackage instanceof FeaturemodelPackageImpl + ? (FeaturemodelPackageImpl) registeredFeaturemodelPackage + : new FeaturemodelPackageImpl(); isInited = true; // Obtain or create and register interdependencies - OrmPackageImpl theOrmPackage = (OrmPackageImpl) (EPackage.Registry.INSTANCE - .getEPackage(OrmPackage.eNS_URI) instanceof OrmPackageImpl - ? EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI) - : OrmPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI); + OrmPackageImpl theOrmPackage = (OrmPackageImpl) (registeredPackage instanceof OrmPackageImpl ? registeredPackage + : OrmPackage.eINSTANCE); // Create package meta-data objects theFeaturemodelPackage.createPackageContents(); diff --git a/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java b/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java index fad75ed2..f171d188 100644 --- a/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java +++ b/org.framed.iorm.model/src/org/framed/iorm/model/impl/OrmPackageImpl.java @@ -108,7 +108,7 @@ public class OrmPackageImpl extends EPackageImpl implements OrmPackage { /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link OrmPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -123,17 +123,18 @@ public class OrmPackageImpl extends EPackageImpl implements OrmPackage { return (OrmPackage) EPackage.Registry.INSTANCE.getEPackage(OrmPackage.eNS_URI); // Obtain or create and register package - OrmPackageImpl theOrmPackage = (OrmPackageImpl) (EPackage.Registry.INSTANCE - .get(eNS_URI) instanceof OrmPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) - : new OrmPackageImpl()); + Object registeredOrmPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + OrmPackageImpl theOrmPackage = registeredOrmPackage instanceof OrmPackageImpl + ? (OrmPackageImpl) registeredOrmPackage + : new OrmPackageImpl(); isInited = true; // Obtain or create and register interdependencies - FeaturemodelPackageImpl theFeaturemodelPackage = (FeaturemodelPackageImpl) (EPackage.Registry.INSTANCE - .getEPackage(FeaturemodelPackage.eNS_URI) instanceof FeaturemodelPackageImpl - ? EPackage.Registry.INSTANCE.getEPackage(FeaturemodelPackage.eNS_URI) - : FeaturemodelPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(FeaturemodelPackage.eNS_URI); + FeaturemodelPackageImpl theFeaturemodelPackage = (FeaturemodelPackageImpl) (registeredPackage instanceof FeaturemodelPackageImpl + ? registeredPackage + : FeaturemodelPackage.eINSTANCE); // Create package meta-data objects theOrmPackage.createPackageContents(); diff --git a/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF b/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF index 3bcd422d..ebb44d50 100644 --- a/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF +++ b/org.framed.iorm.transformation.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.framed.iorm.transformation.test;singleton:=true -Bundle-Version: 2.0.3 +Bundle-Version: 2.2.3 Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.framed.iorm.transformation;bundle-version="1.0.0", org.junit, - org.rosi.crom.metamodel;visibility:=reexport, - org.framed.iorm.model;bundle-version="1.0.0";visibility:=reexport, + org.rosi.crom.metamodel;bundle-version="1.0.0";visibility:=reexport, + org.framed.iorm.model;bundle-version="2.2.0";visibility:=reexport, org.eclipse.emf.ecore.xmi, org.eclipse.compare;bundle-version="3.5.501", org.eclipse.emf.compare;bundle-version="3.1.0", diff --git a/org.framed.iorm.transformation.test/plugin.properties b/org.framed.iorm.transformation.test/plugin.properties index 7fec06f4..31025ef0 100644 --- a/org.framed.iorm.transformation.test/plugin.properties +++ b/org.framed.iorm.transformation.test/plugin.properties @@ -1,4 +1,4 @@ # -pluginName = Testmodel Model -providerName = www.example.org +pluginName = Transformation Family Test +providerName = TU Dresden diff --git a/org.framed.iorm.transformation/META-INF/MANIFEST.MF b/org.framed.iorm.transformation/META-INF/MANIFEST.MF index 8f2113c7..d34c0a2c 100644 --- a/org.framed.iorm.transformation/META-INF/MANIFEST.MF +++ b/org.framed.iorm.transformation/META-INF/MANIFEST.MF @@ -1,16 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Transformation +Bundle-Name: Transformation Family Bundle-SymbolicName: org.framed.iorm.transformation;singleton:=true -Bundle-Version: 2.0.3 +Bundle-Version: 2.2.0 Bundle-Activator: org.framed.iorm.transformation.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.epsilon.eol.engine, org.eclipse.epsilon.emc.emf, - org.eclipse.epsilon.eol.dt;bundle-version="1.2.0", + org.eclipse.epsilon.eol.dt, org.eclipse.epsilon.etl.engine, - org.rosi.crom.metamodel;bundle-version="0.1.0" + org.rosi.crom.metamodel;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.framed.iorm.transformation +Bundle-Vendor: TU Dresden diff --git a/org.framed.iorm.ui/META-INF/MANIFEST.MF b/org.framed.iorm.ui/META-INF/MANIFEST.MF index 0ab8a1ed..e916b037 100644 --- a/org.framed.iorm.ui/META-INF/MANIFEST.MF +++ b/org.framed.iorm.ui/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Ui +Bundle-Name: FRaMED SPL Bundle-SymbolicName: org.framed.iorm.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.framed.iorm.featuremodel;bundle-version="1.0.0", - org.framed.iorm.model.edit;visibility:=reexport, + org.framed.iorm.model.edit;bundle-version="1.0.0";visibility:=reexport, de.ovgu.featureide.fm.core;bundle-version="3.3.1", de.ovgu.featureide.fm.ui;bundle-version="3.3.2", org.eclipse.graphiti;bundle-version="0.13.2", @@ -27,9 +27,10 @@ Require-Bundle: org.framed.iorm.featuremodel;bundle-version="1.0.0", org.eclipse.core.resources;bundle-version="3.11.1";visibility:=reexport, org.eclipse.ui.workbench, org.eclipse.emf.ecore, - org.framed.iorm.editpolicymodel;bundle-version="0.1.0", + org.framed.iorm.editpolicymodel;bundle-version="1.0.0", org.eclipse.osgi Import-Package: org.eclipse.graphiti.features;version="0.13.2", org.framed.iorm.transformation Bundle-ClassPath: src/, . +Bundle-Vendor: TU Dresden -- GitLab