regenerate model project properly for the mdsd example

istvanrath · istvanrath · commit b2b2e4115be8 · 2012-05-21T14:00:46.000+02:00
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/META-INF/MANIFEST.MF b/mdsd/hu.bme.mit.inf.gs.dsl/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Export-Package: soamodel,
+ soamodel.impl,
+ soamodel.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
-Export-Package: soamodel,
- soamodel.impl,
- soamodel.util
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/plugin.xml b/mdsd/hu.bme.mit.inf.gs.dsl/plugin.xml
@@ -1,14 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ <copyright>
+ </copyright>
+
+ $Id$
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <package
+            uri="http://soamodel/1.0"
+            class="soamodel.SoamodelPackage"
+            genModel="model/SoaModel.genmodel"/>
+   </extension>
+
+</plugin>
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/CollectionType.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/CollectionType.java
@@ -20,7 +20,8 @@
  * </p>
  *
  * @see soamodel.SoamodelPackage#getCollectionType()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='existingCollectionItem UniqueItemType'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot existingCollectionItem='DataType.allInstances()->exists(d : DataType | self.itemType = d)' UniqueItemType='CollectionType.allInstances()->forAll(C1 : CollectionType, C2 : CollectionType | C1.itemType <> C2.itemType or C1 = C2)'"
  * @generated
  */
 public interface CollectionType extends DataType {
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/DataType.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/DataType.java
@@ -17,6 +17,7 @@
  * The following features are supported:
  * <ul>
  *   <li>{@link soamodel.DataType#getName <em>Name</em>}</li>
+ *   <li>{@link soamodel.DataType#getExtendedBy <em>Extended By</em>}</li>
  * </ul>
  * </p>
  *
@@ -51,4 +52,30 @@ public interface DataType extends EObject {
 	 */
 	void setName(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Extended By</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extended By</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Extended By</em>' reference.
+	 * @see #setExtendedBy(Entity)
+	 * @see soamodel.SoamodelPackage#getDataType_ExtendedBy()
+	 * @model
+	 * @generated
+	 */
+	Entity getExtendedBy();
+
+	/**
+	 * Sets the value of the '{@link soamodel.DataType#getExtendedBy <em>Extended By</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Extended By</em>' reference.
+	 * @see #getExtendedBy()
+	 * @generated
+	 */
+	void setExtendedBy(Entity value);
+
 } // DataType
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/Entity.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/Entity.java
@@ -26,7 +26,8 @@
  * </p>
  *
  * @see soamodel.SoamodelPackage#getEntity()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='uniqueEntityNames singleAttributeNameInEntity InternalIDAttribute'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot uniqueEntityNames='not Entity.allInstances()->exists(e1 : Entity, e2 : Entity | (e1.name = e2.name and e1 <> e2))' singleAttributeNameInEntity='self.attributes->forAll(a1 : Attribute, a2 : Attribute | a1.name <> a2.name or a1 = a2)' InternalIDAttribute='self.ID.attributeOf = self'"
  * @generated
  */
 public interface Entity extends DataType {
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/Enum.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/Enum.java
@@ -21,7 +21,8 @@
  * </p>
  *
  * @see soamodel.SoamodelPackage#getEnum()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='UniqueLiteralNames LivingDataType UniqueLiteralValues'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot UniqueLiteralNames='self.literals->forAll(L1 : EnumLiteral, L2 : EnumLiteral | L1.name <> L2.name or L1 = L2)' LivingDataType='ServiceOrientedArchitecture.allInstances()->exists(a : ServiceOrientedArchitecture | a.dataTypes->exists(c : DataType | c = self))' UniqueLiteralValues='self.literals->forAll(l1 : EnumLiteral, l2 : EnumLiteral | l1.value <> l2.value or l1 = l2)'"
  * @generated
  */
 public interface Enum extends DataType {
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/EnumLiteral.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/EnumLiteral.java
@@ -17,6 +17,7 @@
  * The following features are supported:
  * <ul>
  *   <li>{@link soamodel.EnumLiteral#getName <em>Name</em>}</li>
+ *   <li>{@link soamodel.EnumLiteral#getValue <em>Value</em>}</li>
  * </ul>
  * </p>
  *
@@ -51,4 +52,30 @@ public interface EnumLiteral extends EObject {
 	 */
 	void setName(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Value</em>' attribute.
+	 * @see #setValue(int)
+	 * @see soamodel.SoamodelPackage#getEnumLiteral_Value()
+	 * @model required="true"
+	 * @generated
+	 */
+	int getValue();
+
+	/**
+	 * Sets the value of the '{@link soamodel.EnumLiteral#getValue <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Value</em>' attribute.
+	 * @see #getValue()
+	 * @generated
+	 */
+	void setValue(int value);
+
 } // EnumLiteral
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/OCLConstraint.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/OCLConstraint.java
@@ -23,6 +23,8 @@
  *
  * @see soamodel.SoamodelPackage#getOCLConstraint()
  * @model abstract="true"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='FilledOCLDescription'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot FilledOCLDescription='self.description.size() > 0'"
  * @generated
  */
 public interface OCLConstraint extends EObject {
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/ServiceComponent.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/ServiceComponent.java
@@ -29,7 +29,8 @@
  * </p>
  *
  * @see soamodel.SoamodelPackage#getServiceComponent()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='UniqueServiceMethodSignatures LivingComponent UniqueSCURINamespace'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot UniqueServiceMethodSignatures='self.methods->forAll(m1 : ServiceMethod, m2 : ServiceMethod | (m1.name <> m2.name or m1 = m2)) and self.methods->forAll(m : ServiceMethod | m.parameters->forAll(p1 : Parameter, p2 : Parameter | (p1.parameterType <> p2.parameterType or p1 = p2)))' LivingComponent='ServiceOrientedArchitecture.allInstances()->exists(a : ServiceOrientedArchitecture | a.components->exists(c : ServiceComponent | c = self))' UniqueSCURINamespace='ServiceComponent.allInstances()->forAll(SC1 : ServiceComponent, SC2 : ServiceComponent | SC1.URI <> SC2.URI and SC1.namespace <> SC2.namespace or SC1 = SC2)'"
  * @generated
  */
 public interface ServiceComponent extends EObject {
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/ServiceMethod.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/ServiceMethod.java
@@ -28,7 +28,8 @@
  * </p>
  *
  * @see soamodel.SoamodelPackage#getServiceMethod()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='FilledMethodDescription OnlyRestMethods DifferentParameternames'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot FilledMethodDescription='self.description.size() > 0' OnlyRestMethods='RestMethod.allInstances()->includes(self)' DifferentParameternames='self.parameters->forAll(p1 : Parameter, p2 : Parameter | p1.name <> p2.name or p1 = p2)'"
  * @generated
  */
 public interface ServiceMethod extends EObject {
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/ServiceOrientedArchitecture.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/ServiceOrientedArchitecture.java
@@ -25,7 +25,8 @@
  * </p>
  *
  * @see soamodel.SoamodelPackage#getServiceOrientedArchitecture()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='uniqueDatatypeNames uniqueComponentNames'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot uniqueDatatypeNames='self.dataTypes->forAll(t1 : DataType, t2 : DataType | t1.name <> t2.name or t1 = t2)' uniqueComponentNames='self.components->forAll(s1 : ServiceComponent, s2 : ServiceComponent | s1.name <> s2.name or s1 = s2)'"
  * @generated
  */
 public interface ServiceOrientedArchitecture extends EObject {
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/SoamodelPackage.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/SoamodelPackage.java
@@ -25,6 +25,7 @@
  * <!-- end-user-doc -->
  * @see soamodel.SoamodelFactory
  * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore invocationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' settingDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot' validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"
  * @generated
  */
 public interface SoamodelPackage extends EPackage {
@@ -435,14 +436,23 @@ public interface SoamodelPackage extends EPackage {
 	 */
 	int DATA_TYPE__NAME = 0;
 
+	/**
+	 * The feature id for the '<em><b>Extended By</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_TYPE__EXTENDED_BY = 1;
+
 	/**
 	 * The number of structural features of the '<em>Data Type</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DATA_TYPE_FEATURE_COUNT = 1;
+	int DATA_TYPE_FEATURE_COUNT = 2;
 
 	/**
 	 * The meta object id for the '{@link soamodel.impl.EntityImpl <em>Entity</em>}' class.
@@ -463,6 +473,15 @@ public interface SoamodelPackage extends EPackage {
 	 */
 	int ENTITY__NAME = DATA_TYPE__NAME;
 
+	/**
+	 * The feature id for the '<em><b>Extended By</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENTITY__EXTENDED_BY = DATA_TYPE__EXTENDED_BY;
+
 	/**
 	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -545,6 +564,15 @@ public interface SoamodelPackage extends EPackage {
 	 */
 	int BUILT_IN_DATA_TYPE__NAME = DATA_TYPE__NAME;
 
+	/**
+	 * The feature id for the '<em><b>Extended By</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BUILT_IN_DATA_TYPE__EXTENDED_BY = DATA_TYPE__EXTENDED_BY;
+
 	/**
 	 * The number of structural features of the '<em>Built In Data Type</em>' class.
 	 * <!-- begin-user-doc -->
@@ -573,6 +601,15 @@ public interface SoamodelPackage extends EPackage {
 	 */
 	int COLLECTION_TYPE__NAME = DATA_TYPE__NAME;
 
+	/**
+	 * The feature id for the '<em><b>Extended By</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_TYPE__EXTENDED_BY = DATA_TYPE__EXTENDED_BY;
+
 	/**
 	 * The feature id for the '<em><b>Item Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -740,6 +777,15 @@ public interface SoamodelPackage extends EPackage {
 	 */
 	int ENUM__NAME = DATA_TYPE__NAME;
 
+	/**
+	 * The feature id for the '<em><b>Extended By</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENUM__EXTENDED_BY = DATA_TYPE__EXTENDED_BY;
+
 	/**
 	 * The feature id for the '<em><b>Literals</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -777,14 +823,23 @@ public interface SoamodelPackage extends EPackage {
 	 */
 	int ENUM_LITERAL__NAME = 0;
 
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENUM_LITERAL__VALUE = 1;
+
 	/**
 	 * The number of structural features of the '<em>Enum Literal</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ENUM_LITERAL_FEATURE_COUNT = 1;
+	int ENUM_LITERAL_FEATURE_COUNT = 2;
 
 
 	/**
@@ -1318,6 +1373,17 @@ public interface SoamodelPackage extends EPackage {
 	 */
 	EAttribute getDataType_Name();
 
+	/**
+	 * Returns the meta object for the reference '{@link soamodel.DataType#getExtendedBy <em>Extended By</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Extended By</em>'.
+	 * @see soamodel.DataType#getExtendedBy()
+	 * @see #getDataType()
+	 * @generated
+	 */
+	EReference getDataType_ExtendedBy();
+
 	/**
 	 * Returns the meta object for class '{@link soamodel.Entity <em>Entity</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1585,6 +1651,17 @@ public interface SoamodelPackage extends EPackage {
 	 */
 	EAttribute getEnumLiteral_Name();
 
+	/**
+	 * Returns the meta object for the attribute '{@link soamodel.EnumLiteral#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see soamodel.EnumLiteral#getValue()
+	 * @see #getEnumLiteral()
+	 * @generated
+	 */
+	EAttribute getEnumLiteral_Value();
+
 	/**
 	 * Returns the meta object for class '{@link soamodel.OSGiComponent <em>OS Gi Component</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1877,6 +1954,14 @@ interface Literals {
 		 */
 		EAttribute DATA_TYPE__NAME = eINSTANCE.getDataType_Name();
 
+		/**
+		 * The meta object literal for the '<em><b>Extended By</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DATA_TYPE__EXTENDED_BY = eINSTANCE.getDataType_ExtendedBy();
+
 		/**
 		 * The meta object literal for the '{@link soamodel.impl.EntityImpl <em>Entity</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -2093,6 +2178,14 @@ interface Literals {
 		 */
 		EAttribute ENUM_LITERAL__NAME = eINSTANCE.getEnumLiteral_Name();
 
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ENUM_LITERAL__VALUE = eINSTANCE.getEnumLiteral_Value();
+
 		/**
 		 * The meta object literal for the '{@link soamodel.impl.OSGiComponentImpl <em>OS Gi Component</em>}' class.
 		 * <!-- begin-user-doc -->
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/impl/DataTypeImpl.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/impl/DataTypeImpl.java
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/impl/EnumLiteralImpl.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/impl/EnumLiteralImpl.java
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/impl/SoamodelPackageImpl.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/impl/SoamodelPackageImpl.java
diff --git a/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/util/SoamodelValidator.java b/mdsd/hu.bme.mit.inf.gs.dsl/src/soamodel/util/SoamodelValidator.java

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`*`
`24`	`24`	`* @see soamodel.SoamodelPackage#getOCLConstraint()`
`25`	`25`	`* @model abstract="true"`
	`26`	`+ * annotation="http://www.eclipse.org/emf/2002/Ecore constraints='FilledOCLDescription'"`
	`27`	`+ * annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot FilledOCLDescription='self.description.size() > 0'"`
`26`	`28`	`* @generated`
`27`	`29`	`*/`
`28`	`30`	`public interface OCLConstraint extends EObject {`