splitting project into several packages

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

edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF

@@ -11,10 +11,10 @@ Require-Bundle: edu.kit.ipd.descartes.mm.resourcelandscape;bundle-version="1.0.0
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: edu.kit.ipd.descartes.adaptation.evaluation.performance,
- edu.kit.ipd.descartes.adaptation.modeladaptor,
- edu.kit.ipd.descartes.adaptation.modeladaptor.dmm,
- edu.kit.ipd.descartes.adaptation.modeladaptor.dmm.util,
- edu.kit.ipd.descartes.adaptation.modelrepository,
+ edu.kit.ipd.descartes.adaptation.model.adaptation,
+ edu.kit.ipd.descartes.adaptation.model.adaptation.dmm,
+ edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util,
+ edu.kit.ipd.descartes.adaptation.model.repository,
  edu.kit.ipd.descartes.ql.core.engine.query,
  edu.kit.ipd.descartes.ql.lang.descartesQL,
  edu.kit.ipd.descartes.ql.models.mapping.domain,
@@ -23,4 +23,5 @@ Import-Package: edu.kit.ipd.descartes.adaptation.evaluation.performance,
  org.apache.log4j;version="1.2.15",
  org.eclipse.emf.ecore.xmi,
  org.eclipse.emf.ecore.xmi.impl
-Export-Package: edu.kit.ipd.descartes.adaptation
+Export-Package: edu.kit.ipd.descartes.adaptation,
+ edu.kit.ipd.descartes.adaptation.exceptions

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

@@ -14,13 +14,13 @@ import org.eclipse.emf.ecore.xmi.DanglingHREFException;
 import edu.kit.ipd.descartes.adaptation.evaluation.performance.IEvaluator;
 import edu.kit.ipd.descartes.adaptation.evaluation.performance.WeightingFunctionEvaluator;
 import edu.kit.ipd.descartes.adaptation.event.EventTypeEnum;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.DmmModelActionHandler;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.ObjectivesHelper;
 import edu.kit.ipd.descartes.adaptation.model.analysis.IModelAnalyzer;
 import edu.kit.ipd.descartes.adaptation.model.analysis.pcm.PcmModelAnalyzer;
-import edu.kit.ipd.descartes.adaptation.modelrepository.AdaptationProcessModelLoader;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.dmm.DmmModelActionHandler;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.dmm.util.ObjectivesHelper;
 import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.IPerformanceDataRepositoryHandler;
 import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryHandlerFactory;
+import edu.kit.ipd.descartes.adaptation.model.repository.AdaptationProcessModelLoader;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationProcess;
 import edu.kit.ipd.descartes.mm.adaptation.Event;
 import edu.kit.ipd.descartes.mm.adaptation.Strategy;

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

@@ -10,10 +10,10 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.change.ChangeDescription;
 
 import edu.kit.ipd.descartes.adaptation.exceptions.InvalidAdaptationPlan;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.dmm.util.OclEvaluationHelper;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.IActionHandler;
-import edu.kit.ipd.descartes.adaptation.modeladaptor.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.modelrepository.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.IActionHandler;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.OperationNotPerformedException;
+import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper;
+import edu.kit.ipd.descartes.adaptation.model.repository.AdaptationProcessModelLoader;
 import edu.kit.ipd.descartes.adaptation.util.BlueYonderExperimentTracker;
 import edu.kit.ipd.descartes.adaptation.util.IObserver;
 import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement;

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java

@@ -6,8 +6,8 @@ import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.URI;
 
 import edu.kit.ipd.descartes.adaptation.TacticsHistory;
-import edu.kit.ipd.descartes.adaptation.modelrepository.AbstractEcoreModelLoader;
-import edu.kit.ipd.descartes.adaptation.modelrepository.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.AbstractEcoreModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.AdaptationProcessModelLoader;
 import edu.kit.ipd.descartes.adaptation.util.BlueYonderExperimentTracker;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
 import edu.kit.ipd.descartes.perfdatarepo.Impact;

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryModelLoader.java

@@ -6,7 +6,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
-import edu.kit.ipd.descartes.adaptation.modelrepository.AbstractEcoreModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.AbstractEcoreModelLoader;
 import edu.kit.ipd.descartes.ql.models.repository.RepositoryPackage;
 
 public class ObservationRepositoryModelLoader extends AbstractEcoreModelLoader {

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryModelLoader.java

@@ -7,7 +7,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
-import edu.kit.ipd.descartes.adaptation.modelrepository.AbstractEcoreModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.AbstractEcoreModelLoader;
 import edu.kit.ipd.descartes.perfdatarepo.PerfdatarepoPackage;
 import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository;