Merge branch 'Trace-Aggr-Analysis' of...

Merge branch 'Trace-Aggr-Analysis' of gitlab@build.se.informatik.uni-kiel.de:teetime/kieker-teetime-stages.git into Trace-Aggr-Analysis

.classpath

@@ -34,5 +34,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="conf"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

@@ -25,6 +25,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.sirius.nature.modelingproject</nature>
@@ -32,5 +42,6 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
 		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>

model/analysis-model.ecore

@@ -13,8 +13,8 @@
       <eClassifiers xsi:type="ecore:EClass" name="ComponentType">
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="packageName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="provided" upperBound="-1"
-            eType="#//softwaresystem/architecture/OperationType"/>
+        <eStructuralFeatures xsi:type="ecore:EReference" name="providedOperations"
+            upperBound="-1" eType="#//softwaresystem/architecture/OperationType"/>
       </eClassifiers>
       <eClassifiers xsi:type="ecore:EClass" name="OperationType">
         <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -33,10 +33,10 @@
       </eClassifiers>
       <eClassifiers xsi:type="ecore:EClass" name="DeployedComponent">
         <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" eType="#//softwaresystem/architecture/ComponentType"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="contains" upperBound="-1"
-            eType="#//softwaresystem/deployment/DeployedOperation"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="accesses" upperBound="-1"
-            eType="#//softwaresystem/deployment/DeployedOperation"/>
+        <eStructuralFeatures xsi:type="ecore:EReference" name="containedOperations"
+            upperBound="-1" eType="#//softwaresystem/deployment/DeployedOperation"/>
+        <eStructuralFeatures xsi:type="ecore:EReference" name="accessedOperations"
+            upperBound="-1" eType="#//softwaresystem/deployment/DeployedOperation"/>
       </eClassifiers>
       <eClassifiers xsi:type="ecore:EClass" name="DeployedOperation">
         <eStructuralFeatures xsi:type="ecore:EReference" name="operationType" eType="#//softwaresystem/architecture/OperationType"/>