Skip to content

Commit

Permalink
Commit #3
Browse files Browse the repository at this point in the history
  • Loading branch information
Orit Stone committed Mar 24, 2015
1 parent 3671cc8 commit 72689e1
Show file tree
Hide file tree
Showing 55 changed files with 108 additions and 109 deletions.
2 changes: 1 addition & 1 deletion ...orchestrator/entities/BranchContexts.java → ...orchestrator/entities/BranchContexts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...estrator/entities/ExecutionObjEntity.java → ...estrator/entities/ExecutionObjEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*******************************************************************************/

package org.openscore.orchestrator.entities;
package io.cloudslang.orchestrator.entities;

import io.cloudslang.facade.entities.Execution;

Expand Down
2 changes: 1 addition & 1 deletion ...orchestrator/entities/ExecutionState.java → ...orchestrator/entities/ExecutionState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...orchestrator/entities/FinishedBranch.java → ...orchestrator/entities/FinishedBranch.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...nscore/orchestrator/entities/Message.java → ...dslang/orchestrator/entities/Message.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*******************************************************************************/

package org.openscore.orchestrator.entities;
package io.cloudslang.orchestrator.entities;

import java.io.Serializable;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...e/orchestrator/entities/SplitMessage.java → ...g/orchestrator/entities/SplitMessage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...estrator/entities/SuspendedExecution.java → ...estrator/entities/SuspendedExecution.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 ...ator/services/CancelExecutionService.java → ...ator/services/CancelExecutionService.java
View file
File renamed without changes.
0 ...rator/services/ExecutionStateService.java → ...rator/services/ExecutionStateService.java
View file
File renamed without changes.
0 ...rvices/OrchestratorDispatcherService.java → ...rvices/OrchestratorDispatcherService.java
View file
File renamed without changes.
0 ...estrator/services/PauseResumeService.java → ...estrator/services/PauseResumeService.java
View file
File renamed without changes.
0 ...chestrator/services/ScorePauseResume.java → ...chestrator/services/ScorePauseResume.java
View file
File renamed without changes.
0 ...rchestrator/services/ScoreTriggering.java → ...rchestrator/services/ScoreTriggering.java
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...chestrator/services/SplitJoinService.java → ...chestrator/services/SplitJoinService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...epositories/ExecutionStateRepository.java → ...epositories/ExecutionStateRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...epositories/FinishedBranchRepository.java → ...epositories/FinishedBranchRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...ories/RunningExecutionPlanRepository.java → ...ories/RunningExecutionPlanRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...tories/SuspendedExecutionsRepository.java → ...tories/SuspendedExecutionsRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../services/CancelExecutionServiceImpl.java → .../services/CancelExecutionServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion .../services/ExecutionSerializationUtil.java → .../services/ExecutionSerializationUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...r/services/ExecutionStateServiceImpl.java → ...r/services/ExecutionStateServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...es/OrchestratorDispatcherServiceImpl.java → ...es/OrchestratorDispatcherServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ices/RunningExecutionPlanServiceImpl.java → ...ices/RunningExecutionPlanServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...strator/services/ScoreDeprecatedImpl.java → ...strator/services/ScoreDeprecatedImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*******************************************************************************/

package org.openscore.orchestrator.services;
package io.cloudslang.orchestrator.services;

import org.openscore.api.ScoreDeprecated;
import org.openscore.api.TriggeringProperties;
Expand Down
2 changes: 1 addition & 1 deletion ...core/orchestrator/services/ScoreImpl.java → ...lang/orchestrator/services/ScoreImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*******************************************************************************/

package org.openscore.orchestrator.services;
package io.cloudslang.orchestrator.services;

import org.openscore.api.Score;
import org.openscore.api.TriggeringProperties;
Expand Down
4 changes: 2 additions & 2 deletions ...trator/services/ScorePauseResumeImpl.java → ...trator/services/ScorePauseResumeImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...strator/services/ScoreTriggeringImpl.java → ...strator/services/ScoreTriggeringImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*******************************************************************************/

package org.openscore.orchestrator.services;
package io.cloudslang.orchestrator.services;

import org.openscore.api.ExecutionPlan;
import org.openscore.api.TriggeringProperties;
Expand Down
14 changes: 7 additions & 7 deletions ...trator/services/SplitJoinServiceImpl.java → ...trator/services/SplitJoinServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../services/StubPauseResumeServiceImpl.java → .../services/StubPauseResumeServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../services/WorkerDbSupportServiceImpl.java → .../services/WorkerDbSupportServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...itories/ExecutionStateRepositoryTest.java → ...itories/ExecutionStateRepositoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...es/SuspendedExecutionsRepositoryTest.java → ...es/SuspendedExecutionsRepositoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions .../services/CancelExecutionServiceTest.java → .../services/CancelExecutionServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...r/services/ExecutionStateServiceTest.java → ...r/services/ExecutionStateServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...es/OrchestratorDispatcherServiceTest.java → ...es/OrchestratorDispatcherServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ices/RunningExecutionPlanServiceTest.java → ...ices/RunningExecutionPlanServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 72689e1

Please sign in to comment.