From 411bda5312e69bcabe565e05863bc1f9c3ee3cf2 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Sun, 27 Apr 2008 15:36:37 +0000 Subject: [PATCH] continuation -> snapshot --- .../impl/DefaultFlowExecutionRepository.java | 12 ++++++------ .../repository/impl/FlowExecutionSnapshotGroup.java | 4 ++-- .../impl/SimpleFlowExecutionSnapshotGroup.java | 4 ++-- .../AbstractSnapshottingFlowExecutionRepository.java | 2 +- .../FlowExecutionSnapshot.java | 2 +- .../FlowExecutionSnapshotFactory.java | 2 +- .../SerializedFlowExecutionSnapshot.java | 2 +- .../SerializedFlowExecutionSnapshotFactory.java | 2 +- .../SnapshotCreationException.java | 2 +- .../SnapshotNotFoundException.java | 2 +- .../SnapshotUnmarshalException.java | 2 +- .../{continuation => snapshot}/package.html | 0 ...ializedFlowExecutionContinuationFactoryTests.java | 4 +++- 13 files changed, 21 insertions(+), 19 deletions(-) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/AbstractSnapshottingFlowExecutionRepository.java (97%) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/FlowExecutionSnapshot.java (95%) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/FlowExecutionSnapshotFactory.java (95%) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/SerializedFlowExecutionSnapshot.java (99%) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/SerializedFlowExecutionSnapshotFactory.java (96%) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/SnapshotCreationException.java (92%) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/SnapshotNotFoundException.java (92%) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/SnapshotUnmarshalException.java (92%) rename spring-webflow/src/main/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/package.html (100%) rename spring-webflow/src/test/java/org/springframework/webflow/execution/repository/{continuation => snapshot}/SerializedFlowExecutionContinuationFactoryTests.java (93%) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepository.java index 95c39971..b9a2e28c 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepository.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepository.java @@ -20,12 +20,12 @@ import org.springframework.webflow.conversation.ConversationManager; import org.springframework.webflow.execution.FlowExecution; import org.springframework.webflow.execution.FlowExecutionKey; import org.springframework.webflow.execution.repository.FlowExecutionRestorationFailureException; -import org.springframework.webflow.execution.repository.continuation.AbstractSnapshottingFlowExecutionRepository; -import org.springframework.webflow.execution.repository.continuation.FlowExecutionSnapshot; -import org.springframework.webflow.execution.repository.continuation.FlowExecutionSnapshotFactory; -import org.springframework.webflow.execution.repository.continuation.SerializedFlowExecutionSnapshotFactory; -import org.springframework.webflow.execution.repository.continuation.SnapshotNotFoundException; -import org.springframework.webflow.execution.repository.continuation.SnapshotUnmarshalException; +import org.springframework.webflow.execution.repository.snapshot.AbstractSnapshottingFlowExecutionRepository; +import org.springframework.webflow.execution.repository.snapshot.FlowExecutionSnapshot; +import org.springframework.webflow.execution.repository.snapshot.FlowExecutionSnapshotFactory; +import org.springframework.webflow.execution.repository.snapshot.SerializedFlowExecutionSnapshotFactory; +import org.springframework.webflow.execution.repository.snapshot.SnapshotNotFoundException; +import org.springframework.webflow.execution.repository.snapshot.SnapshotUnmarshalException; import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer; /** diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/FlowExecutionSnapshotGroup.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/FlowExecutionSnapshotGroup.java index 497ce29b..cafd3018 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/FlowExecutionSnapshotGroup.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/FlowExecutionSnapshotGroup.java @@ -2,8 +2,8 @@ package org.springframework.webflow.execution.repository.impl; import java.io.Serializable; -import org.springframework.webflow.execution.repository.continuation.FlowExecutionSnapshot; -import org.springframework.webflow.execution.repository.continuation.SnapshotNotFoundException; +import org.springframework.webflow.execution.repository.snapshot.FlowExecutionSnapshot; +import org.springframework.webflow.execution.repository.snapshot.SnapshotNotFoundException; /** * A group of flow execution snapshots. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/SimpleFlowExecutionSnapshotGroup.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/SimpleFlowExecutionSnapshotGroup.java index d51bdded..8a3f39f1 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/SimpleFlowExecutionSnapshotGroup.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/SimpleFlowExecutionSnapshotGroup.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.Map; -import org.springframework.webflow.execution.repository.continuation.FlowExecutionSnapshot; -import org.springframework.webflow.execution.repository.continuation.SnapshotNotFoundException; +import org.springframework.webflow.execution.repository.snapshot.FlowExecutionSnapshot; +import org.springframework.webflow.execution.repository.snapshot.SnapshotNotFoundException; /** * A group of flow execution snapshots. Simple typed data structure backed by a map and linked list. Supports expelling diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/AbstractSnapshottingFlowExecutionRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/AbstractSnapshottingFlowExecutionRepository.java similarity index 97% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/AbstractSnapshottingFlowExecutionRepository.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/AbstractSnapshottingFlowExecutionRepository.java index 032a753d..e6db7379 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/AbstractSnapshottingFlowExecutionRepository.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/AbstractSnapshottingFlowExecutionRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import java.io.Serializable; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionSnapshot.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/FlowExecutionSnapshot.java similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionSnapshot.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/FlowExecutionSnapshot.java index ad6aa7aa..5150c851 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionSnapshot.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/FlowExecutionSnapshot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import java.io.Serializable; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionSnapshotFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/FlowExecutionSnapshotFactory.java similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionSnapshotFactory.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/FlowExecutionSnapshotFactory.java index d8fe1630..34f46b6e 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionSnapshotFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/FlowExecutionSnapshotFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import org.springframework.webflow.execution.FlowExecution; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionSnapshot.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java similarity index 99% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionSnapshot.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java index 79d9fedf..84cba750 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionSnapshot.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshot.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionSnapshotFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshotFactory.java similarity index 96% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionSnapshotFactory.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshotFactory.java index 3ea9378f..e42db193 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionSnapshotFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionSnapshotFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotCreationException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotCreationException.java similarity index 92% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotCreationException.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotCreationException.java index d546cd2a..01eb0e64 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotCreationException.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotCreationException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import org.springframework.webflow.execution.FlowExecution; import org.springframework.webflow.execution.repository.FlowExecutionRepositoryException; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotNotFoundException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotNotFoundException.java similarity index 92% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotNotFoundException.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotNotFoundException.java index 85297fc6..c6e0a929 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotNotFoundException.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import java.io.Serializable; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotUnmarshalException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotUnmarshalException.java similarity index 92% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotUnmarshalException.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotUnmarshalException.java index bf96d70c..87349438 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SnapshotUnmarshalException.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/SnapshotUnmarshalException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import org.springframework.webflow.execution.FlowExecution; import org.springframework.webflow.execution.repository.FlowExecutionRepositoryException; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/package.html b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/package.html similarity index 100% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/package.html rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/snapshot/package.html diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionContinuationFactoryTests.java similarity index 93% rename from spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactoryTests.java rename to spring-webflow/src/test/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionContinuationFactoryTests.java index 3d9d5c14..0f696817 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactoryTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/snapshot/SerializedFlowExecutionContinuationFactoryTests.java @@ -1,4 +1,4 @@ -package org.springframework.webflow.execution.repository.continuation; +package org.springframework.webflow.execution.repository.snapshot; import junit.framework.TestCase; @@ -15,6 +15,8 @@ import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer; import org.springframework.webflow.execution.FlowExecution; import org.springframework.webflow.execution.FlowExecutionException; import org.springframework.webflow.execution.FlowExecutionKeyFactory; +import org.springframework.webflow.execution.repository.snapshot.FlowExecutionSnapshot; +import org.springframework.webflow.execution.repository.snapshot.SerializedFlowExecutionSnapshotFactory; import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer; import org.springframework.webflow.test.MockExternalContext; import org.springframework.webflow.test.MockFlowExecutionKeyFactory;