Merge branch 'main' into additional_repo_info

PalladioSimulator · May 29, 2024 · 0120356 · 0120356
2 parents cc5fd85 + a0c1cb3
commit 0120356
Show file tree

Hide file tree

Showing 59 changed files with 150 additions and 1,030 deletions.
diff --git a/bundles/org.palladiosimulator.retriever.core/META-INF/MANIFEST.MF b/bundles/org.palladiosimulator.retriever.core/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.jdt.core,
  org.palladiosimulator.generator.fluent,
  org.palladiosimulator.somox.ast2seff,
  org.palladiosimulator.retriever.mocore,
- org.palladiosimulator.view.plantuml.generator
+ org.palladiosimulator.view.plantuml.generator,
+ org.palladiosimulator.retriever.services
 Export-Package: org.palladiosimulator.retriever.core.cli;uses:="org.eclipse.equinox.app",
  org.palladiosimulator.retriever.core.configuration,
  org.palladiosimulator.retriever.core.main,

diff --git a/bundles/org.palladiosimulator.retriever.core/plugin.xml b/bundles/org.palladiosimulator.retriever.core/plugin.xml
@@ -41,7 +41,7 @@
 	<extension
 		id="org.palladiosimulator.retriever.core.service.performance_analyst"
 		name="Performance Analyst"
-		point="org.palladiosimulator.retriever.extraction.analyst">
+		point="org.palladiosimulator.retriever.services.analyst">
 		<analyst
 			class="org.palladiosimulator.retriever.core.service.PerformanceAnalyst">
 		</analyst>

diff --git a/...tor.retriever.core/src/org/palladiosimulator/retriever/core/cli/RetrieverApplication.java b/...tor.retriever.core/src/org/palladiosimulator/retriever/core/cli/RetrieverApplication.java
@@ -22,11 +22,11 @@
 import org.palladiosimulator.retriever.core.service.DiscovererCollection;
 import org.palladiosimulator.retriever.core.service.RuleCollection;
 import org.palladiosimulator.retriever.core.workflow.RetrieverJob;
