From b417653470ef480c6f8cf44c360804c59df78d93 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 16 Apr 2013 15:50:56 +0000
Subject: [PATCH] fixed file name problems
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11249 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../acamarCluster.resourcelandscape | 20 +++++++++----------
.../SEAMS_Case_Study/default.adaptationpoints | 14 ++++++-------
.../default.containerrepository | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Examples/SEAMS_Case_Study/acamarCluster.resourcelandscape b/Examples/SEAMS_Case_Study/acamarCluster.resourcelandscape
index 6254ddba..e5f7cea3 100644
--- a/Examples/SEAMS_Case_Study/acamarCluster.resourcelandscape
+++ b/Examples/SEAMS_Case_Study/acamarCluster.resourcelandscape
@@ -5,32 +5,32 @@
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="4" name="ClusterNode20">
<contains id="10" name="XenServer">
<contains id="12" name="AppServerVM1" ofClass="OS VM">
- <template href="ContainerTemplateRepo.xmi#2"/>
+ <template href="default.containerrepository#2"/>
</contains>
- <template href="ContainerTemplateRepo.xmi#11"/>
+ <template href="default.containerrepository#11"/>
</contains>
- <template href="ContainerTemplateRepo.xmi#5"/>
+ <template href="default.containerrepository#5"/>
</contains>
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="5" name="ClusterNode19">
<contains id="15" name="XenServer">
- <template href="ContainerTemplateRepo.xmi#11"/>
+ <template href="default.containerrepository#11"/>
</contains>
- <template href="ContainerTemplateRepo.xmi#5"/>
+ <template href="default.containerrepository#5"/>
</contains>
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="6" name="ClusterNode18">
<contains id="25" name="XenServer">
- <template href="ContainerTemplateRepo.xmi#11"/>
+ <template href="default.containerrepository#11"/>
</contains>
- <template href="ContainerTemplateRepo.xmi#5"/>
+ <template href="default.containerrepository#5"/>
</contains>
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="7" name="ClusterNode17">
<contains id="14" name="XenServer">
<contains id="33" name="DatabaseVM" ofClass="OS VM">
- <template href="ContainerTemplateRepo.xmi#555"/>
+ <template href="default.containerrepository#555"/>
</contains>
- <template href="ContainerTemplateRepo.xmi#11"/>
+ <template href="default.containerrepository#11"/>
</contains>
- <template href="ContainerTemplateRepo.xmi#5"/>
+ <template href="default.containerrepository#5"/>
</contains>
</contains>
</consistsOf>
diff --git a/Examples/SEAMS_Case_Study/default.adaptationpoints b/Examples/SEAMS_Case_Study/default.adaptationpoints
index b8e4b30b..4fcca172 100644
--- a/Examples/SEAMS_Case_Study/default.adaptationpoints
+++ b/Examples/SEAMS_Case_Study/default.adaptationpoints
@@ -1,29 +1,29 @@
<?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="SEAMS-AdaptationPoints">
<adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfCores" minValue="2.0" maxValue="4.0">
- <adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="ContainerTemplateRepo.xmi#1341341"/>
+ <adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="default.containerrepository#1341341"/>
</adaptationPoints>
<adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="12312412412" name="NumberOfAppServerVmInstancesPerPhysicalServer">
<variationPossibility xsi:type="adaptationpoints:PropertyRange">
<minValueConstraint oclString="self.containedIn.contains->size()>=1" name="minValueConstraint"/>
<maxValueConstraint oclString="self.containedIn.contains->size()<=2" name="maxValueConstraint"/>
</variationPossibility>
- <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/>
+ <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="acamarCluster.resourcelandscape#12"/>
</adaptationPoints>
<adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="xyz" name="NumberOfMaxAppServers">
<variationPossibility xsi:type="adaptationpoints:PropertyRange">
<minValueConstraint oclString="self.referringContainers->size() >= 1" name="minNumberOfAppServersInDataCenter"/>
<maxValueConstraint oclString="self.referringContainers->size() <= 8" name="maxNumberOfAppServersInDataCenter"/>
</variationPossibility>
- <adaptableEntity xsi:type="containerrepository:ContainerTemplate" href="ContainerTemplateRepo.xmi#2"/>
+ <adaptableEntity xsi:type="containerrepository:ContainerTemplate" href="default.containerrepository#2"/>
</adaptationPoints>
<adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="123321" name="VmMigration">
<variationPossibility xsi:type="adaptationpoints:SetOfConfigurations">
<valueConstraint oclString=""Specify a fancy OCL constraint here"" name="migrationTargetConstraint"/>
- <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="AcamarCluster.xmi#4"/>
- <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="AcamarCluster.xmi#5"/>
- <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="AcamarCluster.xmi#6"/>
+ <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="acamarCluster.resourcelandscape#4"/>
+ <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="acamarCluster.resourcelandscape#5"/>
+ <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="acamarCluster.resourcelandscape#6"/>
</variationPossibility>
- <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/>
+ <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="acamarCluster.resourcelandscape#12"/>
</adaptationPoints>
</adaptationpoints:AdaptationPointDescriptions>
diff --git a/Examples/SEAMS_Case_Study/default.containerrepository b/Examples/SEAMS_Case_Study/default.containerrepository
index b8771b32..2d8e74b6 100644
--- a/Examples/SEAMS_Case_Study/default.containerrepository
+++ b/Examples/SEAMS_Case_Study/default.containerrepository
@@ -6,7 +6,7 @@
<nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="2"/>
</processingResourceSpecifications>
</templateConfig>
- <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/>
+ <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="acamarCluster.resourcelandscape#12"/>
</templates>
<templates id="555" name="DatabaseVmTemplate">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="1231231231" name="CpusDatabase">
--
GitLab