diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/BranchContexts.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/BranchContexts.java similarity index 98% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/BranchContexts.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/BranchContexts.java index 4102426eab..61f71f562b 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/BranchContexts.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/BranchContexts.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.entities; +package io.cloudslang.orchestrator.entities; import org.apache.commons.lang.Validate; import org.apache.commons.lang.builder.EqualsBuilder; diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/ExecutionObjEntity.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionObjEntity.java similarity index 96% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/ExecutionObjEntity.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionObjEntity.java index 279072858a..c51568fa8f 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/ExecutionObjEntity.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionObjEntity.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.entities; +package io.cloudslang.orchestrator.entities; import io.cloudslang.facade.entities.Execution; diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/ExecutionState.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionState.java similarity index 98% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/ExecutionState.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionState.java index 0836ee38fb..93c9c73ec4 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/ExecutionState.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/ExecutionState.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.entities; +package io.cloudslang.orchestrator.entities; import io.cloudslang.facade.execution.ExecutionStatus; import io.cloudslang.facade.execution.ExecutionSummary; diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/FinishedBranch.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/FinishedBranch.java similarity index 98% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/FinishedBranch.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/FinishedBranch.java index e3032f7ca3..2c052b14d8 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/FinishedBranch.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/FinishedBranch.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.entities; +package io.cloudslang.orchestrator.entities; import io.cloudslang.engine.data.AbstractIdentifiable; import org.apache.commons.lang.builder.EqualsBuilder; diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/Message.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/Message.java similarity index 96% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/Message.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/Message.java index 8eced9ab22..36c4f1f8f9 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/Message.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/Message.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.entities; +package io.cloudslang.orchestrator.entities; import java.io.Serializable; import java.util.List; diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/SplitMessage.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SplitMessage.java similarity index 98% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/SplitMessage.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SplitMessage.java index e9ba36bafa..4026b2a78f 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/SplitMessage.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SplitMessage.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.entities; +package io.cloudslang.orchestrator.entities; import io.cloudslang.facade.entities.Execution; import org.apache.commons.lang.Validate; diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/SuspendedExecution.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SuspendedExecution.java similarity index 98% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/SuspendedExecution.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SuspendedExecution.java index 07d7e471f8..d8ea78201a 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/entities/SuspendedExecution.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/entities/SuspendedExecution.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.entities; +package io.cloudslang.orchestrator.entities; import io.cloudslang.facade.entities.Execution; import io.cloudslang.engine.data.AbstractIdentifiable; diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/CancelExecutionService.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/CancelExecutionService.java similarity index 100% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/CancelExecutionService.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/CancelExecutionService.java diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/ExecutionStateService.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/ExecutionStateService.java similarity index 100% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/ExecutionStateService.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/ExecutionStateService.java diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/OrchestratorDispatcherService.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/OrchestratorDispatcherService.java similarity index 100% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/OrchestratorDispatcherService.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/OrchestratorDispatcherService.java diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/PauseResumeService.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/PauseResumeService.java similarity index 100% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/PauseResumeService.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/PauseResumeService.java diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/ScorePauseResume.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/ScorePauseResume.java similarity index 100% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/ScorePauseResume.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/ScorePauseResume.java diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/ScoreTriggering.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/ScoreTriggering.java similarity index 100% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/ScoreTriggering.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/ScoreTriggering.java diff --git a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/SplitJoinService.java b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/SplitJoinService.java similarity index 94% rename from engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/SplitJoinService.java rename to engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/SplitJoinService.java index 79f8f3ee68..2dc0bcc48a 100644 --- a/engine/orchestrator/score-orchestrator-api/src/main/java/org/openscore/orchestrator/services/SplitJoinService.java +++ b/engine/orchestrator/score-orchestrator-api/src/main/java/io/cloudslang/orchestrator/services/SplitJoinService.java @@ -8,10 +8,10 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.entities.Execution; -import org.openscore.orchestrator.entities.SplitMessage; +import io.cloudslang.orchestrator.entities.SplitMessage; import java.util.List; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/ExecutionStateRepository.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepository.java similarity index 92% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/ExecutionStateRepository.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepository.java index 262c34286a..578d243008 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/ExecutionStateRepository.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepository.java @@ -8,10 +8,10 @@ * *******************************************************************************/ -package org.openscore.orchestrator.repositories; +package io.cloudslang.orchestrator.repositories; import io.cloudslang.facade.execution.ExecutionStatus; -import org.openscore.orchestrator.entities.ExecutionState; +import io.cloudslang.orchestrator.entities.ExecutionState; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/FinishedBranchRepository.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/FinishedBranchRepository.java similarity index 86% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/FinishedBranchRepository.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/FinishedBranchRepository.java index 0d8384bdbf..87d528b688 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/FinishedBranchRepository.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/FinishedBranchRepository.java @@ -8,9 +8,9 @@ * *******************************************************************************/ -package org.openscore.orchestrator.repositories; +package io.cloudslang.orchestrator.repositories; -import org.openscore.orchestrator.entities.FinishedBranch; +import io.cloudslang.orchestrator.entities.FinishedBranch; import org.springframework.data.jpa.repository.JpaRepository; /** diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/RunningExecutionPlanRepository.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/RunningExecutionPlanRepository.java similarity index 97% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/RunningExecutionPlanRepository.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/RunningExecutionPlanRepository.java index 3254e92f43..4a6dff1ffb 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/RunningExecutionPlanRepository.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/RunningExecutionPlanRepository.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.repositories; +package io.cloudslang.orchestrator.repositories; import io.cloudslang.facade.entities.RunningExecutionPlan; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/SuspendedExecutionsRepository.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionsRepository.java similarity index 90% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/SuspendedExecutionsRepository.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionsRepository.java index 98e6a226e9..d6a58d6f34 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/repositories/SuspendedExecutionsRepository.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionsRepository.java @@ -8,9 +8,9 @@ * *******************************************************************************/ -package org.openscore.orchestrator.repositories; +package io.cloudslang.orchestrator.repositories; -import org.openscore.orchestrator.entities.SuspendedExecution; +import io.cloudslang.orchestrator.entities.SuspendedExecution; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/CancelExecutionServiceImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/CancelExecutionServiceImpl.java similarity index 98% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/CancelExecutionServiceImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/CancelExecutionServiceImpl.java index 4fcb03305e..c181f96086 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/CancelExecutionServiceImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/CancelExecutionServiceImpl.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import org.apache.log4j.Logger; import io.cloudslang.engine.queue.entities.ExecStatus; @@ -17,7 +17,7 @@ import io.cloudslang.facade.entities.Execution; import io.cloudslang.facade.execution.ExecutionActionResult; import io.cloudslang.facade.execution.ExecutionStatus; -import org.openscore.orchestrator.entities.ExecutionState; +import io.cloudslang.orchestrator.entities.ExecutionState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ExecutionSerializationUtil.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ExecutionSerializationUtil.java similarity index 97% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ExecutionSerializationUtil.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ExecutionSerializationUtil.java index 7dfb9e7c89..6183517599 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ExecutionSerializationUtil.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ExecutionSerializationUtil.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.entities.Execution; import org.apache.commons.io.IOUtils; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ExecutionStateServiceImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ExecutionStateServiceImpl.java similarity index 97% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ExecutionStateServiceImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ExecutionStateServiceImpl.java index a4fb2c1cf5..2446c818d7 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ExecutionStateServiceImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ExecutionStateServiceImpl.java @@ -8,14 +8,14 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.execution.ExecutionActionException; import io.cloudslang.facade.execution.ExecutionActionResult; import io.cloudslang.facade.execution.ExecutionStatus; import io.cloudslang.facade.entities.Execution; -import org.openscore.orchestrator.entities.ExecutionState; -import org.openscore.orchestrator.repositories.ExecutionStateRepository; +import io.cloudslang.orchestrator.entities.ExecutionState; +import io.cloudslang.orchestrator.repositories.ExecutionStateRepository; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/OrchestratorDispatcherServiceImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/OrchestratorDispatcherServiceImpl.java similarity index 97% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/OrchestratorDispatcherServiceImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/OrchestratorDispatcherServiceImpl.java index 389ffca42f..0bc6a07fd8 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/OrchestratorDispatcherServiceImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/OrchestratorDispatcherServiceImpl.java @@ -8,13 +8,13 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.engine.node.services.WorkerLockService; import io.cloudslang.engine.node.services.WorkerNodeService; import io.cloudslang.engine.queue.entities.ExecutionMessage; import io.cloudslang.engine.queue.services.QueueDispatcherService; -import org.openscore.orchestrator.entities.SplitMessage; +import io.cloudslang.orchestrator.entities.SplitMessage; import org.apache.commons.lang.Validate; import org.apache.log4j.Logger; import org.hamcrest.Matchers; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/RunningExecutionPlanServiceImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/RunningExecutionPlanServiceImpl.java similarity index 97% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/RunningExecutionPlanServiceImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/RunningExecutionPlanServiceImpl.java index 402e29b5e0..2d548cfa14 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/RunningExecutionPlanServiceImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/RunningExecutionPlanServiceImpl.java @@ -8,11 +8,11 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.entities.RunningExecutionPlan; import org.openscore.api.ExecutionPlan; -import org.openscore.orchestrator.repositories.RunningExecutionPlanRepository; +import io.cloudslang.orchestrator.repositories.RunningExecutionPlanRepository; import io.cloudslang.facade.services.RunningExecutionPlanService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreDeprecatedImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreDeprecatedImpl.java similarity index 96% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreDeprecatedImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreDeprecatedImpl.java index 171164a965..217527daba 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreDeprecatedImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreDeprecatedImpl.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import org.openscore.api.ScoreDeprecated; import org.openscore.api.TriggeringProperties; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreImpl.java similarity index 97% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreImpl.java index 218550a583..0c5d0e58ff 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreImpl.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import org.openscore.api.Score; import org.openscore.api.TriggeringProperties; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScorePauseResumeImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScorePauseResumeImpl.java similarity index 94% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScorePauseResumeImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScorePauseResumeImpl.java index 577bcd811a..8aa2d4516d 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScorePauseResumeImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScorePauseResumeImpl.java @@ -8,11 +8,11 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.execution.ExecutionStatus; import io.cloudslang.facade.execution.PauseReason; -import org.openscore.orchestrator.entities.ExecutionState; +import io.cloudslang.orchestrator.entities.ExecutionState; import org.springframework.beans.factory.annotation.Autowired; import java.io.Serializable; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreTriggeringImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreTriggeringImpl.java similarity index 99% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreTriggeringImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreTriggeringImpl.java index b79eb93970..2fed931bf2 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/ScoreTriggeringImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/ScoreTriggeringImpl.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import org.openscore.api.ExecutionPlan; import org.openscore.api.TriggeringProperties; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/SplitJoinServiceImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/SplitJoinServiceImpl.java similarity index 96% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/SplitJoinServiceImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/SplitJoinServiceImpl.java index f8da6a26b7..2514135aa6 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/SplitJoinServiceImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/SplitJoinServiceImpl.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import ch.lambdaj.function.convert.Converter; import org.openscore.api.EndBranchDataContainer; @@ -17,12 +17,12 @@ import io.cloudslang.engine.queue.services.QueueDispatcherService; import io.cloudslang.facade.entities.Execution; import io.cloudslang.facade.execution.ExecutionStatus; -import org.openscore.orchestrator.entities.BranchContexts; -import org.openscore.orchestrator.entities.FinishedBranch; -import org.openscore.orchestrator.entities.SplitMessage; -import org.openscore.orchestrator.entities.SuspendedExecution; -import org.openscore.orchestrator.repositories.FinishedBranchRepository; -import org.openscore.orchestrator.repositories.SuspendedExecutionsRepository; +import io.cloudslang.orchestrator.entities.BranchContexts; +import io.cloudslang.orchestrator.entities.FinishedBranch; +import io.cloudslang.orchestrator.entities.SplitMessage; +import io.cloudslang.orchestrator.entities.SuspendedExecution; +import io.cloudslang.orchestrator.repositories.FinishedBranchRepository; +import io.cloudslang.orchestrator.repositories.SuspendedExecutionsRepository; import org.apache.commons.lang.Validate; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/StubPauseResumeServiceImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/StubPauseResumeServiceImpl.java similarity index 97% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/StubPauseResumeServiceImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/StubPauseResumeServiceImpl.java index c8c7a2765b..609c153f74 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/StubPauseResumeServiceImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/StubPauseResumeServiceImpl.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.execution.ExecutionSummary; import io.cloudslang.facade.execution.PauseReason; diff --git a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/WorkerDbSupportServiceImpl.java b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/WorkerDbSupportServiceImpl.java similarity index 96% rename from engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/WorkerDbSupportServiceImpl.java rename to engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/WorkerDbSupportServiceImpl.java index 8465a137c7..328b92a807 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/main/java/org/openscore/orchestrator/services/WorkerDbSupportServiceImpl.java +++ b/engine/orchestrator/score-orchestrator-impl/src/main/java/io/cloudslang/orchestrator/services/WorkerDbSupportServiceImpl.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.entities.RunningExecutionPlan; import io.cloudslang.facade.services.RunningExecutionPlanService; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/repositories/ExecutionStateRepositoryTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepositoryTest.java similarity index 98% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/repositories/ExecutionStateRepositoryTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepositoryTest.java index 2d2c647a81..b0d3a0730b 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/repositories/ExecutionStateRepositoryTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/ExecutionStateRepositoryTest.java @@ -8,11 +8,11 @@ * *******************************************************************************/ -package org.openscore.orchestrator.repositories; +package io.cloudslang.orchestrator.repositories; import io.cloudslang.facade.execution.ExecutionStatus; import io.cloudslang.engine.data.SimpleHiloIdentifierGenerator; -import org.openscore.orchestrator.entities.ExecutionState; +import io.cloudslang.orchestrator.entities.ExecutionState; import liquibase.integration.spring.SpringLiquibase; import org.apache.commons.dbcp.BasicDataSource; import org.hibernate.ejb.HibernatePersistence; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/repositories/SuspendedExecutionsRepositoryTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionsRepositoryTest.java similarity index 94% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/repositories/SuspendedExecutionsRepositoryTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionsRepositoryTest.java index 0e2e97a7b3..8a3a6828c2 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/repositories/SuspendedExecutionsRepositoryTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/repositories/SuspendedExecutionsRepositoryTest.java @@ -8,13 +8,13 @@ * *******************************************************************************/ -package org.openscore.orchestrator.repositories; +package io.cloudslang.orchestrator.repositories; import io.cloudslang.facade.entities.Execution; -import org.openscore.orchestrator.entities.BranchContexts; -import org.openscore.orchestrator.entities.FinishedBranch; -import org.openscore.orchestrator.entities.SuspendedExecution; -import org.openscore.orchestrator.services.ExecutionSerializationUtil; +import io.cloudslang.orchestrator.entities.BranchContexts; +import io.cloudslang.orchestrator.entities.FinishedBranch; +import io.cloudslang.orchestrator.entities.SuspendedExecution; +import io.cloudslang.orchestrator.services.ExecutionSerializationUtil; import io.cloudslang.engine.data.DataBaseDetector; import io.cloudslang.engine.data.SqlUtils; import org.junit.Assert; @@ -168,7 +168,7 @@ public void findFinishedSuspendedExecutionsNegativeTest(){ @Configuration - @EnableJpaRepositories("org.openscore.orchestrator") + @EnableJpaRepositories("io.cloudslang.orchestrator") @EnableTransactionManagement @ImportResource("META-INF/spring/orchestratorEmfContext.xml") static class Configurator { diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/CancelExecutionServiceTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/CancelExecutionServiceTest.java similarity index 99% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/CancelExecutionServiceTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/CancelExecutionServiceTest.java index 51bff59d02..7e833b63d8 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/CancelExecutionServiceTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/CancelExecutionServiceTest.java @@ -8,14 +8,14 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.engine.queue.entities.ExecutionMessageConverter; import io.cloudslang.engine.queue.services.QueueDispatcherService; import io.cloudslang.facade.entities.Execution; import io.cloudslang.facade.execution.ExecutionActionResult; import io.cloudslang.facade.execution.ExecutionStatus; -import org.openscore.orchestrator.entities.ExecutionState; +import io.cloudslang.orchestrator.entities.ExecutionState; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ExecutionStateServiceTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ExecutionStateServiceTest.java similarity index 99% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ExecutionStateServiceTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ExecutionStateServiceTest.java index b507c552f1..93ede73396 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ExecutionStateServiceTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ExecutionStateServiceTest.java @@ -8,13 +8,13 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.execution.ExecutionStatus; import io.cloudslang.facade.entities.Execution; -import org.openscore.orchestrator.entities.ExecutionState; -import org.openscore.orchestrator.repositories.ExecutionStateRepository; +import io.cloudslang.orchestrator.entities.ExecutionState; +import io.cloudslang.orchestrator.repositories.ExecutionStateRepository; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/OrchestratorDispatcherServiceTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/OrchestratorDispatcherServiceTest.java similarity index 98% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/OrchestratorDispatcherServiceTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/OrchestratorDispatcherServiceTest.java index 2a0aafe9d3..bf53fdf663 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/OrchestratorDispatcherServiceTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/OrchestratorDispatcherServiceTest.java @@ -8,14 +8,14 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.engine.node.entities.WorkerNode; import io.cloudslang.engine.node.services.WorkerLockService; import io.cloudslang.engine.node.services.WorkerNodeService; import io.cloudslang.engine.queue.entities.ExecutionMessage; import io.cloudslang.engine.queue.services.QueueDispatcherService; -import org.openscore.orchestrator.entities.Message; +import io.cloudslang.orchestrator.entities.Message; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/RunningExecutionPlanServiceTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/RunningExecutionPlanServiceTest.java similarity index 96% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/RunningExecutionPlanServiceTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/RunningExecutionPlanServiceTest.java index e61e3fd9f1..838985908f 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/RunningExecutionPlanServiceTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/RunningExecutionPlanServiceTest.java @@ -8,12 +8,12 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.entities.RunningExecutionPlan; import io.cloudslang.facade.services.RunningExecutionPlanService; import org.openscore.api.ExecutionPlan; -import org.openscore.orchestrator.repositories.RunningExecutionPlanRepository; +import io.cloudslang.orchestrator.repositories.RunningExecutionPlanRepository; import junit.framework.Assert; import org.junit.Before; import org.junit.Test; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScorePauseResumeTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScorePauseResumeTest.java similarity index 96% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScorePauseResumeTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScorePauseResumeTest.java index 0cca96c74b..7fba29e71d 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScorePauseResumeTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScorePauseResumeTest.java @@ -8,10 +8,10 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.execution.ExecutionStatus; -import org.openscore.orchestrator.entities.ExecutionState; +import io.cloudslang.orchestrator.entities.ExecutionState; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScoreTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScoreTest.java similarity index 97% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScoreTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScoreTest.java index af1d00d9c8..dbb7877279 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScoreTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScoreTest.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import org.openscore.api.ExecutionPlan; import org.openscore.api.Score; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScoreTriggeringTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScoreTriggeringTest.java similarity index 98% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScoreTriggeringTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScoreTriggeringTest.java index 8edcc4445c..b673c17798 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/ScoreTriggeringTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/ScoreTriggeringTest.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import io.cloudslang.facade.entities.RunningExecutionPlan; import io.cloudslang.facade.services.RunningExecutionPlanService; diff --git a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/SplitJoinServiceTest.java b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/SplitJoinServiceTest.java similarity index 96% rename from engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/SplitJoinServiceTest.java rename to engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/SplitJoinServiceTest.java index 31ddf7c0b9..6b91ca8d50 100644 --- a/engine/orchestrator/score-orchestrator-impl/src/test/java/org/openscore/orchestrator/services/SplitJoinServiceTest.java +++ b/engine/orchestrator/score-orchestrator-impl/src/test/java/io/cloudslang/orchestrator/services/SplitJoinServiceTest.java @@ -8,7 +8,7 @@ * *******************************************************************************/ -package org.openscore.orchestrator.services; +package io.cloudslang.orchestrator.services; import org.openscore.api.EndBranchDataContainer; import io.cloudslang.engine.queue.entities.ExecStatus; @@ -16,12 +16,12 @@ import io.cloudslang.engine.queue.entities.ExecutionMessageConverter; import io.cloudslang.engine.queue.services.QueueDispatcherService; import io.cloudslang.facade.entities.Execution; -import org.openscore.orchestrator.entities.BranchContexts; -import org.openscore.orchestrator.entities.FinishedBranch; -import org.openscore.orchestrator.entities.SplitMessage; -import org.openscore.orchestrator.entities.SuspendedExecution; -import org.openscore.orchestrator.repositories.FinishedBranchRepository; -import org.openscore.orchestrator.repositories.SuspendedExecutionsRepository; +import io.cloudslang.orchestrator.entities.BranchContexts; +import io.cloudslang.orchestrator.entities.FinishedBranch; +import io.cloudslang.orchestrator.entities.SplitMessage; +import io.cloudslang.orchestrator.entities.SuspendedExecution; +import io.cloudslang.orchestrator.repositories.FinishedBranchRepository; +import io.cloudslang.orchestrator.repositories.SuspendedExecutionsRepository; import org.openscore.lang.SystemContext; import org.junit.Before; import org.junit.Test; diff --git a/engine/queue/score-queue-api/src/main/java/io/cloudslang/engine/queue/entities/ExecutionMessage.java b/engine/queue/score-queue-api/src/main/java/io/cloudslang/engine/queue/entities/ExecutionMessage.java index 94ede7b0cb..6c3d4e7561 100644 --- a/engine/queue/score-queue-api/src/main/java/io/cloudslang/engine/queue/entities/ExecutionMessage.java +++ b/engine/queue/score-queue-api/src/main/java/io/cloudslang/engine/queue/entities/ExecutionMessage.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.cloudslang.engine.node.entities.WorkerNode; import io.cloudslang.facade.entities.Execution; -import org.openscore.orchestrator.entities.Message; +import io.cloudslang.orchestrator.entities.Message; import org.apache.commons.lang.builder.EqualsBuilder; import java.util.Arrays; diff --git a/engine/queue/score-queue-api/src/test/java/io/cloudslang/engine/queue/entities/ExecutionMessageTests.java b/engine/queue/score-queue-api/src/test/java/io/cloudslang/engine/queue/entities/ExecutionMessageTests.java index 6fa0057142..3249c55126 100644 --- a/engine/queue/score-queue-api/src/test/java/io/cloudslang/engine/queue/entities/ExecutionMessageTests.java +++ b/engine/queue/score-queue-api/src/test/java/io/cloudslang/engine/queue/entities/ExecutionMessageTests.java @@ -10,7 +10,7 @@ package io.cloudslang.engine.queue.entities; -import org.openscore.orchestrator.entities.Message; +import io.cloudslang.orchestrator.entities.Message; import org.junit.Test; import java.util.Arrays; diff --git a/engine/queue/score-queue-impl/src/main/java/io/cloudslang/engine/queue/services/QueueListenerImpl.java b/engine/queue/score-queue-impl/src/main/java/io/cloudslang/engine/queue/services/QueueListenerImpl.java index 8e9e1998ef..d3dacc8bdf 100644 --- a/engine/queue/score-queue-impl/src/main/java/io/cloudslang/engine/queue/services/QueueListenerImpl.java +++ b/engine/queue/score-queue-impl/src/main/java/io/cloudslang/engine/queue/services/QueueListenerImpl.java @@ -17,9 +17,9 @@ import io.cloudslang.facade.entities.Execution; import io.cloudslang.facade.execution.ExecutionSummary; import io.cloudslang.facade.execution.PauseReason; -import org.openscore.orchestrator.services.ExecutionStateService; -import org.openscore.orchestrator.services.PauseResumeService; -import org.openscore.orchestrator.services.SplitJoinService; +import io.cloudslang.orchestrator.services.ExecutionStateService; +import io.cloudslang.orchestrator.services.PauseResumeService; +import io.cloudslang.orchestrator.services.SplitJoinService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; diff --git a/engine/queue/score-queue-impl/src/test/java/io/cloudslang/engine/queue/services/QueueListenerImplTest.java b/engine/queue/score-queue-impl/src/test/java/io/cloudslang/engine/queue/services/QueueListenerImplTest.java index 87c2d0d2cb..ab91b7b0b8 100644 --- a/engine/queue/score-queue-impl/src/test/java/io/cloudslang/engine/queue/services/QueueListenerImplTest.java +++ b/engine/queue/score-queue-impl/src/test/java/io/cloudslang/engine/queue/services/QueueListenerImplTest.java @@ -17,9 +17,9 @@ import io.cloudslang.facade.entities.Execution; import io.cloudslang.facade.execution.ExecutionSummary; import org.openscore.lang.SystemContext; -import org.openscore.orchestrator.services.ExecutionStateService; -import org.openscore.orchestrator.services.PauseResumeService; -import org.openscore.orchestrator.services.SplitJoinService; +import io.cloudslang.orchestrator.services.ExecutionStateService; +import io.cloudslang.orchestrator.services.PauseResumeService; +import io.cloudslang.orchestrator.services.SplitJoinService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/engine/score-engine-jobs/src/main/java/org/openscore/job/ScoreEngineJobsImpl.java b/engine/score-engine-jobs/src/main/java/org/openscore/job/ScoreEngineJobsImpl.java index 26451afc01..07f84d1523 100644 --- a/engine/score-engine-jobs/src/main/java/org/openscore/job/ScoreEngineJobsImpl.java +++ b/engine/score-engine-jobs/src/main/java/org/openscore/job/ScoreEngineJobsImpl.java @@ -13,7 +13,7 @@ import io.cloudslang.engine.queue.services.cleaner.QueueCleanerService; import io.cloudslang.engine.queue.services.recovery.ExecutionRecoveryService; import io.cloudslang.engine.versioning.services.VersionService; -import org.openscore.orchestrator.services.SplitJoinService; +import io.cloudslang.orchestrator.services.SplitJoinService; import io.cloudslang.engine.partitions.services.PartitionTemplate; import org.apache.commons.lang.time.StopWatch; import org.apache.log4j.Logger; diff --git a/package/score-all/src/main/java/org/openscore/schema/EngineBeanDefinitionParser.java b/package/score-all/src/main/java/org/openscore/schema/EngineBeanDefinitionParser.java index 0406795efd..7432f5d64a 100644 --- a/package/score-all/src/main/java/org/openscore/schema/EngineBeanDefinitionParser.java +++ b/package/score-all/src/main/java/org/openscore/schema/EngineBeanDefinitionParser.java @@ -27,21 +27,21 @@ import io.cloudslang.engine.queue.services.recovery.MessageRecoveryServiceImpl; import io.cloudslang.engine.queue.services.recovery.WorkerRecoveryServiceImpl; import io.cloudslang.engine.versioning.services.VersionServiceImpl; -import org.openscore.orchestrator.services.CancelExecutionServiceImpl; -import org.openscore.orchestrator.services.ExecutionSerializationUtil; -import org.openscore.orchestrator.services.OrchestratorDispatcherServiceImpl; -import org.openscore.orchestrator.services.RunningExecutionPlanServiceImpl; -import org.openscore.orchestrator.services.SplitJoinServiceImpl; -import org.openscore.orchestrator.services.StubPauseResumeServiceImpl; -import org.openscore.orchestrator.services.WorkerDbSupportServiceImpl; +import io.cloudslang.orchestrator.services.CancelExecutionServiceImpl; +import io.cloudslang.orchestrator.services.ExecutionSerializationUtil; +import io.cloudslang.orchestrator.services.OrchestratorDispatcherServiceImpl; +import io.cloudslang.orchestrator.services.RunningExecutionPlanServiceImpl; +import io.cloudslang.orchestrator.services.SplitJoinServiceImpl; +import io.cloudslang.orchestrator.services.StubPauseResumeServiceImpl; +import io.cloudslang.orchestrator.services.WorkerDbSupportServiceImpl; import io.cloudslang.engine.partitions.services.PartitionCallback; import io.cloudslang.engine.partitions.services.PartitionServiceImpl; import io.cloudslang.engine.partitions.services.PartitionTemplateImpl; import io.cloudslang.engine.partitions.services.PartitionUtils; -import org.openscore.orchestrator.services.ScoreDeprecatedImpl; -import org.openscore.orchestrator.services.ScoreImpl; -import org.openscore.orchestrator.services.ScorePauseResumeImpl; -import org.openscore.orchestrator.services.ScoreTriggeringImpl; +import io.cloudslang.orchestrator.services.ScoreDeprecatedImpl; +import io.cloudslang.orchestrator.services.ScoreImpl; +import io.cloudslang.orchestrator.services.ScorePauseResumeImpl; +import io.cloudslang.orchestrator.services.ScoreTriggeringImpl; import io.cloudslang.engine.data.DataBaseDetector; import io.cloudslang.engine.data.HiloFactoryBean; import io.cloudslang.engine.data.SqlInQueryReader; @@ -49,7 +49,7 @@ import org.openscore.job.ScoreEngineJobsImpl; import org.openscore.schema.context.ScoreDatabaseContext; import org.openscore.schema.context.ScoreDefaultDatasourceContext; -import org.openscore.orchestrator.services.ExecutionStateServiceImpl; +import io.cloudslang.orchestrator.services.ExecutionStateServiceImpl; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/package/score-all/src/main/resources/META-INF/spring/score/context/scoreRepositoryContext.xml b/package/score-all/src/main/resources/META-INF/spring/score/context/scoreRepositoryContext.xml index 9c5c71f70c..af702eb5db 100644 --- a/package/score-all/src/main/resources/META-INF/spring/score/context/scoreRepositoryContext.xml +++ b/package/score-all/src/main/resources/META-INF/spring/score/context/scoreRepositoryContext.xml @@ -11,12 +11,12 @@ - - + + - - - + + + diff --git a/score-tests/src/test/java/org/openscore/schema/WorkerTest.java b/score-tests/src/test/java/org/openscore/schema/WorkerTest.java index e34b977869..ea85fd1b53 100644 --- a/score-tests/src/test/java/org/openscore/schema/WorkerTest.java +++ b/score-tests/src/test/java/org/openscore/schema/WorkerTest.java @@ -25,9 +25,9 @@ import io.cloudslang.engine.queue.services.QueueDispatcherService; import io.cloudslang.engine.queue.services.QueueStateIdGeneratorService; import io.cloudslang.engine.queue.services.ScoreEventFactory; -import org.openscore.orchestrator.services.CancelExecutionService; -import org.openscore.orchestrator.services.OrchestratorDispatcherService; -import org.openscore.orchestrator.services.PauseResumeService; +import io.cloudslang.orchestrator.services.CancelExecutionService; +import io.cloudslang.orchestrator.services.OrchestratorDispatcherService; +import io.cloudslang.orchestrator.services.PauseResumeService; import org.openscore.worker.management.services.WorkerManager; import org.openscore.worker.management.services.dbsupport.WorkerDbSupportService; diff --git a/worker/worker-execution/score-worker-execution-impl/src/main/java/org/openscore/worker/execution/services/ExecutionServiceImpl.java b/worker/worker-execution/score-worker-execution-impl/src/main/java/org/openscore/worker/execution/services/ExecutionServiceImpl.java index 2422932bb6..f2ef981e43 100644 --- a/worker/worker-execution/score-worker-execution-impl/src/main/java/org/openscore/worker/execution/services/ExecutionServiceImpl.java +++ b/worker/worker-execution/score-worker-execution-impl/src/main/java/org/openscore/worker/execution/services/ExecutionServiceImpl.java @@ -23,7 +23,7 @@ import io.cloudslang.facade.execution.ExecutionSummary; import io.cloudslang.facade.execution.PauseReason; import org.openscore.lang.SystemContext; -import org.openscore.orchestrator.services.PauseResumeService; +import io.cloudslang.orchestrator.services.PauseResumeService; import org.openscore.worker.execution.reflection.ReflectionAdapter; import org.openscore.worker.management.WorkerConfigurationService; import org.openscore.worker.management.services.dbsupport.WorkerDbSupportService; diff --git a/worker/worker-execution/score-worker-execution-impl/src/test/java/org/openscore/worker/execution/services/ExecutionServiceTest.java b/worker/worker-execution/score-worker-execution-impl/src/test/java/org/openscore/worker/execution/services/ExecutionServiceTest.java index 7e5cb5b65c..bf946f691e 100644 --- a/worker/worker-execution/score-worker-execution-impl/src/test/java/org/openscore/worker/execution/services/ExecutionServiceTest.java +++ b/worker/worker-execution/score-worker-execution-impl/src/test/java/org/openscore/worker/execution/services/ExecutionServiceTest.java @@ -21,8 +21,8 @@ import io.cloudslang.facade.execution.ExecutionStatus; import io.cloudslang.facade.execution.ExecutionSummary; import io.cloudslang.facade.execution.PauseReason; -import org.openscore.orchestrator.services.CancelExecutionService; -import org.openscore.orchestrator.services.PauseResumeService; +import io.cloudslang.orchestrator.services.CancelExecutionService; +import io.cloudslang.orchestrator.services.PauseResumeService; import org.openscore.worker.execution.reflection.ReflectionAdapter; import org.openscore.worker.management.WorkerConfigurationService; import org.openscore.worker.management.services.WorkerRecoveryManager; diff --git a/worker/worker-manager/score-worker-manager-api/src/main/java/org/openscore/worker/management/services/OutboundBuffer.java b/worker/worker-manager/score-worker-manager-api/src/main/java/org/openscore/worker/management/services/OutboundBuffer.java index cf641bc683..4f68e0a8c5 100644 --- a/worker/worker-manager/score-worker-manager-api/src/main/java/org/openscore/worker/management/services/OutboundBuffer.java +++ b/worker/worker-manager/score-worker-manager-api/src/main/java/org/openscore/worker/management/services/OutboundBuffer.java @@ -10,7 +10,7 @@ package org.openscore.worker.management.services; -import org.openscore.orchestrator.entities.Message; +import io.cloudslang.orchestrator.entities.Message; /** * User: zruya diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/WorkerConfigurationServiceImpl.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/WorkerConfigurationServiceImpl.java index 8dbc22b263..b5a8362196 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/WorkerConfigurationServiceImpl.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/WorkerConfigurationServiceImpl.java @@ -17,8 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired; import io.cloudslang.engine.node.services.WorkerNodeService; -import org.openscore.orchestrator.services.CancelExecutionService; -import org.openscore.orchestrator.services.PauseResumeService; +import io.cloudslang.orchestrator.services.CancelExecutionService; +import io.cloudslang.orchestrator.services.PauseResumeService; /** * @author kravtsov diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/services/OutboundBufferImpl.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/services/OutboundBufferImpl.java index f0045462cc..906ce6bd41 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/services/OutboundBufferImpl.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/services/OutboundBufferImpl.java @@ -11,8 +11,8 @@ package org.openscore.worker.management.services; import ch.lambdaj.group.Group; -import org.openscore.orchestrator.entities.Message; -import org.openscore.orchestrator.services.OrchestratorDispatcherService; +import io.cloudslang.orchestrator.entities.Message; +import io.cloudslang.orchestrator.services.OrchestratorDispatcherService; import org.apache.commons.lang.Validate; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/services/SimpleExecutionRunnable.java b/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/services/SimpleExecutionRunnable.java index 8d8ac776e1..6ad5769ebb 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/services/SimpleExecutionRunnable.java +++ b/worker/worker-manager/score-worker-manager-impl/src/main/java/org/openscore/worker/management/services/SimpleExecutionRunnable.java @@ -18,7 +18,7 @@ import io.cloudslang.engine.queue.services.QueueStateIdGeneratorService; import io.cloudslang.facade.TempConstants; import io.cloudslang.facade.entities.Execution; -import org.openscore.orchestrator.entities.SplitMessage; +import io.cloudslang.orchestrator.entities.SplitMessage; import org.openscore.worker.execution.services.ExecutionService; import org.openscore.worker.management.WorkerConfigurationService; import org.apache.commons.lang.StringUtils; diff --git a/worker/worker-manager/score-worker-manager-impl/src/test/java/org/openscore/worker/management/services/OutboundBufferTest.java b/worker/worker-manager/score-worker-manager-impl/src/test/java/org/openscore/worker/management/services/OutboundBufferTest.java index 5be36dcacf..f9a2630509 100644 --- a/worker/worker-manager/score-worker-manager-impl/src/test/java/org/openscore/worker/management/services/OutboundBufferTest.java +++ b/worker/worker-manager/score-worker-manager-impl/src/test/java/org/openscore/worker/management/services/OutboundBufferTest.java @@ -10,8 +10,8 @@ package org.openscore.worker.management.services; -import org.openscore.orchestrator.entities.Message; -import org.openscore.orchestrator.services.OrchestratorDispatcherService; +import io.cloudslang.orchestrator.entities.Message; +import io.cloudslang.orchestrator.services.OrchestratorDispatcherService; import junit.framework.Assert; import org.apache.log4j.Logger; import org.junit.Before; @@ -20,7 +20,6 @@ import org.mockito.ArgumentMatcher; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.openscore.worker.management.services.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;