-import org.palladiosimulator.retriever.extraction.engine.Analyst;
-import org.palladiosimulator.retriever.extraction.engine.Discoverer;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
-import org.palladiosimulator.retriever.extraction.engine.Rule;
-import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
+import org.palladiosimulator.retriever.services.Analyst;
+import org.palladiosimulator.retriever.services.Discoverer;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.Rule;
+import org.palladiosimulator.retriever.services.ServiceConfiguration;
 
 public class RetrieverApplication implements IApplication {
 

diff --git a/....core/src/org/palladiosimulator/retriever/core/configuration/RetrieverBlackboardKeys.java b/....core/src/org/palladiosimulator/retriever/core/configuration/RetrieverBlackboardKeys.java
@@ -1,6 +1,6 @@
 package org.palladiosimulator.retriever.core.configuration;
 
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 
 public final class RetrieverBlackboardKeys {
     private static final String CONFIG_PREFIX = "org.palladiosimulator.retriever.core.configuration.";

diff --git a/...re/src/org/palladiosimulator/retriever/core/configuration/RetrieverConfigurationImpl.java b/...re/src/org/palladiosimulator/retriever/core/configuration/RetrieverConfigurationImpl.java
@@ -11,13 +11,13 @@
 import org.palladiosimulator.retriever.core.service.DiscovererCollection;
 import org.palladiosimulator.retriever.core.service.EmptyCollection;
 import org.palladiosimulator.retriever.core.service.RuleCollection;
-import org.palladiosimulator.retriever.extraction.engine.Analyst;
-import org.palladiosimulator.retriever.extraction.engine.Discoverer;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
-import org.palladiosimulator.retriever.extraction.engine.Rule;
-import org.palladiosimulator.retriever.extraction.engine.Service;
-import org.palladiosimulator.retriever.extraction.engine.ServiceCollection;
-import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
+import org.palladiosimulator.retriever.services.Analyst;
+import org.palladiosimulator.retriever.services.Discoverer;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.Rule;
+import org.palladiosimulator.retriever.services.Service;
+import org.palladiosimulator.retriever.services.ServiceCollection;
+import org.palladiosimulator.retriever.services.ServiceConfiguration;
 
 import de.uka.ipd.sdq.workflow.configuration.AbstractComposedJobConfiguration;
 

diff --git a/...rc/org/palladiosimulator/retriever/core/configuration/RetrieverWorkflowConfiguration.java b/...rc/org/palladiosimulator/retriever/core/configuration/RetrieverWorkflowConfiguration.java
@@ -1,6 +1,6 @@
 package org.palladiosimulator.retriever.core.configuration;
 
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
 
 import de.uka.ipd.sdq.workflow.launchconfig.AbstractWorkflowBasedRunConfiguration;
 

diff --git a/...iosimulator.retriever.core/src/org/palladiosimulator/retriever/core/gui/RetrieverTab.java b/...iosimulator.retriever.core/src/org/palladiosimulator/retriever/core/gui/RetrieverTab.java
@@ -22,11 +22,11 @@
 import org.palladiosimulator.retriever.core.service.DiscovererCollection;
 import org.palladiosimulator.retriever.core.service.EmptyCollection;
 import org.palladiosimulator.retriever.core.service.RuleCollection;
-import org.palladiosimulator.retriever.extraction.engine.Analyst;
-import org.palladiosimulator.retriever.extraction.engine.Discoverer;
-import org.palladiosimulator.retriever.extraction.engine.Rule;
-import org.palladiosimulator.retriever.extraction.engine.ServiceCollection;
-import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
+import org.palladiosimulator.retriever.services.Analyst;
+import org.palladiosimulator.retriever.services.Discoverer;
+import org.palladiosimulator.retriever.services.Rule;
+import org.palladiosimulator.retriever.services.ServiceCollection;
+import org.palladiosimulator.retriever.services.ServiceConfiguration;
 
 import de.uka.ipd.sdq.workflow.launchconfig.ImageRegistryHelper;
 import de.uka.ipd.sdq.workflow.launchconfig.LaunchConfigPlugin;

diff --git a/...riever.core/src/org/palladiosimulator/retriever/core/gui/ServiceConfigurationManager.java b/...riever.core/src/org/palladiosimulator/retriever/core/gui/ServiceConfigurationManager.java
@@ -6,8 +6,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.palladiosimulator.retriever.extraction.engine.Service;
-import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
+import org.palladiosimulator.retriever.services.Service;
+import org.palladiosimulator.retriever.services.ServiceConfiguration;
 
 import de.uka.ipd.sdq.workflow.launchconfig.LaunchConfigPlugin;
 

diff --git a/...retriever.core/src/org/palladiosimulator/retriever/core/gui/ServiceConfigurationView.java b/...retriever.core/src/org/palladiosimulator/retriever/core/gui/ServiceConfigurationView.java
@@ -19,8 +19,8 @@
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.swt.widgets.TreeItem;
-import org.palladiosimulator.retriever.extraction.engine.Service;
-import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
+import org.palladiosimulator.retriever.services.Service;
+import org.palladiosimulator.retriever.services.ServiceConfiguration;
 
 public class ServiceConfigurationView<T extends Service> extends ServiceConfigurationManager<T> {
     private static final int SERVICE_CONFIGURATION_VALUE_COLUMN = 1;

diff --git a/...adiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/main/Retriever.java b/...adiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/main/Retriever.java
@@ -15,16 +15,16 @@
 import org.eclipse.emf.common.CommonPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.palladiosimulator.generator.fluent.shared.util.ModelSaver;
 import org.palladiosimulator.generator.fluent.system.api.ISystem;
 import org.palladiosimulator.generator.fluent.system.factory.FluentSystemFactory;
 import org.palladiosimulator.pcm.repository.Repository;
 import org.palladiosimulator.pcm.repository.RepositoryComponent;
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
 import org.palladiosimulator.retriever.extraction.engine.DockerParser;
+import org.palladiosimulator.retriever.extraction.engine.PCMDetector;
 import org.palladiosimulator.retriever.extraction.engine.PCMInstanceCreator;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
-import org.palladiosimulator.retriever.extraction.engine.Rule;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.Rule;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 
 /**
  * Retriever identifies PCM elements like components and interfaces inside source code via rules
@@ -107,7 +107,7 @@ private static void executeWith(final Path projectPath, final Path outPath, fina
 
         // Parses the docker-compose file to get a mapping between microservice names and
         // components for creating composite components for each microservice
-        final DockerParser dockerParser = new DockerParser(projectPath, blackboard.getPCMDetector());
+        final DockerParser dockerParser = new DockerParser(projectPath, (PCMDetector) blackboard.getPCMDetector());
         final Map<String, Set<CompilationUnit>> mapping = dockerParser.getMapping();
 
         pcm = new PCMInstanceCreator(blackboard).createPCM(mapping);

diff --git a/...or.retriever.core/src/org/palladiosimulator/retriever/core/service/AnalystCollection.java b/...or.retriever.core/src/org/palladiosimulator/retriever/core/service/AnalystCollection.java
@@ -7,11 +7,11 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
-import org.palladiosimulator.retriever.extraction.engine.Analyst;
-import org.palladiosimulator.retriever.extraction.engine.ServiceCollection;
+import org.palladiosimulator.retriever.services.Analyst;
+import org.palladiosimulator.retriever.services.ServiceCollection;
 
 public class AnalystCollection implements ServiceCollection<Analyst> {
-    public static final String EXTENSION_POINT = "org.palladiosimulator.retriever.extraction.analyst";
+    public static final String EXTENSION_POINT = "org.palladiosimulator.retriever.services.analyst";
     private final Set<Analyst> analysts = new HashSet<>();
 
     public AnalystCollection() throws CoreException {

diff --git a/...retriever.core/src/org/palladiosimulator/retriever/core/service/DiscovererCollection.java b/...retriever.core/src/org/palladiosimulator/retriever/core/service/DiscovererCollection.java
@@ -8,11 +8,11 @@
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.InvalidRegistryObjectException;
 import org.eclipse.core.runtime.Platform;
-import org.palladiosimulator.retriever.extraction.engine.Discoverer;
-import org.palladiosimulator.retriever.extraction.engine.ServiceCollection;
+import org.palladiosimulator.retriever.services.Discoverer;
+import org.palladiosimulator.retriever.services.ServiceCollection;
 
 public class DiscovererCollection implements ServiceCollection<Discoverer> {
-    public static final String EXTENSION_POINT = "org.palladiosimulator.retriever.extraction.discoverer";
+    public static final String EXTENSION_POINT = "org.palladiosimulator.retriever.services.discoverer";
     private final Set<Discoverer> discoverer = new HashSet<>();
 
     public DiscovererCollection() throws CoreException, InvalidRegistryObjectException {

diff --git a/...ator.retriever.core/src/org/palladiosimulator/retriever/core/service/EmptyCollection.java b/...ator.retriever.core/src/org/palladiosimulator/retriever/core/service/EmptyCollection.java
@@ -3,7 +3,7 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.palladiosimulator.retriever.extraction.engine.ServiceCollection;
+import org.palladiosimulator.retriever.services.ServiceCollection;
 
 public class EmptyCollection<T> implements ServiceCollection<T> {
 

diff --git a/...r.retriever.core/src/org/palladiosimulator/retriever/core/service/PerformanceAnalyst.java b/...r.retriever.core/src/org/palladiosimulator/retriever/core/service/PerformanceAnalyst.java
@@ -4,9 +4,9 @@
 import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
-import org.palladiosimulator.retriever.extraction.engine.Analyst;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.Analyst;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 
 import de.uka.ipd.sdq.workflow.jobs.AbstractBlackboardInteractingJob;
 import de.uka.ipd.sdq.workflow.jobs.CleanupFailedException;

diff --git a/...lator.retriever.core/src/org/palladiosimulator/retriever/core/service/RuleCollection.java b/...lator.retriever.core/src/org/palladiosimulator/retriever/core/service/RuleCollection.java
@@ -6,11 +6,11 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
-import org.palladiosimulator.retriever.extraction.engine.Rule;
-import org.palladiosimulator.retriever.extraction.engine.ServiceCollection;
+import org.palladiosimulator.retriever.services.Rule;
+import org.palladiosimulator.retriever.services.ServiceCollection;
 
 public class RuleCollection implements ServiceCollection<Rule> {
-    public static final String EXTENSION_POINT = "org.palladiosimulator.retriever.extraction.rule";
+    public static final String EXTENSION_POINT = "org.palladiosimulator.retriever.services.rule";
     private final Set<Rule> rules = new HashSet<>();
 
     public RuleCollection() throws CoreException {

diff --git a/...mulator.retriever.core/src/org/palladiosimulator/retriever/core/workflow/PlantUmlJob.java b/...mulator.retriever.core/src/org/palladiosimulator/retriever/core/workflow/PlantUmlJob.java
@@ -17,7 +17,7 @@
 import org.palladiosimulator.pcm.allocation.Allocation;
 import org.palladiosimulator.pcm.repository.Repository;
 import org.palladiosimulator.pcm.system.System;
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 import org.palladiosimulator.view.plantuml.generator.PcmAllocationDiagramGenerator;
 import org.palladiosimulator.view.plantuml.generator.PcmComponentDiagramGenerator;
 import org.palladiosimulator.view.plantuml.generator.PcmSystemDiagramGenerator;

diff --git a/.../src/org/palladiosimulator/retriever/core/workflow/RetrieverBlackboardInteractingJob.java b/.../src/org/palladiosimulator/retriever/core/workflow/RetrieverBlackboardInteractingJob.java
@@ -5,8 +5,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.palladiosimulator.retriever.core.main.Retriever;
 import org.palladiosimulator.retriever.core.main.RetrieverException;
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 
 import de.uka.ipd.sdq.workflow.jobs.AbstractBlackboardInteractingJob;
 import de.uka.ipd.sdq.workflow.jobs.CleanupFailedException;

diff --git a/...ulator.retriever.core/src/org/palladiosimulator/retriever/core/workflow/RetrieverJob.java b/...ulator.retriever.core/src/org/palladiosimulator/retriever/core/workflow/RetrieverJob.java
@@ -5,12 +5,13 @@
 import java.util.List;
 
 import org.palladiosimulator.retriever.core.configuration.RetrieverBlackboardKeys;
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
-import org.palladiosimulator.retriever.extraction.engine.Analyst;
-import org.palladiosimulator.retriever.extraction.engine.Discoverer;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
-import org.palladiosimulator.retriever.extraction.engine.Rule;
+import org.palladiosimulator.retriever.extraction.engine.PCMDetector;
 import org.palladiosimulator.retriever.mocore.workflow.MoCoReJob;
+import org.palladiosimulator.retriever.services.Analyst;
+import org.palladiosimulator.retriever.services.Discoverer;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.Rule;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 import org.palladiosimulator.somox.ast2seff.jobs.Ast2SeffJob;
 
 import de.uka.ipd.sdq.workflow.extension.AbstractExtendableJob;
@@ -20,7 +21,7 @@
 public class RetrieverJob extends AbstractExtendableJob<RetrieverBlackboard> {
 
     public RetrieverJob(final RetrieverConfiguration configuration) {
-        super.setBlackboard(new RetrieverBlackboard());
+        super.setBlackboard(new RetrieverBlackboard(new PCMDetector()));
 
         super.addAll(this.createDiscovererJobs(configuration));
 

diff --git a/bundles/org.palladiosimulator.retriever.extraction.discoverers/META-INF/MANIFEST.MF b/bundles/org.palladiosimulator.retriever.extraction.discoverers/META-INF/MANIFEST.MF
@@ -17,4 +17,5 @@ Require-Bundle: org.palladiosimulator.pcm,
  org.yaml.snakeyaml,
  org.json,
  org.apache.commons.csv,
- org.palladiosimulator.retriever.core
+ org.palladiosimulator.retriever.core,
+ org.palladiosimulator.retriever.services
diff --git a/bundles/org.palladiosimulator.retriever.extraction.discoverers/plugin.xml b/bundles/org.palladiosimulator.retriever.extraction.discoverers/plugin.xml
@@ -4,55 +4,55 @@
 	<extension
 		id="org.palladiosimulator.retriever.extraction.discoverers.csv"
 		name="CSV Discoverer"
-		point="org.palladiosimulator.retriever.extraction.discoverer">
+		point="org.palladiosimulator.retriever.services.discoverer">
 		<discoverer
 			class="org.palladiosimulator.retriever.extraction.discoverers.CsvDiscoverer">
 		</discoverer>
 	</extension>
 	<extension
 		id="org.palladiosimulator.retriever.extraction.discoverers.java"
 		name="Java Discoverer"
-		point="org.palladiosimulator.retriever.extraction.discoverer">
+		point="org.palladiosimulator.retriever.services.discoverer">
 		<discoverer
 			class="org.palladiosimulator.retriever.extraction.discoverers.JavaDiscoverer">
 		</discoverer>
 	</extension>
 	<extension
 		id="org.palladiosimulator.retriever.extraction.discoverers.json"
 		name="JSON Discoverer"
-		point="org.palladiosimulator.retriever.extraction.discoverer">
+		point="org.palladiosimulator.retriever.services.discoverer">
 		<discoverer
 			class="org.palladiosimulator.retriever.extraction.discoverers.JsonDiscoverer">
 		</discoverer>
 	</extension>
 	<extension
 		id="org.palladiosimulator.retriever.extraction.discoverers.xml"
 		name="XML Discoverer"
-		point="org.palladiosimulator.retriever.extraction.discoverer">
+		point="org.palladiosimulator.retriever.services.discoverer">
 		<discoverer
 			class="org.palladiosimulator.retriever.extraction.discoverers.XmlDiscoverer">
 		</discoverer>
 	</extension>
 	<extension
 		id="org.palladiosimulator.retriever.extraction.discoverers.yaml"
 		name="YAML Discoverer"
-		point="org.palladiosimulator.retriever.extraction.discoverer">
+		point="org.palladiosimulator.retriever.services.discoverer">
 		<discoverer
 			class="org.palladiosimulator.retriever.extraction.discoverers.YamlDiscoverer">
 		</discoverer>
 	</extension>
 	<extension
 		id="org.palladiosimulator.retriever.extraction.discoverers.properties"
 		name=".properties Discoverer"
-		point="org.palladiosimulator.retriever.extraction.discoverer">
+		point="org.palladiosimulator.retriever.services.discoverer">
 		<discoverer
 			class="org.palladiosimulator.retriever.extraction.discoverers.PropertiesDiscoverer">
 		</discoverer>
 	</extension>
 	<extension
 		id="org.palladiosimulator.retriever.extraction.discoverers.ecmascript"
 		name="ECMAScript Discoverer"
-		point="org.palladiosimulator.retriever.extraction.discoverer">
+		point="org.palladiosimulator.retriever.services.discoverer">
 		<discoverer
 			class="org.palladiosimulator.retriever.extraction.discoverers.EcmaScriptDiscoverer">
 		</discoverer>

diff --git a/...discoverers/src/org/palladiosimulator/retriever/extraction/discoverers/CsvDiscoverer.java b/...discoverers/src/org/palladiosimulator/retriever/extraction/discoverers/CsvDiscoverer.java
@@ -1,7 +1,5 @@
 package org.palladiosimulator.retriever.extraction.discoverers;
 
-import static org.apache.commons.csv.CSVFormat.DEFAULT;
-
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
@@ -15,12 +13,13 @@
 import java.util.Objects;
 import java.util.Set;
 
+import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVRecord;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.common.CommonPlugin;
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
-import org.palladiosimulator.retriever.extraction.engine.Discoverer;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.Discoverer;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 
 import de.uka.ipd.sdq.workflow.jobs.AbstractBlackboardInteractingJob;
 import de.uka.ipd.sdq.workflow.jobs.CleanupFailedException;
@@ -51,7 +50,7 @@ public void execute(final IProgressMonitor monitor) throws JobFailedException, U
                     .forEach(p -> {
                         final List<CSVRecord> records = new LinkedList<>();
                         try (Reader reader = new FileReader(p.toFile())) {
-                            DEFAULT.parse(reader)
+                            CSVFormat.DEFAULT.parse(reader)
                                 .forEach(records::add);
                         } catch (final IllegalStateException | IOException e) {
                             this.logger.error(String.format("%s could not be read correctly.", p), e);

diff --git a/...rers/src/org/palladiosimulator/retriever/extraction/discoverers/EcmaScriptDiscoverer.java b/...rers/src/org/palladiosimulator/retriever/extraction/discoverers/EcmaScriptDiscoverer.java
@@ -15,9 +15,9 @@
 import org.openjdk.nashorn.api.scripting.NashornException;
 import org.openjdk.nashorn.api.tree.CompilationUnitTree;
 import org.openjdk.nashorn.api.tree.Parser;
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
-import org.palladiosimulator.retriever.extraction.engine.Discoverer;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.Discoverer;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 
 import de.uka.ipd.sdq.workflow.jobs.AbstractBlackboardInteractingJob;
 import de.uka.ipd.sdq.workflow.jobs.CleanupFailedException;

diff --git a/...iscoverers/src/org/palladiosimulator/retriever/extraction/discoverers/JavaDiscoverer.java b/...iscoverers/src/org/palladiosimulator/retriever/extraction/discoverers/JavaDiscoverer.java
@@ -15,9 +15,9 @@
 import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.FileASTRequestor;
-import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
-import org.palladiosimulator.retriever.extraction.engine.Discoverer;
-import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.Discoverer;
+import org.palladiosimulator.retriever.services.RetrieverConfiguration;
+import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
 
 import de.uka.ipd.sdq.workflow.jobs.AbstractBlackboardInteractingJob;
 import de.uka.ipd.sdq.workflow.jobs.CleanupFailedException;