From ec004bf07171112d9541ae4c3da5bb539a6ad032 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Fri, 4 Jul 2014 09:33:08 +0000
Subject: [PATCH] switch to ObservationRepository

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16149 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
 Examples/SEAMS_Case_Study/MetricTypes.xmi    |  7 +++++++
 Examples/SEAMS_Case_Study/default.properties | 12 ++----------
 Examples/SEAMS_Case_Study/pull.properties    | 12 ++----------
 3 files changed, 11 insertions(+), 20 deletions(-)
 create mode 100644 Examples/SEAMS_Case_Study/MetricTypes.xmi

diff --git a/Examples/SEAMS_Case_Study/MetricTypes.xmi b/Examples/SEAMS_Case_Study/MetricTypes.xmi
new file mode 100644
index 00000000..23e64013
--- /dev/null
+++ b/Examples/SEAMS_Case_Study/MetricTypes.xmi
@@ -0,0 +1,7 @@
+<?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="DefaultMetricTypes">
+  <metricTypes id="2" name="Vm1Utilization"/>
+  <metricTypes id="22" name="Vm2Utilization"/>
+  <metricTypes id="3" name="CV_EJB_AvgResponseTime"/>
+  <metricTypes id="4" name="Purchase_AvgResponseTime"/>
+</perfdatarepo:PerformanceDataRepository>
diff --git a/Examples/SEAMS_Case_Study/default.properties b/Examples/SEAMS_Case_Study/default.properties
index 3883da57..fd2d3260 100644
--- a/Examples/SEAMS_Case_Study/default.properties
+++ b/Examples/SEAMS_Case_Study/default.properties
@@ -1,15 +1,7 @@
-#process.name=SEAMS_PushPull-v2
-#adaptationprocess.instance=../edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/pushPullProcess.adaptation
-#perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
-#perfdatarepo.instance=../edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/simucom-simulationResults.perfdatarepo
-#process.maxiterations=2
-## The list of triggering events can be found in EventTypeEnum.java
-#event.type=SlaViolatedEvent
-
 process.name=SEAMS_PushPull-v1
 adaptationprocess.instance=../Examples/SEAMS_Case_Study/pushpull.adaptation
-perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
-perfdatarepo.instance=../Examples/SEAMS_Case_Study/simucomresults.perfdatarepo
+perfdatarepo.metamodel=edu.kit.ipd.descartes.ql.models.repository.ObservationRepository
+perfdatarepo.instance=../Examples/SEAMS_Case_Study/simucomresults.observationrepo
 process.maxiterations=3
 # The list of triggering events can be found in EventTypeEnum.java
 event.type=SlaViolatedEvent
diff --git a/Examples/SEAMS_Case_Study/pull.properties b/Examples/SEAMS_Case_Study/pull.properties
index f23c783f..c62f9122 100644
--- a/Examples/SEAMS_Case_Study/pull.properties
+++ b/Examples/SEAMS_Case_Study/pull.properties
@@ -1,15 +1,7 @@
-#process.name=SEAMS_PushPull-v2
-#adaptationprocess.instance=../edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/pushPullProcess.adaptation
-#perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
-#perfdatarepo.instance=../edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/simucom-simulationResults.perfdatarepo
-#process.maxiterations=2
-## The list of triggering events can be found in EventTypeEnum.java
-#event.type=SlaViolatedEvent
-
 process.name=SEAMS_PushPull-v1
 adaptationprocess.instance=../Examples/SEAMS_Case_Study/pushpull.adaptation
-perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
-perfdatarepo.instance=../Examples/SEAMS_Case_Study/simucomresults.perfdatarepo
+perfdatarepo.metamodel=edu.kit.ipd.descartes.ql.models.repository.ObservationRepository
+perfdatarepo.instance=../Examples/SEAMS_Case_Study/simucomresults.observationrepo
 process.maxiterations=3
 # The list of triggering events can be found in EventTypeEnum.java
 event.type=ScheduledOptimizationEvent
-- 
GitLab