From 47577dfa75ad51d7db6340ad0f9e8f9281d7b7f3 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Sat, 22 Mar 2008 23:27:03 +0000 Subject: [PATCH] removed cyclical dependencies between builder and builder.support --- .../webflow/config/FlowRegistryFactoryBean.java | 2 +- .../engine/builder/{ => model}/FlowModelFlowBuilder.java | 4 +++- .../engine/builder/{ => model}/LocalFlowBuilderContext.java | 5 ++++- .../test/execution/AbstractXmlFlowExecutionTests.java | 2 +- .../builder/{ => model}/FlowModelFlowBuilderTests.java | 4 +++- 5 files changed, 12 insertions(+), 5 deletions(-) rename spring-webflow/src/main/java/org/springframework/webflow/engine/builder/{ => model}/FlowModelFlowBuilder.java (99%) rename spring-webflow/src/main/java/org/springframework/webflow/engine/builder/{ => model}/LocalFlowBuilderContext.java (90%) rename spring-webflow/src/test/java/org/springframework/webflow/engine/builder/{ => model}/FlowModelFlowBuilderTests.java (98%) 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 f2e37356..0c8222fa 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 @@ -19,8 +19,8 @@ import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImp import org.springframework.webflow.engine.builder.FlowAssembler; import org.springframework.webflow.engine.builder.FlowBuilder; import org.springframework.webflow.engine.builder.FlowBuilderContext; -import org.springframework.webflow.engine.builder.FlowModelFlowBuilder; import org.springframework.webflow.engine.builder.RefreshableFlowDefinitionHolder; +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.FlowModelBuilder; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowModelFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java similarity index 99% rename from spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowModelFlowBuilder.java rename to spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java index 5ed5d923..7b6e82c5 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowModelFlowBuilder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java @@ -1,4 +1,4 @@ -package org.springframework.webflow.engine.builder; +package org.springframework.webflow.engine.builder.model; import java.io.IOException; import java.util.ArrayList; @@ -50,6 +50,8 @@ import org.springframework.webflow.engine.Transition; import org.springframework.webflow.engine.TransitionCriteria; import org.springframework.webflow.engine.VariableValueFactory; import org.springframework.webflow.engine.ViewVariable; +import org.springframework.webflow.engine.builder.FlowBuilderContext; +import org.springframework.webflow.engine.builder.FlowBuilderException; import org.springframework.webflow.engine.builder.support.AbstractFlowBuilder; import org.springframework.webflow.engine.builder.support.ActionExecutingViewFactory; import org.springframework.webflow.engine.model.AbstractActionModel; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/LocalFlowBuilderContext.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/LocalFlowBuilderContext.java similarity index 90% rename from spring-webflow/src/main/java/org/springframework/webflow/engine/builder/LocalFlowBuilderContext.java rename to spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/LocalFlowBuilderContext.java index 3d836c0c..7bf061a2 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/LocalFlowBuilderContext.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/LocalFlowBuilderContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.engine.builder; +package org.springframework.webflow.engine.builder.model; import org.springframework.beans.factory.BeanFactory; import org.springframework.binding.convert.ConversionService; @@ -23,6 +23,9 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.ResourceLoader; import org.springframework.webflow.core.collection.AttributeMap; import org.springframework.webflow.definition.registry.FlowDefinitionLocator; +import org.springframework.webflow.engine.builder.FlowArtifactFactory; +import org.springframework.webflow.engine.builder.FlowBuilderContext; +import org.springframework.webflow.engine.builder.ViewFactoryCreator; /** * A builder context that delegates to a flow-local bean factory for builder services. Such builder services override 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 6ad0673f..7b11ad9d 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 @@ -18,7 +18,7 @@ package org.springframework.webflow.test.execution; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.webflow.config.FlowDefinitionResource; import org.springframework.webflow.engine.builder.FlowBuilder; -import org.springframework.webflow.engine.builder.FlowModelFlowBuilder; +import org.springframework.webflow.engine.builder.model.FlowModelFlowBuilder; 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; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/FlowModelFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java similarity index 98% rename from spring-webflow/src/test/java/org/springframework/webflow/engine/builder/FlowModelFlowBuilderTests.java rename to spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java index 358a23a2..545031e1 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/FlowModelFlowBuilderTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java @@ -1,4 +1,4 @@ -package org.springframework.webflow.engine.builder; +package org.springframework.webflow.engine.builder.model; import junit.framework.TestCase; @@ -12,6 +12,8 @@ import org.springframework.webflow.engine.Flow; import org.springframework.webflow.engine.FlowInputMappingException; import org.springframework.webflow.engine.FlowOutputMappingException; import org.springframework.webflow.engine.ViewState; +import org.springframework.webflow.engine.builder.FlowAssembler; +import org.springframework.webflow.engine.builder.FlowBuilderException; import org.springframework.webflow.engine.builder.support.ActionExecutingViewFactory; import org.springframework.webflow.engine.impl.FlowExecutionImplFactory; import org.springframework.webflow.engine.model.AttributeModel;