From 4b4a678e3ad87b28be33a53e0cd3db842edfd944 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Thu, 15 May 2008 04:23:41 +0000 Subject: [PATCH] removed package cycles/tangles after structure 101 analysis --- .../springframework/webflow/action/EvaluateAction.java | 2 +- .../webflow/config/FlowRegistryFactoryBean.java | 2 +- .../webflow/{definition => core}/Annotated.java | 2 +- .../webflow/{engine => core}/AnnotatedObject.java | 3 +-- .../webflow/definition/FlowDefinition.java | 1 + .../webflow/definition/StateDefinition.java | 2 ++ .../webflow/definition/TransitionDefinition.java | 2 ++ .../org/springframework/webflow/engine/ActionList.java | 2 ++ .../springframework/webflow/engine/ActionState.java | 1 + .../org/springframework/webflow/engine/EndState.java | 1 + .../java/org/springframework/webflow/engine/Flow.java | 1 + .../springframework/webflow/engine/FlowVariable.java | 1 + .../java/org/springframework/webflow/engine/State.java | 1 + .../org/springframework/webflow/engine/Transition.java | 1 + .../springframework/webflow/engine/ViewVariable.java | 1 + .../engine/builder/model/FlowModelFlowBuilder.java | 10 +++++----- .../{registry => builder}/DefaultFlowModelHolder.java | 5 ++--- .../webflow/engine/model/registry/FlowModelHolder.java | 7 ++----- .../engine/support/ActionExecutingViewFactory.java | 2 +- .../engine/support/ActionTransitionCriteria.java | 2 +- .../ActionExecutionException.java | 5 +---- .../webflow/{engine => execution}/ActionExecutor.java | 5 +---- .../webflow/{engine => execution}/AnnotatedAction.java | 10 +++------- .../expression/WebFlowOgnlExpressionParser.java | 2 +- .../webflow/expression/el/ActionMethodELResolver.java | 2 +- .../{config => }/scope/AbstractWebFlowScope.java | 2 +- .../webflow/{config => }/scope/ConversationScope.java | 2 +- .../webflow/{config => }/scope/FlashScope.java | 2 +- .../webflow/{config => }/scope/FlowScope.java | 2 +- .../webflow/{config => }/scope/RequestScope.java | 2 +- .../webflow/{config => }/scope/ScopeRegistrar.java | 2 +- .../webflow/{config => }/scope/ViewScope.java | 2 +- .../webflow/{config => }/scope/package.html | 0 .../test/execution/AbstractXmlFlowExecutionTests.java | 2 +- .../webflow/action/MultiActionTests.java | 2 +- .../webflow/engine/ActionExecutorTests.java | 2 ++ .../webflow/engine/AnnotatedObjectTests.java | 2 ++ .../webflow/engine/AnnotedActionTests.java | 2 +- .../builder/model/FlowModelFlowBuilderTests.java | 2 +- .../model/builder/xml/XmlFlowModelBuilderTests.java | 2 +- .../model/registry/DefaultFlowModelHolderTests.java | 1 + .../engine/support/TransitionCriteriaChainTests.java | 2 +- .../expression/WebFlowOgnlExpressionParserTests.java | 2 +- .../expression/el/WebFlowELExpressionParserTests.java | 2 +- ...ibernateFlowManagedPersistenceIntegrationTests.java | 2 +- .../JpaFlowManagedPersistenceIntegrationTests.java | 2 +- 46 files changed, 58 insertions(+), 54 deletions(-) rename spring-webflow/src/main/java/org/springframework/webflow/{definition => core}/Annotated.java (93%) rename spring-webflow/src/main/java/org/springframework/webflow/{engine => core}/AnnotatedObject.java (93%) rename spring-webflow/src/main/java/org/springframework/webflow/engine/model/{registry => builder}/DefaultFlowModelHolder.java (89%) rename spring-webflow/src/main/java/org/springframework/webflow/{engine => execution}/ActionExecutionException.java (89%) rename spring-webflow/src/main/java/org/springframework/webflow/{engine => execution}/ActionExecutor.java (89%) rename spring-webflow/src/main/java/org/springframework/webflow/{engine => execution}/AnnotatedAction.java (91%) rename spring-webflow/src/main/java/org/springframework/webflow/{config => }/scope/AbstractWebFlowScope.java (98%) rename spring-webflow/src/main/java/org/springframework/webflow/{config => }/scope/ConversationScope.java (95%) rename spring-webflow/src/main/java/org/springframework/webflow/{config => }/scope/FlashScope.java (95%) rename spring-webflow/src/main/java/org/springframework/webflow/{config => }/scope/FlowScope.java (95%) rename spring-webflow/src/main/java/org/springframework/webflow/{config => }/scope/RequestScope.java (95%) rename spring-webflow/src/main/java/org/springframework/webflow/{config => }/scope/ScopeRegistrar.java (97%) rename spring-webflow/src/main/java/org/springframework/webflow/{config => }/scope/ViewScope.java (95%) rename spring-webflow/src/main/java/org/springframework/webflow/{config => }/scope/package.html (100%) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/EvaluateAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/EvaluateAction.java index 871cdcb4..c4a8f5d5 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/EvaluateAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/EvaluateAction.java @@ -18,8 +18,8 @@ package org.springframework.webflow.action; import org.springframework.binding.expression.Expression; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; -import org.springframework.webflow.engine.ActionExecutor; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.ActionExecutor; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java index e9ff76fb..b1a8f4d6 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java @@ -39,9 +39,9 @@ import org.springframework.webflow.engine.builder.FlowBuilderContext; import org.springframework.webflow.engine.builder.model.FlowModelFlowBuilder; import org.springframework.webflow.engine.builder.support.FlowBuilderContextImpl; import org.springframework.webflow.engine.builder.support.FlowBuilderServices; +import org.springframework.webflow.engine.model.builder.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.builder.FlowModelBuilder; import org.springframework.webflow.engine.model.builder.xml.XmlFlowModelBuilder; -import org.springframework.webflow.engine.model.registry.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.registry.FlowModelHolder; import org.springframework.webflow.engine.model.registry.FlowModelRegistryImpl; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/Annotated.java b/spring-webflow/src/main/java/org/springframework/webflow/core/Annotated.java similarity index 93% rename from spring-webflow/src/main/java/org/springframework/webflow/definition/Annotated.java rename to spring-webflow/src/main/java/org/springframework/webflow/core/Annotated.java index 100a8aa5..273fe0e9 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/definition/Annotated.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/core/Annotated.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.definition; +package org.springframework.webflow.core; import org.springframework.webflow.core.collection.MutableAttributeMap; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/AnnotatedObject.java b/spring-webflow/src/main/java/org/springframework/webflow/core/AnnotatedObject.java similarity index 93% rename from spring-webflow/src/main/java/org/springframework/webflow/engine/AnnotatedObject.java rename to spring-webflow/src/main/java/org/springframework/webflow/core/AnnotatedObject.java index 9bd89ddb..71635d30 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/AnnotatedObject.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/core/AnnotatedObject.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.engine; +package org.springframework.webflow.core; import org.springframework.webflow.core.collection.LocalAttributeMap; import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.definition.Annotated; /** * A base class for all objects in the web flow system that support annotation using arbitrary properties. Mainly used diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/FlowDefinition.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/FlowDefinition.java index 949ada7c..d1bd9351 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/definition/FlowDefinition.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/FlowDefinition.java @@ -16,6 +16,7 @@ package org.springframework.webflow.definition; import org.springframework.context.ApplicationContext; +import org.springframework.webflow.core.Annotated; /** * The definition of a flow, a program that when executed carries out a task on behalf of a single client. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/StateDefinition.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/StateDefinition.java index 4c0cad61..b530682b 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/definition/StateDefinition.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/StateDefinition.java @@ -15,6 +15,8 @@ */ package org.springframework.webflow.definition; +import org.springframework.webflow.core.Annotated; + /** * A step within a {@link FlowDefinition flow definition} where behavior is executed. *

diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/TransitionDefinition.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/TransitionDefinition.java index af0b9012..8e7c722d 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/definition/TransitionDefinition.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/TransitionDefinition.java @@ -15,6 +15,8 @@ */ package org.springframework.webflow.definition; +import org.springframework.webflow.core.Annotated; + /** * A transition takes a flow from one state to another. * diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionList.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionList.java index 4e7e7ec5..326c689e 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionList.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionList.java @@ -22,6 +22,8 @@ import java.util.List; import org.springframework.core.style.StylerUtils; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.ActionExecutor; +import org.springframework.webflow.execution.AnnotatedAction; import org.springframework.webflow.execution.RequestContext; /** diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionState.java index 7d2596e7..5ce4e137 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionState.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionState.java @@ -20,6 +20,7 @@ import java.util.Iterator; import org.springframework.core.style.StylerUtils; import org.springframework.core.style.ToStringCreator; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.ActionExecutor; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.FlowExecutionException; import org.springframework.webflow.execution.RequestContext; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/EndState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/EndState.java index 01ad73cc..450bddf0 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/EndState.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/EndState.java @@ -20,6 +20,7 @@ import org.springframework.binding.mapping.MappingResults; import org.springframework.core.style.ToStringCreator; import org.springframework.webflow.core.collection.LocalAttributeMap; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.ActionExecutor; import org.springframework.webflow.execution.FlowExecutionException; import org.springframework.webflow.execution.FlowSession; import org.springframework.webflow.execution.RequestContext; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java index cb6343ca..eb2931a2 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java @@ -34,6 +34,7 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.springframework.webflow.context.ExternalContext; +import org.springframework.webflow.core.AnnotatedObject; import org.springframework.webflow.core.collection.AttributeMap; import org.springframework.webflow.core.collection.LocalAttributeMap; import org.springframework.webflow.core.collection.MutableAttributeMap; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowVariable.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowVariable.java index e9c69734..844077f3 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowVariable.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowVariable.java @@ -17,6 +17,7 @@ package org.springframework.webflow.engine; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; +import org.springframework.webflow.core.AnnotatedObject; import org.springframework.webflow.execution.RequestContext; /** diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/State.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/State.java index 9606ebb8..0de10b1a 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/State.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/State.java @@ -19,6 +19,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; +import org.springframework.webflow.core.AnnotatedObject; import org.springframework.webflow.definition.FlowDefinition; import org.springframework.webflow.definition.StateDefinition; import org.springframework.webflow.execution.FlowExecutionException; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java index 90c32bab..e4a9b326 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java @@ -19,6 +19,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; +import org.springframework.webflow.core.AnnotatedObject; import org.springframework.webflow.definition.TransitionDefinition; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.FlowExecutionException; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewVariable.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewVariable.java index a2b3fb43..8d362dbe 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewVariable.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewVariable.java @@ -15,6 +15,7 @@ */ package org.springframework.webflow.engine; +import org.springframework.webflow.core.AnnotatedObject; import org.springframework.webflow.execution.RequestContext; /** diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java index 3e5d25d7..d0b94346 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java @@ -54,15 +54,10 @@ import org.springframework.webflow.action.FlowDefinitionRedirectAction; import org.springframework.webflow.action.RenderAction; import org.springframework.webflow.action.SetAction; import org.springframework.webflow.action.ViewFactoryActionAdapter; -import org.springframework.webflow.config.scope.ConversationScope; -import org.springframework.webflow.config.scope.FlashScope; -import org.springframework.webflow.config.scope.FlowScope; -import org.springframework.webflow.config.scope.ViewScope; import org.springframework.webflow.core.collection.AttributeMap; import org.springframework.webflow.core.collection.LocalAttributeMap; import org.springframework.webflow.core.collection.MutableAttributeMap; import org.springframework.webflow.definition.registry.FlowDefinitionLocator; -import org.springframework.webflow.engine.AnnotatedAction; import org.springframework.webflow.engine.Flow; import org.springframework.webflow.engine.FlowExecutionExceptionHandler; import org.springframework.webflow.engine.FlowVariable; @@ -107,8 +102,13 @@ import org.springframework.webflow.engine.support.GenericSubflowAttributeMapper; import org.springframework.webflow.engine.support.TransitionCriteriaChain; import org.springframework.webflow.engine.support.TransitionExecutingFlowExecutionExceptionHandler; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.AnnotatedAction; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.ViewFactory; +import org.springframework.webflow.scope.ConversationScope; +import org.springframework.webflow.scope.FlashScope; +import org.springframework.webflow.scope.FlowScope; +import org.springframework.webflow.scope.ViewScope; import org.springframework.webflow.security.SecurityRule; /** diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/registry/DefaultFlowModelHolder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/DefaultFlowModelHolder.java similarity index 89% rename from spring-webflow/src/main/java/org/springframework/webflow/engine/model/registry/DefaultFlowModelHolder.java rename to spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/DefaultFlowModelHolder.java index eafc34e0..420c6d20 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/registry/DefaultFlowModelHolder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/DefaultFlowModelHolder.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.engine.model.registry; +package org.springframework.webflow.engine.model.builder; import org.springframework.core.io.Resource; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; import org.springframework.webflow.engine.model.FlowModel; -import org.springframework.webflow.engine.model.builder.FlowModelBuilder; -import org.springframework.webflow.engine.model.builder.FlowModelBuilderException; +import org.springframework.webflow.engine.model.registry.FlowModelHolder; /** * A flow model holder that can detect changes on an underlying flow model resource and refresh that resource diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/registry/FlowModelHolder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/registry/FlowModelHolder.java index 58494b91..f9ef9d59 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/registry/FlowModelHolder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/registry/FlowModelHolder.java @@ -17,7 +17,6 @@ package org.springframework.webflow.engine.model.registry; import org.springframework.core.io.Resource; import org.springframework.webflow.engine.model.FlowModel; -import org.springframework.webflow.engine.model.builder.FlowModelBuilderException; /** * A holder holding a reference to a Flow model. Provides a layer of indirection, enabling things like "hot-reloadable" @@ -32,9 +31,8 @@ public interface FlowModelHolder { /** * Returns the flow model held by this holder. Calling this method the first time may trigger flow model assembly. - * @throws FlowModelBuilderException if an exception occurred building the flow model */ - public FlowModel getFlowModel() throws FlowModelBuilderException; + public FlowModel getFlowModel(); /** * Has the underlying flow model changed since it was last accessed via a call to {@link #getFlowModel()}. @@ -52,8 +50,7 @@ public interface FlowModelHolder { /** * Refresh the flow model held by this holder. Calling this method typically triggers flow re-assembly, which may * include a refresh from an externalized resource such as a file. - * @throws FlowModelBuilderException if an exception occurred building the flow model */ - public void refresh() throws FlowModelBuilderException; + public void refresh(); } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionExecutingViewFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionExecutingViewFactory.java index 7bb6b124..e5faa2ea 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionExecutingViewFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionExecutingViewFactory.java @@ -16,8 +16,8 @@ package org.springframework.webflow.engine.support; import org.springframework.web.util.WebUtils; -import org.springframework.webflow.engine.ActionExecutor; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.ActionExecutor; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.View; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionTransitionCriteria.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionTransitionCriteria.java index 7edd5c67..0b9ad3e5 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionTransitionCriteria.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ActionTransitionCriteria.java @@ -15,9 +15,9 @@ */ package org.springframework.webflow.engine.support; -import org.springframework.webflow.engine.ActionExecutor; import org.springframework.webflow.engine.TransitionCriteria; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.ActionExecutor; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutionException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/ActionExecutionException.java similarity index 89% rename from spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutionException.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/ActionExecutionException.java index a44c2af8..d054522d 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutionException.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/ActionExecutionException.java @@ -13,18 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.engine; +package org.springframework.webflow.execution; import org.springframework.webflow.core.collection.AttributeMap; -import org.springframework.webflow.execution.Action; -import org.springframework.webflow.execution.FlowExecutionException; /** * Thrown if an unhandled exception occurs when an action is executed. Typically wraps another exception noting the root * cause failure. The root cause may be checked or unchecked. * * @see org.springframework.webflow.execution.Action - * @see org.springframework.webflow.engine.ActionState * * @author Keith Donald * @author Erwin Vervaet diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutor.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/ActionExecutor.java similarity index 89% rename from spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutor.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/ActionExecutor.java index f40e3994..b6d4c6d6 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutor.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/ActionExecutor.java @@ -13,13 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.engine; +package org.springframework.webflow.execution; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.webflow.execution.Action; -import org.springframework.webflow.execution.Event; -import org.springframework.webflow.execution.RequestContext; /** * A simple static helper that performs action execution that encapsulates common logging and exception handling logic. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/AnnotatedAction.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/AnnotatedAction.java similarity index 91% rename from spring-webflow/src/main/java/org/springframework/webflow/engine/AnnotatedAction.java rename to spring-webflow/src/main/java/org/springframework/webflow/execution/AnnotatedAction.java index b81be007..fff4c115 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/AnnotatedAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/AnnotatedAction.java @@ -13,17 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.engine; +package org.springframework.webflow.execution; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.springframework.webflow.action.MultiAction; -import org.springframework.webflow.execution.Action; -import org.springframework.webflow.execution.Event; -import org.springframework.webflow.execution.RequestContext; +import org.springframework.webflow.core.AnnotatedObject; /** * An action proxy/decorator that stores arbitrary properties about a target Action implementation for @@ -53,8 +50,7 @@ public class AnnotatedAction extends AnnotatedObject implements Action { /** * The action execution method attribute ("method"). *

- * The method property is a hint about what method should be invoked; for example, the name of a specific target - * method on a {@link MultiAction multi-action}. + * The method property is a hint about what method should be invoked. */ public static final String METHOD_ATTRIBUTE = "method"; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java index 08139c2d..351e43d5 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParser.java @@ -32,8 +32,8 @@ import org.springframework.context.MessageSource; import org.springframework.webflow.context.ExternalContext; import org.springframework.webflow.context.ExternalContextHolder; import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.engine.AnnotatedAction; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.AnnotatedAction; import org.springframework.webflow.execution.RequestContext; /** diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionMethodELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionMethodELResolver.java index 5d81b0aa..65456952 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionMethodELResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/ActionMethodELResolver.java @@ -21,8 +21,8 @@ import javax.el.ELContext; import javax.el.ELResolver; import javax.el.PropertyNotWritableException; -import org.springframework.webflow.engine.AnnotatedAction; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.AnnotatedAction; /** * Resolves the method to invoke on a resolved Web Flow Action instance. The resolved Action is usually a diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/AbstractWebFlowScope.java b/spring-webflow/src/main/java/org/springframework/webflow/scope/AbstractWebFlowScope.java similarity index 98% rename from spring-webflow/src/main/java/org/springframework/webflow/config/scope/AbstractWebFlowScope.java rename to spring-webflow/src/main/java/org/springframework/webflow/scope/AbstractWebFlowScope.java index ded3c89f..17211809 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/AbstractWebFlowScope.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/scope/AbstractWebFlowScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.config.scope; +package org.springframework.webflow.scope; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ConversationScope.java b/spring-webflow/src/main/java/org/springframework/webflow/scope/ConversationScope.java similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/config/scope/ConversationScope.java rename to spring-webflow/src/main/java/org/springframework/webflow/scope/ConversationScope.java index 247a61c5..26567dea 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ConversationScope.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/scope/ConversationScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.config.scope; +package org.springframework.webflow.scope; import org.springframework.beans.factory.config.Scope; import org.springframework.webflow.core.collection.MutableAttributeMap; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlashScope.java b/spring-webflow/src/main/java/org/springframework/webflow/scope/FlashScope.java similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlashScope.java rename to spring-webflow/src/main/java/org/springframework/webflow/scope/FlashScope.java index d96e222a..e533249f 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlashScope.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/scope/FlashScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.config.scope; +package org.springframework.webflow.scope; import org.springframework.beans.factory.config.Scope; import org.springframework.webflow.core.collection.MutableAttributeMap; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlowScope.java b/spring-webflow/src/main/java/org/springframework/webflow/scope/FlowScope.java similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlowScope.java rename to spring-webflow/src/main/java/org/springframework/webflow/scope/FlowScope.java index f63e04ad..8a990cfa 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlowScope.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/scope/FlowScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.config.scope; +package org.springframework.webflow.scope; import org.springframework.beans.factory.config.Scope; import org.springframework.webflow.core.collection.MutableAttributeMap; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/RequestScope.java b/spring-webflow/src/main/java/org/springframework/webflow/scope/RequestScope.java similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/config/scope/RequestScope.java rename to spring-webflow/src/main/java/org/springframework/webflow/scope/RequestScope.java index 43a6d69a..4eab3c32 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/RequestScope.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/scope/RequestScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.config.scope; +package org.springframework.webflow.scope; import org.springframework.beans.factory.config.Scope; import org.springframework.webflow.core.collection.MutableAttributeMap; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java b/spring-webflow/src/main/java/org/springframework/webflow/scope/ScopeRegistrar.java similarity index 97% rename from spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java rename to spring-webflow/src/main/java/org/springframework/webflow/scope/ScopeRegistrar.java index a2fc3ea3..318f2742 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/scope/ScopeRegistrar.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.config.scope; +package org.springframework.webflow.scope; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanFactoryPostProcessor; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ViewScope.java b/spring-webflow/src/main/java/org/springframework/webflow/scope/ViewScope.java similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/config/scope/ViewScope.java rename to spring-webflow/src/main/java/org/springframework/webflow/scope/ViewScope.java index a21f91a0..349f0e92 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ViewScope.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/scope/ViewScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.config.scope; +package org.springframework.webflow.scope; import org.springframework.beans.factory.config.Scope; import org.springframework.webflow.core.collection.MutableAttributeMap; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/package.html b/spring-webflow/src/main/java/org/springframework/webflow/scope/package.html similarity index 100% rename from spring-webflow/src/main/java/org/springframework/webflow/config/scope/package.html rename to spring-webflow/src/main/java/org/springframework/webflow/scope/package.html diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java index 42e44436..095647bc 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java @@ -20,9 +20,9 @@ import org.springframework.webflow.config.FlowDefinitionResource; import org.springframework.webflow.config.FlowDefinitionResourceFactory; import org.springframework.webflow.engine.builder.FlowBuilder; import org.springframework.webflow.engine.builder.model.FlowModelFlowBuilder; +import org.springframework.webflow.engine.model.builder.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.builder.FlowModelBuilder; import org.springframework.webflow.engine.model.builder.xml.XmlFlowModelBuilder; -import org.springframework.webflow.engine.model.registry.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.registry.FlowModelHolder; import org.springframework.webflow.engine.model.registry.FlowModelRegistry; import org.springframework.webflow.engine.model.registry.FlowModelRegistryImpl; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/MultiActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/MultiActionTests.java index 03bacaa2..2ecbd63d 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/action/MultiActionTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/action/MultiActionTests.java @@ -19,9 +19,9 @@ import junit.framework.TestCase; import org.springframework.webflow.action.DispatchMethodInvoker.MethodLookupException; import org.springframework.webflow.action.MultiAction.MethodResolver; -import org.springframework.webflow.engine.AnnotatedAction; import org.springframework.webflow.engine.StubViewFactory; import org.springframework.webflow.engine.ViewState; +import org.springframework.webflow.execution.AnnotatedAction; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.test.MockFlowSession; import org.springframework.webflow.test.MockRequestContext; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionExecutorTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionExecutorTests.java index 26505b6b..e71f1fc5 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionExecutorTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionExecutorTests.java @@ -17,6 +17,8 @@ package org.springframework.webflow.engine; import junit.framework.TestCase; +import org.springframework.webflow.execution.ActionExecutionException; +import org.springframework.webflow.execution.ActionExecutor; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.TestAction; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotatedObjectTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotatedObjectTests.java index 0b55eb63..0cd2b07e 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotatedObjectTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotatedObjectTests.java @@ -15,6 +15,8 @@ */ package org.springframework.webflow.engine; +import org.springframework.webflow.core.AnnotatedObject; + import junit.framework.TestCase; public class AnnotatedObjectTests extends TestCase { diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotedActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotedActionTests.java index 6693d1a7..047821e5 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotedActionTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotedActionTests.java @@ -18,7 +18,7 @@ package org.springframework.webflow.engine; import junit.framework.TestCase; import org.springframework.webflow.action.AbstractAction; -import org.springframework.webflow.engine.AnnotatedAction; +import org.springframework.webflow.execution.AnnotatedAction; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.TestAction; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java index f634d92d..931c8c77 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java @@ -29,9 +29,9 @@ import org.springframework.webflow.engine.model.SecuredModel; import org.springframework.webflow.engine.model.TransitionModel; import org.springframework.webflow.engine.model.VarModel; import org.springframework.webflow.engine.model.ViewStateModel; +import org.springframework.webflow.engine.model.builder.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.builder.xml.XmlFlowModelBuilder; import org.springframework.webflow.engine.model.builder.xml.XmlFlowModelBuilderTests; -import org.springframework.webflow.engine.model.registry.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.registry.FlowModelHolder; import org.springframework.webflow.engine.model.registry.FlowModelRegistryImpl; import org.springframework.webflow.engine.support.ActionExecutingViewFactory; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilderTests.java index aab9bce4..63487415 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilderTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilderTests.java @@ -20,9 +20,9 @@ import org.springframework.webflow.engine.model.SecuredModel; import org.springframework.webflow.engine.model.TransitionModel; import org.springframework.webflow.engine.model.VarModel; import org.springframework.webflow.engine.model.ViewStateModel; +import org.springframework.webflow.engine.model.builder.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.builder.FlowModelBuilder; import org.springframework.webflow.engine.model.builder.FlowModelBuilderException; -import org.springframework.webflow.engine.model.registry.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.registry.FlowModelRegistry; import org.springframework.webflow.engine.model.registry.FlowModelRegistryImpl; import org.springframework.webflow.execution.FlowExecution; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/registry/DefaultFlowModelHolderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/registry/DefaultFlowModelHolderTests.java index 3022b787..fe79b230 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/registry/DefaultFlowModelHolderTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/registry/DefaultFlowModelHolderTests.java @@ -6,6 +6,7 @@ import org.springframework.core.io.Resource; import org.springframework.webflow.engine.model.AbstractStateModel; import org.springframework.webflow.engine.model.EndStateModel; import org.springframework.webflow.engine.model.FlowModel; +import org.springframework.webflow.engine.model.builder.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.builder.FlowModelBuilder; import org.springframework.webflow.engine.model.builder.FlowModelBuilderException; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionCriteriaChainTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionCriteriaChainTests.java index cdcac181..5e216b6d 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionCriteriaChainTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionCriteriaChainTests.java @@ -16,9 +16,9 @@ package org.springframework.webflow.engine.support; import org.springframework.webflow.action.EventFactorySupport; -import org.springframework.webflow.engine.AnnotatedAction; import org.springframework.webflow.engine.TransitionCriteria; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.AnnotatedAction; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.test.MockRequestContext; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParserTests.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParserTests.java index d22b0d28..30b6e6bb 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParserTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/WebFlowOgnlExpressionParserTests.java @@ -13,9 +13,9 @@ import org.springframework.webflow.action.FormAction; import org.springframework.webflow.core.collection.AttributeMap; import org.springframework.webflow.core.collection.LocalAttributeMap; import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.engine.AnnotatedAction; import org.springframework.webflow.engine.StubViewFactory; import org.springframework.webflow.engine.ViewState; +import org.springframework.webflow.execution.AnnotatedAction; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.TestAction; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/WebFlowELExpressionParserTests.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/WebFlowELExpressionParserTests.java index 07a1e54e..24541d9f 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/expression/el/WebFlowELExpressionParserTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/el/WebFlowELExpressionParserTests.java @@ -14,9 +14,9 @@ import org.springframework.webflow.action.FormAction; import org.springframework.webflow.core.collection.AttributeMap; import org.springframework.webflow.core.collection.LocalAttributeMap; import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.engine.AnnotatedAction; import org.springframework.webflow.engine.StubViewFactory; import org.springframework.webflow.engine.ViewState; +import org.springframework.webflow.execution.AnnotatedAction; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.TestAction; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/HibernateFlowManagedPersistenceIntegrationTests.java b/spring-webflow/src/test/java/org/springframework/webflow/persistence/HibernateFlowManagedPersistenceIntegrationTests.java index 098f8bb8..d17b6184 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/HibernateFlowManagedPersistenceIntegrationTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/HibernateFlowManagedPersistenceIntegrationTests.java @@ -21,8 +21,8 @@ import org.springframework.webflow.engine.Flow; import org.springframework.webflow.engine.builder.FlowAssembler; import org.springframework.webflow.engine.builder.model.FlowModelFlowBuilder; import org.springframework.webflow.engine.impl.FlowExecutionImplFactory; +import org.springframework.webflow.engine.model.builder.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.builder.xml.XmlFlowModelBuilder; -import org.springframework.webflow.engine.model.registry.DefaultFlowModelHolder; import org.springframework.webflow.execution.Action; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.FlowExecution; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/JpaFlowManagedPersistenceIntegrationTests.java b/spring-webflow/src/test/java/org/springframework/webflow/persistence/JpaFlowManagedPersistenceIntegrationTests.java index a3025391..9a9ce9ad 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/JpaFlowManagedPersistenceIntegrationTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/JpaFlowManagedPersistenceIntegrationTests.java @@ -20,8 +20,8 @@ import org.springframework.webflow.engine.Flow; import org.springframework.webflow.engine.builder.FlowAssembler; import org.springframework.webflow.engine.builder.model.FlowModelFlowBuilder; import org.springframework.webflow.engine.impl.FlowExecutionImplFactory; +import org.springframework.webflow.engine.model.builder.DefaultFlowModelHolder; import org.springframework.webflow.engine.model.builder.xml.XmlFlowModelBuilder; -import org.springframework.webflow.engine.model.registry.DefaultFlowModelHolder; import org.springframework.webflow.execution.Action; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.FlowExecution;