Skip to content

Commit 1f4654d

Browse files
rsfzirsfzi
authored
Removed UI Dependencies from Palladio-Supporting-WorkflowEngine (#15)
* adapted to Palladio-Supporting-WorkflowEngine update site * adapted to moved AbstractPCMWorkflowRunConfiguration * adapted to moved PCMResourceSetPartition * adapted to moved PCMInstance * added generated file to gitignore * adapted to moved PCMSolverWorkflowRunConfiguration * adapted to moved LoadPCMModelsIntoBlackboardJob * reduced dendencies to UI plugins * Revert "adapted to Palladio-Supporting-WorkflowEngine update site" This reverts commit 5c33797.
1 parent 6c6a7ba commit 1f4654d

File tree

22 files changed

+39
-38
lines changed

22 files changed

+39
-38
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
target/
2-
bin/
2+
bin/
3+
.polyglot.*

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
1010
tools.mdsd.probdist.api;bundle-version="1.0.0",
1111
tools.mdsd.probdist.api.apache;bundle-version="1.0.0",
1212
com.google.guava;bundle-version="27.1.0",
13-
org.palladiosimulator.solver;bundle-version="4.2.0",
13+
org.palladiosimulator.solver.core;bundle-version="5.2.1",
1414
org.palladiosimulator.reliability.solver;bundle-version="4.3.0",
1515
de.uka.ipd.sdq.workflow,
1616
de.uka.ipd.sdq.workflow.mdsd;bundle-version="4.3.0",

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/api/UncertaintyBasedReliabilityPredictionConfig.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
1111
import org.eclipse.emf.ecore.util.EcoreUtil;
1212
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
13-
import org.palladiosimulator.analyzer.workflow.blackboard.PCMResourceSetPartition;
14-
import org.palladiosimulator.analyzer.workflow.jobs.LoadPCMModelsIntoBlackboardJob;
13+
import org.palladiosimulator.analyzer.workflow.core.blackboard.PCMResourceSetPartition;
14+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadPCMModelsIntoBlackboardJob;
1515
import org.palladiosimulator.dependability.reliability.uncertainty.UncertaintyPackage;
1616
import org.palladiosimulator.dependability.reliability.uncertainty.UncertaintyRepository;
1717
import org.palladiosimulator.dependability.reliability.uncertainty.solver.jobs.PCMInstanceBuilderJob;
1818
import org.palladiosimulator.dependability.reliability.uncertainty.solver.markov.StateSpaceExplorationStrategy;
19-
import org.palladiosimulator.solver.models.PCMInstance;
20-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
19+
import org.palladiosimulator.solver.core.models.PCMInstance;
20+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
2121

2222
import de.uka.ipd.sdq.workflow.jobs.JobFailedException;
2323
import de.uka.ipd.sdq.workflow.jobs.UserCanceledException;

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/jobs/CsvResultExportJob.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.eclipse.core.runtime.IProgressMonitor;
1313
import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
1414
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
15-
import org.palladiosimulator.analyzer.workflow.blackboard.PCMResourceSetPartition;
16-
import org.palladiosimulator.analyzer.workflow.jobs.LoadPCMModelsIntoBlackboardJob;
15+
import org.palladiosimulator.analyzer.workflow.core.blackboard.PCMResourceSetPartition;
16+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadPCMModelsIntoBlackboardJob;
1717
import org.palladiosimulator.pcm.usagemodel.UsageScenario;
1818

1919
import com.google.common.collect.Lists;

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/jobs/PCMInstanceBuilderJob.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.palladiosimulator.dependability.reliability.uncertainty.solver.jobs;
22

3+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadPCMModelsIntoBlackboardJob;
34
import org.palladiosimulator.analyzer.workflow.jobs.EventsTransformationJob;
45
import org.palladiosimulator.analyzer.workflow.jobs.LoadMiddlewareConfigurationIntoBlackboardJob;
5-
import org.palladiosimulator.analyzer.workflow.jobs.LoadPCMModelsIntoBlackboardJob;
66
import org.palladiosimulator.analyzer.workflow.jobs.ValidatePCMModelsJob;
7-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
7+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
88

99
import de.uka.ipd.sdq.workflow.jobs.ICompositeJob;
1010
import de.uka.ipd.sdq.workflow.jobs.SequentialBlackboardInteractingJob;

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/jobs/ReliabilityPredictionContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.eclipse.emf.common.util.URI;
44
import org.palladiosimulator.dependability.reliability.uncertainty.solver.markov.ReliabilityPredictionResult;
5-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
5+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
66

77
public class ReliabilityPredictionContext {
88

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/jobs/ReliabilityPredictionResultVisualizationJob.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import static org.palladiosimulator.dependability.reliability.uncertainty.solver.util.PredictionResultFormatting.sortByUncertainties;
55

66
import org.eclipse.core.runtime.IProgressMonitor;
7-
import org.palladiosimulator.analyzer.workflow.blackboard.PCMResourceSetPartition;
8-
import org.palladiosimulator.analyzer.workflow.jobs.LoadPCMModelsIntoBlackboardJob;
7+
import org.palladiosimulator.analyzer.workflow.core.blackboard.PCMResourceSetPartition;
8+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadPCMModelsIntoBlackboardJob;
99
import org.palladiosimulator.pcm.usagemodel.UsageScenario;
1010

1111
import de.uka.ipd.sdq.workflow.jobs.CleanupFailedException;

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/jobs/RootReliabilityPredictionRunJob.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.Optional;
44

55
import org.eclipse.emf.common.util.URI;
6-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
6+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
77

88
import de.uka.ipd.sdq.workflow.jobs.SequentialBlackboardInteractingJob;
99
import de.uka.ipd.sdq.workflow.mdsd.blackboard.MDSDBlackboard;

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/jobs/UncertaintyBasedReliabilityPredictionJob.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
import org.eclipse.core.runtime.CoreException;
88
import org.eclipse.debug.core.ILaunchConfiguration;
99
import org.eclipse.emf.common.util.URI;
10+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadModelIntoBlackboardJob;
11+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadPCMModelsIntoBlackboardJob;
1012
import org.palladiosimulator.analyzer.workflow.jobs.EventsTransformationJob;
11-
import org.palladiosimulator.analyzer.workflow.jobs.LoadModelIntoBlackboardJob;
12-
import org.palladiosimulator.analyzer.workflow.jobs.LoadPCMModelsIntoBlackboardJob;
1313
import org.palladiosimulator.analyzer.workflow.jobs.ValidatePCMModelsJob;
1414
import org.palladiosimulator.architecturaltemplates.jobs.RunATJob;
1515
import org.palladiosimulator.architecturaltemplates.jobs.config.ATExtensionConfigurationBuilder;
1616
import org.palladiosimulator.experimentautomation.application.jobs.PrepareBlackboardJob;
17-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
17+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
1818

1919
import de.uka.ipd.sdq.workflow.jobs.ICompositeJob;
2020
import de.uka.ipd.sdq.workflow.jobs.SequentialBlackboardInteractingJob;

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/markov/UncertaintyBasedReliabilityPredictor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import org.palladiosimulator.dependability.reliability.uncertainty.solver.util.ArchitecturalCountermeasureOperator;
1717
import org.palladiosimulator.reliability.solver.pcm2markov.MarkovTransformationResult;
1818
import org.palladiosimulator.reliability.solver.pcm2markov.Pcm2MarkovStrategy;
19-
import org.palladiosimulator.solver.models.PCMInstance;
20-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
19+
import org.palladiosimulator.solver.core.models.PCMInstance;
20+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
2121

2222
import tools.mdsd.probdist.api.apache.util.IProbabilityDistributionRepositoryLookup;
2323
import tools.mdsd.probdist.api.entity.CategoricalValue;

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/markov/UncertaintyResolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.palladiosimulator.pcm.resourceenvironment.LinkingResource;
2525
import org.palladiosimulator.pcm.resourceenvironment.ProcessingResourceSpecification;
2626
import org.palladiosimulator.pcm.seff.ServiceEffectSpecification;
27-
import org.palladiosimulator.solver.models.PCMInstance;
28-
import org.palladiosimulator.solver.transformations.EMFHelper;
27+
import org.palladiosimulator.solver.core.models.PCMInstance;
28+
import org.palladiosimulator.solver.core.transformations.EMFHelper;
2929

3030
import com.google.common.collect.Lists;
3131

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/util/ArchitecturalCountermeasureOperator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.palladiosimulator.envdyn.environment.staticmodel.GroundProbabilisticNetwork;
2525
import org.palladiosimulator.envdyn.environment.staticmodel.GroundRandomVariable;
2626
import org.palladiosimulator.envdyn.environment.staticmodel.LocalProbabilisticNetwork;
27-
import org.palladiosimulator.solver.models.PCMInstance;
27+
import org.palladiosimulator.solver.core.models.PCMInstance;
2828

2929
import com.google.common.collect.Lists;
3030

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.solver/src/org/palladiosimulator/dependability/reliability/uncertainty/solver/util/ArchitecturalPreconditionUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.palladiosimulator.dependability.reliability.uncertainty.ArchitecturalPrecondition;
77
import org.palladiosimulator.dependability.reliability.uncertainty.UncertaintyInducedFailureType;
88
import org.palladiosimulator.dependability.reliability.uncertainty.precondition.ArchitecturalPreconditionManager;
9-
import org.palladiosimulator.solver.models.PCMInstance;
9+
import org.palladiosimulator.solver.core.models.PCMInstance;
1010

1111
public class ArchitecturalPreconditionUtil {
1212

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.ui/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
88
org.eclipse.core.runtime,
99
org.eclipse.debug.core,
1010
org.eclipse.debug.ui,
11-
org.palladiosimulator.solver,
11+
org.palladiosimulator.solver;bundle-version="5.2.1",
1212
org.palladiosimulator.reliability.solver,
1313
org.palladiosimulator.analyzer.workflow;bundle-version="4.3.0",
1414
de.uka.ipd.sdq.workflow.mdsd;bundle-version="4.3.0",

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty.ui/src/org/palladiosimulator/dependability/reliability/uncertainty/ui/launch/ReliabilityPredictionLaunchConfigurationDelegate.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
1717
import org.palladiosimulator.dependability.reliability.uncertainty.solver.jobs.UncertaintyBasedReliabilityPredictionJob;
1818
import org.palladiosimulator.reliability.solver.runconfig.PCMSolverReliabilityLaunchConfigurationDelegate;
19-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
19+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
2020

2121
import de.uka.ipd.sdq.workflow.jobs.IJob;
2222
import tools.mdsd.probdist.api.apache.util.IProbabilityDistributionRepositoryLookup;

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
2222
de.uka.ipd.sdq.stoex;visibility:=reexport,
2323
de.uka.ipd.sdq.units;visibility:=reexport,
2424
org.eclipse.core.runtime,
25-
org.palladiosimulator.solver,
25+
org.palladiosimulator.solver.core;bundle-version="5.2.1",
2626
com.google.guava;bundle-version="27.1.0",
2727
tools.mdsd.probdist.api,
2828
org.palladiosimulator.pcm;bundle-version="5.0.0";visibility:=reexport

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty/src/org/palladiosimulator/dependability/reliability/uncertainty/precondition/ActiveComponentChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.palladiosimulator.dependability.reliability.uncertainty.ArchitecturalPrecondition;
88
import org.palladiosimulator.pcm.core.composition.AssemblyContext;
99
import org.palladiosimulator.pcm.core.entity.InterfaceProvidingRequiringEntity;
10-
import org.palladiosimulator.solver.models.PCMInstance;
10+
import org.palladiosimulator.solver.core.models.PCMInstance;
1111

1212
public class ActiveComponentChecker implements ArchitecturalPreconditionChecker {
1313

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty/src/org/palladiosimulator/dependability/reliability/uncertainty/precondition/ArchitecturalPreconditionChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.palladiosimulator.dependability.reliability.uncertainty.precondition;
22

33
import org.palladiosimulator.dependability.reliability.uncertainty.ArchitecturalPrecondition;
4-
import org.palladiosimulator.solver.models.PCMInstance;
4+
import org.palladiosimulator.solver.core.models.PCMInstance;
55

66
public interface ArchitecturalPreconditionChecker {
77

‎bundles/org.palladiosimulator.dependability.reliability.uncertainty/src/org/palladiosimulator/dependability/reliability/uncertainty/precondition/UncertaintyModelEqualityChecker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.palladiosimulator.envdyn.environment.staticmodel.GroundRandomVariable;
99
import org.palladiosimulator.envdyn.environment.staticmodel.LocalProbabilisticNetwork;
1010
import org.palladiosimulator.envdyn.environment.templatevariable.DependenceRelation;
11-
import org.palladiosimulator.solver.models.PCMInstance;
11+
import org.palladiosimulator.solver.core.models.PCMInstance;
1212

1313
import com.google.common.collect.Lists;
1414

‎tests/org.palladiosimulator.dependability.reliability.uncertainty.solver.tests/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Require-Bundle: org.junit,
99
org.junit.jupiter.api,
1010
org.palladiosimulator.dependability.reliability.uncertainty.solver;bundle-version="5.2.0",
1111
org.palladiosimulator.analyzer.workflow;bundle-version="4.3.0",
12-
org.palladiosimulator.solver;bundle-version="4.3.0",
12+
org.palladiosimulator.solver.core;bundle-version="5.2.1",
1313
de.uka.ipd.sdq.workflow.mdsd,
1414
org.palladiosimulator.reliability.solver,
1515
org.palladiosimulator.pcm;bundle-version="4.3.0",

‎tests/org.palladiosimulator.dependability.reliability.uncertainty.solver.tests/test/org/palladiosimulator/dependability/reliability/uncertainty/solver/tests/ReliabilityPredictionTestDefinition.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
import org.eclipse.core.runtime.NullProgressMonitor;
1515
import org.eclipse.emf.common.util.URI;
16-
import org.palladiosimulator.analyzer.workflow.ConstantsContainer;
17-
import org.palladiosimulator.analyzer.workflow.blackboard.PCMResourceSetPartition;
16+
import org.palladiosimulator.analyzer.workflow.core.ConstantsContainer;
17+
import org.palladiosimulator.analyzer.workflow.core.blackboard.PCMResourceSetPartition;
18+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadModelIntoBlackboardJob;
19+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadPCMModelsIntoBlackboardJob;
1820
import org.palladiosimulator.analyzer.workflow.jobs.EventsTransformationJob;
19-
import org.palladiosimulator.analyzer.workflow.jobs.LoadModelIntoBlackboardJob;
20-
import org.palladiosimulator.analyzer.workflow.jobs.LoadPCMModelsIntoBlackboardJob;
2121
import org.palladiosimulator.analyzer.workflow.jobs.ValidatePCMModelsJob;
2222
import org.palladiosimulator.dependability.reliability.uncertainty.solver.api.UncertaintyBasedReliabilityPrediction;
2323
import org.palladiosimulator.dependability.reliability.uncertainty.solver.api.UncertaintyBasedReliabilityPredictionConfig;
@@ -31,8 +31,8 @@
3131
import org.palladiosimulator.experimentautomation.application.jobs.PrepareBlackboardJob;
3232
import org.palladiosimulator.reliability.solver.pcm2markov.MarkovTransformationResult;
3333
import org.palladiosimulator.reliability.solver.pcm2markov.Pcm2MarkovStrategy;
34-
import org.palladiosimulator.solver.models.PCMInstance;
35-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
34+
import org.palladiosimulator.solver.core.models.PCMInstance;
35+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
3636

3737
import com.google.common.collect.Lists;
3838

‎tests/org.palladiosimulator.dependability.reliability.uncertainty.solver.tests/test/org/palladiosimulator/dependability/reliability/uncertainty/solver/tests/util/PCMTestInstanceBuilderJob.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.palladiosimulator.dependability.reliability.uncertainty.solver.tests.util;
22

3+
import org.palladiosimulator.analyzer.workflow.core.jobs.LoadPCMModelsIntoBlackboardJob;
34
import org.palladiosimulator.analyzer.workflow.jobs.EventsTransformationJob;
45
import org.palladiosimulator.analyzer.workflow.jobs.LoadMiddlewareConfigurationIntoBlackboardJob;
5-
import org.palladiosimulator.analyzer.workflow.jobs.LoadPCMModelsIntoBlackboardJob;
66
import org.palladiosimulator.analyzer.workflow.jobs.ValidatePCMModelsJob;
7-
import org.palladiosimulator.solver.runconfig.PCMSolverWorkflowRunConfiguration;
7+
import org.palladiosimulator.solver.core.runconfig.PCMSolverWorkflowRunConfiguration;
88

99
import de.uka.ipd.sdq.workflow.jobs.ICompositeJob;
1010
import de.uka.ipd.sdq.workflow.jobs.SequentialBlackboardInteractingJob;

0 commit comments

Comments
 (0)