changed property types

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11585 9e42b895-fcda-4063-8a3b-11be15eb1bbd

edu.kit.ipd.descartes.adaptation/default.properties

-#processName=AdaptationEngine
-#adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+#process.name=AdaptationEngine
+#adaptationprocess.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
 #perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
 #perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
-#maxIterations=2
+#process.maxiterations=2
 ## The list of triggering events can be found in AdaptationControl.java
-#eventType=
+#event.type=
 
-processName=SEAMS_PushPull-v1
-adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/pushpull.adaptation
+process.name=SEAMS_PushPull-v1
+adaptationprocess.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/pushpull.adaptation
 perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
 perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo
-maxIterations=2
+process.maxiterations=2
 # The list of triggering events can be found in AdaptationControl.java
-eventType=SlaViolatedEvent
+event.type=SlaViolatedEvent
 
-#processName=BlueYonderTestAdaptationProcess
-#adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/runtime-EclipseApplication/by_dmm-model/testprocess.adaptation
+#process.name=BlueYonderTestAdaptationProcess
+#adaptationprocess.instance=/Users/nhuber/Documents/workspace/descartes/runtime-EclipseApplication/by_dmm-model/testprocess.adaptation
 #perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
 #perfdatarepo.instance=../Examples/SEAMS_Case_Study/simucom-simulationResults.perfdatarepo
-#maxIterations=1
+#process.maxiterations=1
 ### The list of triggering events can be found in AdaptationControl.java
-#eventType=BottleneckFoundEvent
+#event.type=BottleneckFoundEvent
 
-#processName=SEAMS_PushPull-v2
-#adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/pushPullProcess.adaptation
+#process.name=SEAMS_PushPull-v2
+#adaptationprocess.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/pushPullProcess.adaptation
 #perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository
 #perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/simucom-simulationResults.perfdatarepo
-#maxIterations=2
+#process.maxiterations=2
 ## The list of triggering events can be found in AdaptationControl.java
-#eventType=SlaViolatedEvent
\ No newline at end of file
+#event.type=SlaViolatedEvent
\ No newline at end of file

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java

@@ -49,12 +49,12 @@ public class AdaptationControl {
     }
 
     private static final String DEFAULT_PROP_FILE_PATH = "./default.properties";
-    private static final String PROP_ADAPTATION_PROCESS_XMI_FILE_PATH_NAME = "adaptationProcessModel";
+    private static final String PROP_ADAPTATION_PROCESS_XMI_FILE_PATH_NAME = "adaptationprocess.instance";
     private static final String PROP_PERF_DATA_REPO_XMI_FILE_PATH_NAME = "perfdatarepo.instance";
     private static final String PROP_PERF_DATA_REPO_METAMODEL_TYPE = "perfdatarepo.metamodel";
-    private static final String PROP_ADAPTATION_PROCESS_NAME = "processName";
-    private static final String PROP_MAX_ITERATIONS = "maxIterations";
-    private static final String PROP_TRIGGERING_EVENT_TYPE = "eventType";
+    private static final String PROP_ADAPTATION_PROCESS_NAME = "process.name";
+    private static final String PROP_MAX_ITERATIONS = "process.maxiterations";
+    private static final String PROP_TRIGGERING_EVENT_TYPE = "event.type";
 
     private static Logger logger = Logger.getLogger(AdaptationControl.class);