From fc11d7e9608b4294e58ed6c24bbc132c51e8972b Mon Sep 17 00:00:00 2001
From: Piotr <piotr.rygielski@uni-wuerzburg.de>
Date: Mon, 17 Nov 2014 14:44:11 +0100
Subject: [PATCH] refactoring ecore files to remove dependencies
---
metamodels/DNI-Core.ecore | 4 +--
metamodels/DNI-Dependency.ecore | 2 +-
metamodels/DNI-NetworkConfiguration.ecore | 30 ++++++++++----------
metamodels/DNI-NetworkStructure.ecore | 34 +++++++++++------------
metamodels/DNI-NetworkTraffic.ecore | 28 +++++++++----------
metamodels/DNI-Root.ecore | 6 ++--
6 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/metamodels/DNI-Core.ecore b/metamodels/DNI-Core.ecore
index c6e1461c..05841b77 100644
--- a/metamodels/DNI-Core.ecore
+++ b/metamodels/DNI-Core.ecore
@@ -1,12 +1,12 @@
<?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="dnicore" nsURI="http://dnicore/1.0" nsPrefix="dnicore">
- <eClassifiers xsi:type="ecore:EClass" name="AddressableEntity" abstract="true" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="AddressableEntity" abstract="true" eSuperTypes="Descartes-core.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EReference" name="addresses" upperBound="-1"
eType="#//EntityAddress" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EntityAddress">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="address" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="addressGivenBy" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.configuration/model/NetworkConfiguration.ecore#//NetworkProtocol"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="addressGivenBy" eType="ecore:EClass DNI-NetworkConfiguration.ecore#//NetworkProtocol"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/metamodels/DNI-Dependency.ecore b/metamodels/DNI-Dependency.ecore
index b51ee299..84bc9c28 100644
--- a/metamodels/DNI-Dependency.ecore
+++ b/metamodels/DNI-Dependency.ecore
@@ -2,7 +2,7 @@
<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="dnidependency" nsURI="http://dnidependency/1.0" nsPrefix="dnidependency">
<eClassifiers xsi:type="ecore:EClass" name="Dependency" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="unit" eType="ecore:EClass DNIunits.ecore#//DNIUnit"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="unit" eType="ecore:EClass DNI-Units.ecore#//DNIUnit"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//Dependency"/>
diff --git a/metamodels/DNI-NetworkConfiguration.ecore b/metamodels/DNI-NetworkConfiguration.ecore
index eff7d504..fc45b6ff 100644
--- a/metamodels/DNI-NetworkConfiguration.ecore
+++ b/metamodels/DNI-NetworkConfiguration.ecore
@@ -14,11 +14,11 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="protocols" lowerBound="1"
upperBound="-1" eType="#//NetworkProtocol" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ProtocolStack" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//NamedElement">
+ <eClassifiers xsi:type="ecore:EClass" name="ProtocolStack" eSuperTypes="Descartes-core.ecore#//NamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="layers" lowerBound="1"
upperBound="-1" eType="#//ProtocolLayer" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ProtocolLayer" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//NamedElement">
+ <eClassifiers xsi:type="ecore:EClass" name="ProtocolLayer" eSuperTypes="Descartes-core.ecore#//NamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="protocol" lowerBound="1"
eType="#//NetworkProtocol"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="isCarriedBy" eType="#//ProtocolLayer"
@@ -26,7 +26,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="carries" eType="#//ProtocolLayer"
eOpposite="#//ProtocolLayer/isCarriedBy"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NetworkProtocol" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//NamedElement">
+ <eClassifiers xsi:type="ecore:EClass" name="NetworkProtocol" eSuperTypes="Descartes-core.ecore#//NamedElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mtu" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="headersLength" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
@@ -45,31 +45,31 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="directions" upperBound="-1"
eType="#//Direction" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Direction" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="Direction" eSuperTypes="Descartes-core.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EReference" name="onNode" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//Node"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="flow" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.traffic2/model/NetworkTraffic2.ecore#//Flow"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="via" lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//NetworkInterface"/>
+ eType="ecore:EClass DNI-NetworkStructure.ecore#//Node"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="flow" eType="ecore:EClass DNI-NetworkTraffic.ecore#//Flow"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="via" lowerBound="1" eType="ecore:EClass DNI-NetworkStructure.ecore#//NetworkInterface"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isDefault" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="distance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FlowRoute" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="FlowRoute" eSuperTypes="Descartes-core.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EReference" name="hops" eType="#//Hop" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="numHops" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="flow" lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.traffic2/model/NetworkTraffic2.ecore#//Flow"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="start" lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//NetworkInterface"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="end" lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//NetworkInterface"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="flow" lowerBound="1" eType="ecore:EClass DNI-NetworkTraffic.ecore#//Flow"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="start" lowerBound="1" eType="ecore:EClass DNI-NetworkStructure.ecore#//NetworkInterface"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="end" lowerBound="1" eType="ecore:EClass DNI-NetworkStructure.ecore#//NetworkInterface"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Route" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="Route" eSuperTypes="Descartes-core.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EReference" name="hops" eType="#//Hop" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="numHops" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="start" lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//NetworkInterface"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="end" lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//NetworkInterface"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="start" lowerBound="1" eType="ecore:EClass DNI-NetworkStructure.ecore#//NetworkInterface"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="end" lowerBound="1" eType="ecore:EClass DNI-NetworkStructure.ecore#//NetworkInterface"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Hop">
<eStructuralFeatures xsi:type="ecore:EReference" name="nextHop" eType="#//Hop"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="interfaceref" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//NetworkInterface"/>
+ eType="ecore:EClass DNI-NetworkStructure.ecore#//NetworkInterface"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/metamodels/DNI-NetworkStructure.ecore b/metamodels/DNI-NetworkStructure.ecore
index 0ecbf1b6..05ce76a1 100644
--- a/metamodels/DNI-NetworkStructure.ecore
+++ b/metamodels/DNI-NetworkStructure.ecore
@@ -7,9 +7,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="hasLinks" upperBound="-1"
eType="#//Link" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NetworkInterface" abstract="true" eSuperTypes="../../edu.kit.ipd.descartes.dni.commons/model/DNIcore.ecore#//AddressableEntity ../../edu.kit.ipd.descartes.core/model/core.ecore#//NamedElement">
+ <eClassifiers xsi:type="ecore:EClass" name="NetworkInterface" abstract="true" eSuperTypes="DNI-Core.ecore#//AddressableEntity Descartes-core.ecore#//NamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="usedProtocolStack" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.configuration/model/NetworkConfiguration.ecore#//ProtocolStack"/>
+ eType="ecore:EClass DNI-NetworkConfiguration.ecore#//ProtocolStack"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="belongsToNode" eType="#//Node"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="VirtualNetworkInterface" eSuperTypes="#//NetworkInterface">
@@ -24,7 +24,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="belongsToPhysicalNode"
eType="#//PhysicalNode"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Node" abstract="true" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="Node" abstract="true" eSuperTypes="Descartes-core.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="canHostSoftware" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="performance" eType="#//NodePerformanceSpecification"
@@ -32,7 +32,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="forwardingPerformance"
lowerBound="1" eType="#//IntermediateNodePerformanceSpecification" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="software" upperBound="-1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.traffic2/model/NetworkTraffic2.ecore#//SoftwareComponent"/>
+ eType="ecore:EClass DNI-NetworkTraffic.ecore#//SoftwareComponent"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="VirtualNode" eSuperTypes="#//Node">
<eStructuralFeatures xsi:type="ecore:EReference" name="hostedOn" lowerBound="1"
@@ -46,7 +46,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="hosts" upperBound="-1"
eType="#//VirtualNode" eOpposite="#//VirtualNode/hostedOn"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Link" abstract="true" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="Link" abstract="true" eSuperTypes="Descartes-core.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EReference" name="performance" lowerBound="1"
eType="#//LinkPerformanceSpecification" containment="true"/>
</eClassifiers>
@@ -65,7 +65,7 @@
<eClassifiers xsi:type="ecore:EClass" name="NodePerformanceSpecification" abstract="true"/>
<eClassifiers xsi:type="ecore:EClass" name="EndNodePerformanceSpecification" eSuperTypes="#//NodePerformanceSpecification">
<eStructuralFeatures xsi:type="ecore:EReference" name="softwareLayersDelay" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IntermediateNodePerformanceSpecification"
@@ -77,38 +77,38 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DataPlanePerformanceSpecification">
<eStructuralFeatures xsi:type="ecore:EReference" name="forwardingLatency" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="forwardingBandwidthPPS"
- lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ lowerBound="1" eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="forwardingBandwidthBPS"
- lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ lowerBound="1" eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="packetProcessingTime" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ControlPlanePerformanceSpecification">
<eStructuralFeatures xsi:type="ecore:EReference" name="processingLatency" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="processingBandwidthReqPS"
- lowerBound="1" eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ lowerBound="1" eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="packetProcessingTime" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NetworkInterfacePerformanceSpecification"
abstract="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isUp" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="packetProcessingTime" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="MTU" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="interfaceSpeed" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIunits.ecore#//SpeedUnit"
+ eType="ecore:EClass DNI-Units.ecore#//SpeedUnit"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="VirtualNetworkInterfacePerformanceSpecification"
@@ -117,10 +117,10 @@
eSuperTypes="#//NetworkInterfacePerformanceSpecification"/>
<eClassifiers xsi:type="ecore:EClass" name="LinkPerformanceSpecification" abstract="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="propagationDelay" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="maxSupportedBandwidth"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="VirtualLinkPerformanceSpecification"
diff --git a/metamodels/DNI-NetworkTraffic.ecore b/metamodels/DNI-NetworkTraffic.ecore
index 3d538010..ae2e0d94 100644
--- a/metamodels/DNI-NetworkTraffic.ecore
+++ b/metamodels/DNI-NetworkTraffic.ecore
@@ -7,43 +7,43 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="flows" upperBound="-1"
eType="#//Flow" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Flow" abstract="true" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="Flow" abstract="true" eSuperTypes="Descartes-core.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EReference" name="destinationSoftwareComponent"
eType="#//SoftwareComponent"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="sourceSoftwareComponent"
eType="#//SoftwareComponent"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="destinationAddresses" upperBound="-1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIcore.ecore#//EntityAddress"
+ eType="ecore:EClass DNI-Core.ecore#//EntityAddress"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ONOFFFlow" eSuperTypes="#//Flow">
<eStructuralFeatures xsi:type="ecore:EReference" name="ONstateIAT" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="ONstateDuration" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="OFFstateDuration" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="packetLength" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="startState" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GenericFlow" eSuperTypes="#//Flow">
<eStructuralFeatures xsi:type="ecore:EReference" name="dataSize" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SoftwareComponent" eSuperTypes="../../edu.kit.ipd.descartes.core/model/core.ecore#//Entity">
+ <eClassifiers xsi:type="ecore:EClass" name="SoftwareComponent" eSuperTypes="Descartes-core.ecore#//Entity">
<eStructuralFeatures xsi:type="ecore:EReference" name="trafficSources" upperBound="-1"
eType="#//TrafficSource" containment="true" eOpposite="#//TrafficSource/softwareComponent"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="deployedOn" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//Node"/>
+ eType="ecore:EClass DNI-NetworkStructure.ecore#//Node"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TrafficSource" eSuperTypes="../../edu.kit.ipd.descartes.dni.commons/model/DNIcore.ecore#//AddressableEntity">
+ <eClassifiers xsi:type="ecore:EClass" name="TrafficSource" eSuperTypes="DNI-Core.ecore#//AddressableEntity">
<eStructuralFeatures xsi:type="ecore:EReference" name="workload" lowerBound="1"
upperBound="-1" eType="#//Workload" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="softwareComponent" lowerBound="1"
@@ -59,21 +59,21 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="intern" lowerBound="1"
upperBound="-1" eType="#//AbstractAction" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="numBranches" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="LoopAction" eSuperTypes="#//AbstractAction">
<eStructuralFeatures xsi:type="ecore:EReference" name="intern" lowerBound="1"
eType="#//AbstractAction" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="numIterations" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SequenceAction" eSuperTypes="#//AbstractAction">
<eStructuralFeatures xsi:type="ecore:EReference" name="intern" lowerBound="1"
upperBound="-1" eType="#//AbstractAction" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="numSlots" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="StartAction" eSuperTypes="#//AbstractAction"/>
@@ -83,7 +83,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WaitAction" eSuperTypes="#//AbstractAction">
<eStructuralFeatures xsi:type="ecore:EReference" name="waitTime" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.commons/model/DNIDependency.ecore#//Dependency"
+ eType="ecore:EClass DNI-Dependency.ecore#//Dependency"
containment="true"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/metamodels/DNI-Root.ecore b/metamodels/DNI-Root.ecore
index 3006a60b..163d4ab1 100644
--- a/metamodels/DNI-Root.ecore
+++ b/metamodels/DNI-Root.ecore
@@ -3,13 +3,13 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="dniroot" nsURI="http://dniroot/1.0" nsPrefix="dniroot">
<eClassifiers xsi:type="ecore:EClass" name="NetworkInfrastructure">
<eStructuralFeatures xsi:type="ecore:EReference" name="traffic" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.traffic2/model/NetworkTraffic2.ecore#//NetworkTraffic"
+ eType="ecore:EClass DNI-NetworkTraffic.ecore#//NetworkTraffic"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="structure" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.structure/model/NetworkStructure.ecore#//NetworkStructure"
+ eType="ecore:EClass DNI-NetworkStructure.ecore#//NetworkStructure"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="configuration" lowerBound="1"
- eType="ecore:EClass ../../edu.kit.ipd.descartes.dni.configuration/model/NetworkConfiguration.ecore#//NetworkConfiguration"
+ eType="ecore:EClass DNI-NetworkConfiguration.ecore#//NetworkConfiguration"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
eType="#//ExperimentParam" containment="true"/>
--
GitLab