diff --git a/Examples/BY_Case_Study/multiple_customers/by-multiple_customers.adaptation b/Examples/BY_Case_Study/multiple_customers/by-multiple_customers.adaptation
index 52ddb976d55655c691ea58e01823dd6cdb4a93db..e1ff7efcb6ad518e5d44bc84874b2608e099311a 100644
--- a/Examples/BY_Case_Study/multiple_customers/by-multiple_customers.adaptation
+++ b/Examples/BY_Case_Study/multiple_customers/by-multiple_customers.adaptation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" id="_c_OSsOesEeK-n49tvUhS6w" name="BY-MultipleCustomersTradeOff">
+<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/1.0" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" id="_c_OSsOesEeK-n49tvUhS6w" name="BY-MultipleCustomersTradeOff">
<tactics id="_MhuwEOetEeK-n49tvUhS6w" name="IncreaseResourcesOfCustomerB">
<implementedPlan id="_PIaecOetEeK-n49tvUhS6w" name="IncreaseResourcesOfCustomerB-Plan">
<steps xsi:type="adaptation:StartAction" id="_PYrIAOetEeK-n49tvUhS6w" successor="_QGM8ZOetEeK-n49tvUhS6w"/>
diff --git a/Examples/BY_Case_Study/multiple_customers/by.containerrepository b/Examples/BY_Case_Study/multiple_customers/by.containerrepository
index 5b5fa1ecd76395a09bd298d25a5c6b5259cb905f..aa8d07f51d16a5cc22f46d90f2ddac6ae0a08a9f 100644
--- a/Examples/BY_Case_Study/multiple_customers/by.containerrepository
+++ b/Examples/BY_Case_Study/multiple_customers/by.containerrepository
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_mc2QMJB3EeKmfoqNH_-HEA" name="BY Container Templates">
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_mc2QMJB3EeKmfoqNH_-HEA" name="BY Container Templates">
<templates id="_o9GmcJB3EeKmfoqNH_-HEA" name="2-core Machine">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="_CxbgIJB4EeKmfoqNH_-HEA" name="2core CPU">
<processingResourceSpecifications id="_H1srQJB4EeKmfoqNH_-HEA" name="2core CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="2700.0">
diff --git a/Examples/BY_Case_Study/multiple_customers/by.resourcelandscape b/Examples/BY_Case_Study/multiple_customers/by.resourcelandscape
index c091f8f697759ecaf3f0221d776942e13ef8ac63..f2f03ba6e92c3a98adba110ea691e8a73e25a6ee 100644
--- a/Examples/BY_Case_Study/multiple_customers/by.resourcelandscape
+++ b/Examples/BY_Case_Study/multiple_customers/by.resourcelandscape
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_WG-N8JB3EeKmfoqNH_-HEA" name="BY-DDC">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_WG-N8JB3EeKmfoqNH_-HEA" name="BY-DDC">
<consistsOf id="_XkjmQJB3EeKmfoqNH_-HEA" name="BY-KA-DC">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_ZmPKIJB3EeKmfoqNH_-HEA" name="desc1">
<contains id="_6UU3gNKPEeKB3qo-HjaSBw" name="PredictionServer1-CustomerA" ofClass="MIDDLEWARE">
diff --git a/Examples/BY_Case_Study/multiple_customers/default.adaptationpoints b/Examples/BY_Case_Study/multiple_customers/default.adaptationpoints
index e8b4c976d16ccb69b15cdd2fb13f2234e1b9f5af..2a9794b2d008b232fbdae81498a5b66a513268ef 100644
--- a/Examples/BY_Case_Study/multiple_customers/default.adaptationpoints
+++ b/Examples/BY_Case_Study/multiple_customers/default.adaptationpoints
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_7XQlUKElEeKDl52Xojo4CQ" name="Blue Yonder System Adaptation Points">
+<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_7XQlUKElEeKDl52Xojo4CQ" name="Blue Yonder System Adaptation Points">
<adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="__wIDAKElEeKDl52Xojo4CQ" name="PredictionServer-CustomerA-Deployment">
<variationPossibility xsi:type="adaptationpoints:SetOfConfigurations">
<variants xsi:type="resourcelandscape:ComputingInfrastructure" href="by.resourcelandscape#_ZmPKIJB3EeKmfoqNH_-HEA"/>
diff --git a/Examples/BY_Case_Study/multiple_customers/default.resourcetype b/Examples/BY_Case_Study/multiple_customers/default.resourcetype
index b304da21876af180ac951f45402a01034971f9ae..f927342e58ba47b72eeffe22cc84a37373793e73 100644
--- a/Examples/BY_Case_Study/multiple_customers/default.resourcetype
+++ b/Examples/BY_Case_Study/multiple_customers/default.resourcetype
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/0.1">
+<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/1.0">
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_3ql5IJB4EeKmfoqNH_-HEA" name="CPU"/>
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_52tLYJB4EeKmfoqNH_-HEA" name="DELAY"/>
</resourcetype:ResourceTypeRepository>
diff --git a/Examples/BY_Case_Study/multiple_customers/metrictypes.xmi b/Examples/BY_Case_Study/multiple_customers/metrictypes.xmi
index e29b0a6b8be51424ac233718c3c33952cb164f89..4b6a1c1b783dcf062992ef46382df2b8c87ff606 100644
--- a/Examples/BY_Case_Study/multiple_customers/metrictypes.xmi
+++ b/Examples/BY_Case_Study/multiple_customers/metrictypes.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="DummyPerfDataRepo">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="1" name="DummyPerfDataRepo">
<metricTypes id="2" name="AverageResponseTimeCustomerA"/>
<metricTypes id="_K9snIeLvEeK-n49tvUhS6w" name="AverageResponseTimeCustomerB"/>
<metricTypes id="3" name="OverallUtilizationDesc1"/>
diff --git a/Examples/BY_Case_Study/single_customer/by-single_customer.adaptation b/Examples/BY_Case_Study/single_customer/by-single_customer.adaptation
index 23b611188cc6140ceb5a1ef02e1e20632fb34fbd..f5f40654c87469cf1ecf7fdee110587c14b62687 100644
--- a/Examples/BY_Case_Study/single_customer/by-single_customer.adaptation
+++ b/Examples/BY_Case_Study/single_customer/by-single_customer.adaptation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" id="_zQC7sKEnEeKDl52Xojo4CQ" name="OneCustomerAdaptationProcess">
+<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/1.0" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" id="_zQC7sKEnEeKDl52Xojo4CQ" name="OneCustomerAdaptationProcess">
<tactics id="_2WotoKExEeKCjrPb-bEHhw" name="ConsolidateOnHighEndMachine" inputParams="//@parameters.0">
<implementedPlan id="_5iK1gKExEeKCjrPb-bEHhw" name="MigrationPlan">
<steps xsi:type="adaptation:StartAction" id="_7JRWMKExEeKCjrPb-bEHhw" successor="_GXN34tdBEeKA_67DBF2VSw"/>
diff --git a/Examples/BY_Case_Study/single_customer/by.containerrepository b/Examples/BY_Case_Study/single_customer/by.containerrepository
index f42a9f7bf3d60d9ded9242d3190b3280bc21e8a2..49c208266d46494f717ea04e71c55671608d3da8 100644
--- a/Examples/BY_Case_Study/single_customer/by.containerrepository
+++ b/Examples/BY_Case_Study/single_customer/by.containerrepository
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_mc2QMJB3EeKmfoqNH_-HEA" name="BY Container Templates">
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_mc2QMJB3EeKmfoqNH_-HEA" name="BY Container Templates">
<templates id="_o9GmcJB3EeKmfoqNH_-HEA" name="2-core Machine">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="_CxbgIJB4EeKmfoqNH_-HEA" name="2core CPU">
<processingResourceSpecifications id="_H1srQJB4EeKmfoqNH_-HEA" name="2core CPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="2700.0">
diff --git a/Examples/BY_Case_Study/single_customer/by.resourcelandscape b/Examples/BY_Case_Study/single_customer/by.resourcelandscape
index c293022ebc2600abc91e5a971374631b1297b2d8..655e0bf01b82bc63c806879c8b88ef35b19bf5c9 100644
--- a/Examples/BY_Case_Study/single_customer/by.resourcelandscape
+++ b/Examples/BY_Case_Study/single_customer/by.resourcelandscape
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_WG-N8JB3EeKmfoqNH_-HEA" name="BY-DDC">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_WG-N8JB3EeKmfoqNH_-HEA" name="BY-DDC">
<consistsOf id="_XkjmQJB3EeKmfoqNH_-HEA" name="BY-KA-DC">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_ZmPKIJB3EeKmfoqNH_-HEA" name="desc1">
<template href="by.containerrepository#_o9GmcJB3EeKmfoqNH_-HEA"/>
diff --git a/Examples/BY_Case_Study/single_customer/default.adaptationpoints b/Examples/BY_Case_Study/single_customer/default.adaptationpoints
index c812bd7ec7e768b049c71e7c380a17063b902900..3960c1f7c9b6a733c3c2fb49898a067c8d73763e 100644
--- a/Examples/BY_Case_Study/single_customer/default.adaptationpoints
+++ b/Examples/BY_Case_Study/single_customer/default.adaptationpoints
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_7XQlUKElEeKDl52Xojo4CQ" name="Blue Yonder System Adaptation Points">
+<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_7XQlUKElEeKDl52Xojo4CQ" name="Blue Yonder System Adaptation Points">
<adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="__wIDAKElEeKDl52Xojo4CQ" name="PredictionServerDeployment">
<variationPossibility xsi:type="adaptationpoints:SetOfConfigurations">
<variants xsi:type="resourcelandscape:ComputingInfrastructure" href="by.resourcelandscape#_ZmPKIJB3EeKmfoqNH_-HEA"/>
diff --git a/Examples/BY_Case_Study/single_customer/default.resourcetype b/Examples/BY_Case_Study/single_customer/default.resourcetype
index b304da21876af180ac951f45402a01034971f9ae..f927342e58ba47b72eeffe22cc84a37373793e73 100644
--- a/Examples/BY_Case_Study/single_customer/default.resourcetype
+++ b/Examples/BY_Case_Study/single_customer/default.resourcetype
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/0.1">
+<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/1.0">
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_3ql5IJB4EeKmfoqNH_-HEA" name="CPU"/>
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_52tLYJB4EeKmfoqNH_-HEA" name="DELAY"/>
</resourcetype:ResourceTypeRepository>
diff --git a/Examples/BY_Case_Study/single_customer/metrictypes.xmi b/Examples/BY_Case_Study/single_customer/metrictypes.xmi
index 05337bf2899dc13243c9ff55388e62a8c68bc480..53c106d35621606d0282176c0130645579334397 100644
--- a/Examples/BY_Case_Study/single_customer/metrictypes.xmi
+++ b/Examples/BY_Case_Study/single_customer/metrictypes.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="DummyPerfDataRepo">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="1" name="DummyPerfDataRepo">
<metricTypes id="2" name="AverageResponseTime"/>
<metricTypes id="3" name="OverallUtilizationDesc1"/>
<metricTypes id="4" name="OverallUtilizationDesc2"/>
diff --git a/Examples/DynamicResourceAllocation_Case_Study/acamarcluster.resourcelandscape b/Examples/DynamicResourceAllocation_Case_Study/acamarcluster.resourcelandscape
index 1db12e90805ac6361cd1fcbfa43ce7733ee9be98..419c34225f69fdf331b66172a7afd9741fba8c30 100644
--- a/Examples/DynamicResourceAllocation_Case_Study/acamarcluster.resourcelandscape
+++ b/Examples/DynamicResourceAllocation_Case_Study/acamarcluster.resourcelandscape
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="KitDataCenters">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="KitDataCenters">
<consistsOf id="2" name="AtisDataCenter">
<contains xsi:type="resourcelandscape:CompositeHardwareInfrastructure" id="3" name="AcamarCluster">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="4" name="ClusterNode20">
diff --git a/Examples/DynamicResourceAllocation_Case_Study/default.adaptationpoints b/Examples/DynamicResourceAllocation_Case_Study/default.adaptationpoints
index 366d5526a14be3dc35f4e3299351cada6fdf40c9..e6eb8e449a60715a861d12155410784743de6b05 100644
--- a/Examples/DynamicResourceAllocation_Case_Study/default.adaptationpoints
+++ b/Examples/DynamicResourceAllocation_Case_Study/default.adaptationpoints
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="DynamicResourceAllocation-AdaptationPoints">
+<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="DynamicResourceAllocation-AdaptationPoints">
<adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfvCpus" minValue="2.0" maxValue="4.0">
<adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="default.containerrepository#1341341"/>
</adaptationPoints>
diff --git a/Examples/DynamicResourceAllocation_Case_Study/default.containerrepository b/Examples/DynamicResourceAllocation_Case_Study/default.containerrepository
index a55242158daf8fe1f6f0d3898b1cc5d757ce380d..100c4eab83d18dd352ac8c57b1393acae69fb19e 100644
--- a/Examples/DynamicResourceAllocation_Case_Study/default.containerrepository
+++ b/Examples/DynamicResourceAllocation_Case_Study/default.containerrepository
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="AcamarClusterContainerTemplates">
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="AcamarClusterContainerTemplates">
<templates id="2" name="AppServerVmTemplate">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer">
<processingResourceSpecifications id="235234" name="vCpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
diff --git a/Examples/DynamicResourceAllocation_Case_Study/default.resourcetype b/Examples/DynamicResourceAllocation_Case_Study/default.resourcetype
index b304da21876af180ac951f45402a01034971f9ae..f927342e58ba47b72eeffe22cc84a37373793e73 100644
--- a/Examples/DynamicResourceAllocation_Case_Study/default.resourcetype
+++ b/Examples/DynamicResourceAllocation_Case_Study/default.resourcetype
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/0.1">
+<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/1.0">
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_3ql5IJB4EeKmfoqNH_-HEA" name="CPU"/>
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_52tLYJB4EeKmfoqNH_-HEA" name="DELAY"/>
</resourcetype:ResourceTypeRepository>
diff --git a/Examples/DynamicResourceAllocation_Case_Study/metrictypes.perfdatarepo b/Examples/DynamicResourceAllocation_Case_Study/metrictypes.perfdatarepo
index d1a0231c33ad7e67c57d1024e6a812604dbc2abc..ab9aff0741df0b2961bfeca7cb0dfba2ea16ab50 100644
--- a/Examples/DynamicResourceAllocation_Case_Study/metrictypes.perfdatarepo
+++ b/Examples/DynamicResourceAllocation_Case_Study/metrictypes.perfdatarepo
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="MeasuredPerformanceDataRepository">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="1" name="MeasuredPerformanceDataRepository">
<metricTypes id="2" name="Vm1Utilization"/>
<metricTypes id="22" name="Vm2Utilization"/>
<metricTypes id="3" name="CV_EJB_AvgResponseTime"/>
diff --git a/Examples/DynamicResourceAllocation_Case_Study/pushpull.adaptation b/Examples/DynamicResourceAllocation_Case_Study/pushpull.adaptation
index e6ab6a8c8ed7535fc06334bb65cb68831ebd3bb5..3310c91105a0e804d28defa4f8ed005c101da53d 100644
--- a/Examples/DynamicResourceAllocation_Case_Study/pushpull.adaptation
+++ b/Examples/DynamicResourceAllocation_Case_Study/pushpull.adaptation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_07SqMKaFEeKsaqdh-1smGw" name="PushPullAdaptationProcess">
+<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/1.0" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_07SqMKaFEeKsaqdh-1smGw" name="PushPullAdaptationProcess">
<tactics id="2341234" name="AddResources">
<implementedPlan id="qweqweqwe" name="AddResourcesAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="_PXgN0KaHEeKsaqdh-1smGw" successor="_Qych0qaHEeKsaqdh-1smGw"/>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
index 5aa77659c19c39f4b381a0a1eca417d35beeeed0..644c1b296247ea763db19fa7957ae4518b94686e 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="MyAdaptationPointDescriptions">
+<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="MyAdaptationPointDescriptions">
<adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfCores" minValue="1.0" maxValue="4.0">
<adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="ContainerTemplateRepository.xmi#1341341"/>
</adaptationPoints>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
index 4aa939fe21ec49ee144ea438cefd88401dd8c7ca..a5800b6460c84464570ff9184c4bf9b56616ff46 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="MyTestContainerTemplates">
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="MyTestContainerTemplates">
<templates id="2" name="VM_USA_TEMPLATE">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3" name="CPU_TEMPLATE">
<processingResourceSpecifications id="235234" name="CPU" processingRate="1000.0">
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
index 962348958b2f5d01584fa11c13d75e6a3a2dd204..f493da039f7c5a643ece97c5535e359169fc2fe1 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="q" name="DDC Descartes">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="q" name="DDC Descartes">
<consistsOf id="2" name="TestDataCenterUSA">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="y" name="ComputeNodeUsaOne">
<contains id="2313" name="VM1_USA1" ofClass="OS VM">
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
index c1ea868f21a14480318e36de0905ed054f4f3068..819c07599483bf6f2514a832e5556e3b37ebe42e 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="DummyPerfDataRepo">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="1" name="DummyPerfDataRepo">
<resultHistory id="123" name="ResultTactic1-1" timestamp="2012-12-12T00:00:00.000+0100">
<metricValues id="224123" name="Util" metricType="2" value="0.4"/>
<metricValues id="213123" name="RespTimeGold" metricType="3" value="150.0"/>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
index 1a5555903f44ee3bdec53795b6d70a7d4607a5e3..e56531e73d2d37a817dc4d18ece784dab3b11cb7 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
@@ -3,9 +3,9 @@
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1"
- xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1"
- xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1"
+ xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/1.0"
+ xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0"
+ xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0"
id="q" name="MyTestStaRepo">
<tactics id="2341234"
name="myFirstIncreaseResourceTactic">
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/by.resourcelandscape b/edu.kit.ipd.descartes.adaptation.test/test_models/by.resourcelandscape
index f8029ad033a55430d0a0296894dc97b3b288e5c2..aca1a466ec4aecf501073faa5834da7a4223edd5 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/by.resourcelandscape
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/by.resourcelandscape
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_WG-N8JB3EeKmfoqNH_-HEA" name="BY-DDC">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_WG-N8JB3EeKmfoqNH_-HEA" name="BY-DDC">
<consistsOf id="_XkjmQJB3EeKmfoqNH_-HEA" name="BY-KA-DC">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_ZmPKIJB3EeKmfoqNH_-HEA" name="desc1">
<contains id="_dGV_Id8sEeKphugWfCYfXA" name="RuntimeEnvironmentInstanceOfTemplate_PredictionServerOnDesc1-Copy" ofClass="MIDDLEWARE">
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/acamarcluster.resourcelandscape b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/acamarcluster.resourcelandscape
index 9f7de7c91a07d2bb2d85c9ead14127a734a827df..d78054cba95c7b938b003f2dd2862f77a390a2f6 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/acamarcluster.resourcelandscape
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/acamarcluster.resourcelandscape
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="KitDataCenters">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="KitDataCenters">
<consistsOf id="2" name="AtisDataCenter">
<contains xsi:type="resourcelandscape:CompositeHardwareInfrastructure" id="3" name="AcamarCluster">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="4" name="ClusterNode20">
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.adaptationpoints b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.adaptationpoints
index 42be16fbb868de9bf3d649a3f5620ffcb8eba85c..f349cd6d5c2278d57ac372202fdb9441f38b6cee 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.adaptationpoints
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.adaptationpoints
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="SEAMS-AdaptationPoints">
+<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="SEAMS-AdaptationPoints">
<adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfvCpus" minValue="2.0" maxValue="4.0">
<adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="default.containerrepository#1341341"/>
</adaptationPoints>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.containerrepository b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.containerrepository
index 2c0ea5f3139f890659f86ceb6889ade436252325..95d34cec608ec99cafb1daf126373fbaf10af7fe 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.containerrepository
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.containerrepository
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="AcamarClusterContainerTemplates">
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="AcamarClusterContainerTemplates">
<templates id="2" name="AppServerVmTemplate">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer">
<processingResourceSpecifications id="235234" name="vCpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.resourcetype b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.resourcetype
index b304da21876af180ac951f45402a01034971f9ae..f927342e58ba47b72eeffe22cc84a37373793e73 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.resourcetype
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.resourcetype
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/0.1">
+<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/1.0">
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_3ql5IJB4EeKmfoqNH_-HEA" name="CPU"/>
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_52tLYJB4EeKmfoqNH_-HEA" name="DELAY"/>
</resourcetype:ResourceTypeRepository>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/pushpull.adaptation b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/pushpull.adaptation
index 3acf575792895eaa1bed9750e2954be1d92876af..c17642b646a6c5e8bb9a519e6e7921be75991939 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/pushpull.adaptation
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/pushpull.adaptation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_07SqMKaFEeKsaqdh-1smGw" name="PushPullAdaptationProcess">
+<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/1.0" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_07SqMKaFEeKsaqdh-1smGw" name="PushPullAdaptationProcess">
<tactics id="2341234" name="AddResources">
<implementedPlan id="qweqweqwe" name="AddResourcesAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="_PXgN0KaHEeKsaqdh-1smGw" successor="_Qych0qaHEeKsaqdh-1smGw"/>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/simucomresults.perfdatarepo b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/simucomresults.perfdatarepo
index 5b47c106363d18407541585383c56b0211bf3c66..a35ecafac2315388be5af9ef56b806e058930b93 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/simucomresults.perfdatarepo
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/simucomresults.perfdatarepo
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="MeasuredPerformanceDataRepository">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="1" name="MeasuredPerformanceDataRepository">
<resultHistory id="r1" name="DefaultSystemState" timestamp="2012-12-12T00:00:00.000+0100">
<metricValues id="r1mv1" name="Util" metricType="2" value="0.7"/>
<metricValues id="r1mv2" name="RespTimeGold" metricType="3" value="150.0"/>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo b/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo
index db0bc34701d497b02c8ad9714ecd8a4d16e090a9..66fa630bc933390f7a624dd04061ec49e9ddac84 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="_lnHQQKJ5EeKTD7vQeJ9Ysw">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="_lnHQQKJ5EeKTD7vQeJ9Ysw">
<resultHistory id="R_0" name="RESULT_NUMBER_0" timestamp="2011-01-19T08:39:17.000+0100">
<metricValues id="_loeiMKJ5EeKTD7vQeJ9Ysw" name="Average Response Time of MfgDriver_CreateVehicleEJB [sec]" measuredEntity="_lnylsKJ5EeKTD7vQeJ9Ysw" metricType="_lnbZUKJ5EeKTD7vQeJ9Ysw" value="1.0301963929978"/>
<metricValues id="_lol28KJ5EeKTD7vQeJ9Ysw" name="Average Response Time of DealerDriver_Browse [sec]" measuredEntity="_lnzMwKJ5EeKTD7vQeJ9Ysw" metricType="_lnbZUKJ5EeKTD7vQeJ9Ysw" value="0.004920504308223032"/>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
index 5aa77659c19c39f4b381a0a1eca417d35beeeed0..644c1b296247ea763db19fa7957ae4518b94686e 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="MyAdaptationPointDescriptions">
+<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="MyAdaptationPointDescriptions">
<adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfCores" minValue="1.0" maxValue="4.0">
<adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="ContainerTemplateRepository.xmi#1341341"/>
</adaptationPoints>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
index 4aa939fe21ec49ee144ea438cefd88401dd8c7ca..a5800b6460c84464570ff9184c4bf9b56616ff46 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="MyTestContainerTemplates">
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="MyTestContainerTemplates">
<templates id="2" name="VM_USA_TEMPLATE">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3" name="CPU_TEMPLATE">
<processingResourceSpecifications id="235234" name="CPU" processingRate="1000.0">
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
index 962348958b2f5d01584fa11c13d75e6a3a2dd204..f493da039f7c5a643ece97c5535e359169fc2fe1 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="q" name="DDC Descartes">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="q" name="DDC Descartes">
<consistsOf id="2" name="TestDataCenterUSA">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="y" name="ComputeNodeUsaOne">
<contains id="2313" name="VM1_USA1" ofClass="OS VM">
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
index c1ea868f21a14480318e36de0905ed054f4f3068..819c07599483bf6f2514a832e5556e3b37ebe42e 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="DummyPerfDataRepo">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="1" name="DummyPerfDataRepo">
<resultHistory id="123" name="ResultTactic1-1" timestamp="2012-12-12T00:00:00.000+0100">
<metricValues id="224123" name="Util" metricType="2" value="0.4"/>
<metricValues id="213123" name="RespTimeGold" metricType="3" value="150.0"/>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
index 1a5555903f44ee3bdec53795b6d70a7d4607a5e3..e56531e73d2d37a817dc4d18ece784dab3b11cb7 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
@@ -3,9 +3,9 @@
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1"
- xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1"
- xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1"
+ xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/1.0"
+ xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0"
+ xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0"
id="q" name="MyTestStaRepo">
<tactics id="2341234"
name="myFirstIncreaseResourceTactic">
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/by.resourcelandscape b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/by.resourcelandscape
index f8029ad033a55430d0a0296894dc97b3b288e5c2..aca1a466ec4aecf501073faa5834da7a4223edd5 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/by.resourcelandscape
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/by.resourcelandscape
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_WG-N8JB3EeKmfoqNH_-HEA" name="BY-DDC">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_WG-N8JB3EeKmfoqNH_-HEA" name="BY-DDC">
<consistsOf id="_XkjmQJB3EeKmfoqNH_-HEA" name="BY-KA-DC">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="_ZmPKIJB3EeKmfoqNH_-HEA" name="desc1">
<contains id="_dGV_Id8sEeKphugWfCYfXA" name="RuntimeEnvironmentInstanceOfTemplate_PredictionServerOnDesc1-Copy" ofClass="MIDDLEWARE">
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/acamarcluster.resourcelandscape b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/acamarcluster.resourcelandscape
index 9f7de7c91a07d2bb2d85c9ead14127a734a827df..d78054cba95c7b938b003f2dd2862f77a390a2f6 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/acamarcluster.resourcelandscape
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/acamarcluster.resourcelandscape
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="KitDataCenters">
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="KitDataCenters">
<consistsOf id="2" name="AtisDataCenter">
<contains xsi:type="resourcelandscape:CompositeHardwareInfrastructure" id="3" name="AcamarCluster">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="4" name="ClusterNode20">
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.adaptationpoints b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.adaptationpoints
index 42be16fbb868de9bf3d649a3f5620ffcb8eba85c..f349cd6d5c2278d57ac372202fdb9441f38b6cee 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.adaptationpoints
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.adaptationpoints
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="SEAMS-AdaptationPoints">
+<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="SEAMS-AdaptationPoints">
<adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfvCpus" minValue="2.0" maxValue="4.0">
<adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="default.containerrepository#1341341"/>
</adaptationPoints>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.containerrepository b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.containerrepository
index 2c0ea5f3139f890659f86ceb6889ade436252325..95d34cec608ec99cafb1daf126373fbaf10af7fe 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.containerrepository
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.containerrepository
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="AcamarClusterContainerTemplates">
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="1" name="AcamarClusterContainerTemplates">
<templates id="2" name="AppServerVmTemplate">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer">
<processingResourceSpecifications id="235234" name="vCpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.resourcetype b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.resourcetype
index b304da21876af180ac951f45402a01034971f9ae..f927342e58ba47b72eeffe22cc84a37373793e73 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.resourcetype
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/default.resourcetype
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/0.1">
+<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/1.0">
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_3ql5IJB4EeKmfoqNH_-HEA" name="CPU"/>
<resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_52tLYJB4EeKmfoqNH_-HEA" name="DELAY"/>
</resourcetype:ResourceTypeRepository>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/pushpull.adaptation b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/pushpull.adaptation
index 3acf575792895eaa1bed9750e2954be1d92876af..c17642b646a6c5e8bb9a519e6e7921be75991939 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/pushpull.adaptation
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/pushpull.adaptation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_07SqMKaFEeKsaqdh-1smGw" name="PushPullAdaptationProcess">
+<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/1.0" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/1.0" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/1.0" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/1.0" id="_07SqMKaFEeKsaqdh-1smGw" name="PushPullAdaptationProcess">
<tactics id="2341234" name="AddResources">
<implementedPlan id="qweqweqwe" name="AddResourcesAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="_PXgN0KaHEeKsaqdh-1smGw" successor="_Qych0qaHEeKsaqdh-1smGw"/>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/simucomresults.perfdatarepo b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/simucomresults.perfdatarepo
index 5b47c106363d18407541585383c56b0211bf3c66..a35ecafac2315388be5af9ef56b806e058930b93 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/simucomresults.perfdatarepo
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/objectivesForPull/simucomresults.perfdatarepo
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="MeasuredPerformanceDataRepository">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="1" name="MeasuredPerformanceDataRepository">
<resultHistory id="r1" name="DefaultSystemState" timestamp="2012-12-12T00:00:00.000+0100">
<metricValues id="r1mv1" name="Util" metricType="2" value="0.7"/>
<metricValues id="r1mv2" name="RespTimeGold" metricType="3" value="150.0"/>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo
index db0bc34701d497b02c8ad9714ecd8a4d16e090a9..66fa630bc933390f7a624dd04061ec49e9ddac84 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta.tests/edu.kit.ipd.descartes.adaptation.test/test_models/testPerfDataRepo.perfdatarepo
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="_lnHQQKJ5EeKTD7vQeJ9Ysw">
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/1.0" id="_lnHQQKJ5EeKTD7vQeJ9Ysw">
<resultHistory id="R_0" name="RESULT_NUMBER_0" timestamp="2011-01-19T08:39:17.000+0100">
<metricValues id="_loeiMKJ5EeKTD7vQeJ9Ysw" name="Average Response Time of MfgDriver_CreateVehicleEJB [sec]" measuredEntity="_lnylsKJ5EeKTD7vQeJ9Ysw" metricType="_lnbZUKJ5EeKTD7vQeJ9Ysw" value="1.0301963929978"/>
<metricValues id="_lol28KJ5EeKTD7vQeJ9Ysw" name="Average Response Time of DealerDriver_Browse [sec]" measuredEntity="_lnzMwKJ5EeKTD7vQeJ9Ysw" metricType="_lnbZUKJ5EeKTD7vQeJ9Ysw" value="0.004920504308223032"/>
diff --git a/edu.kit.ipd.descartes.mm.adaptation.sta/src-gen/edu/kit/ipd/descartes/mm/adaptation/sta/validation/AbstractStaLangJavaValidator.java b/edu.kit.ipd.descartes.mm.adaptation.sta/src-gen/edu/kit/ipd/descartes/mm/adaptation/sta/validation/AbstractStaLangJavaValidator.java
index 0d490ddb2749433e03ada69b5e7106bc7fafe60f..823010d0d1fbd54aadaf6d7b78f34837b507b852 100644
--- a/edu.kit.ipd.descartes.mm.adaptation.sta/src-gen/edu/kit/ipd/descartes/mm/adaptation/sta/validation/AbstractStaLangJavaValidator.java
+++ b/edu.kit.ipd.descartes.mm.adaptation.sta/src-gen/edu/kit/ipd/descartes/mm/adaptation/sta/validation/AbstractStaLangJavaValidator.java
@@ -15,9 +15,9 @@ public class AbstractStaLangJavaValidator extends org.eclipse.xtext.validation.A
@Override
protected List<EPackage> getEPackages() {
List<EPackage> result = new ArrayList<EPackage>();
- result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.descartes-research.net/metamodel/adaptation/0.1"));
- result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.descartes-research.net/metamodel/adaptationpoints/0.1"));
- result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.descartes-research.net/metamodel/perfdata/0.1"));
+ result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.descartes-research.net/metamodel/adaptation/1.0"));
+ result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.descartes-research.net/metamodel/adaptationpoints/1.0"));
+ result.add(EPackage.Registry.INSTANCE.getEPackage("http://www.descartes-research.net/metamodel/perfdata/1.0"));
return result;
}