removed package cycles/tangles after structure 101 analysis

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;
 

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;
 

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;
 

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

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.

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.
  * <p>

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.
  * 

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;
 
 /**

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;

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;

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;

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;
 
 /**

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;

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;

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;
 
 /**

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;
 
 /**

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

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();
 
 }

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;

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;
 

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

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.

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 <code>Action</code> implementation for
@@ -53,8 +50,7 @@ public class AnnotatedAction extends AnnotatedObject implements Action {
 	/**
 	 * The action execution method attribute ("method").
 	 * <p>
-	 * 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";
 

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;
 
 /**

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 {

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;

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;

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;

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;
 

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;

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;

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;

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;

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;