From 6beaf80b7ab4e71f7a31d3e49b6b3b1b88a63832 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Thu, 20 Mar 2008 16:24:22 +0000 Subject: [PATCH] view move --- .../webflow/config/FlowBuilderServicesBeanDefinitionParser.java | 2 +- .../springframework/webflow/mvc/{ => view}/BindingModel.java | 2 +- .../mvc/{ => view}/InternalFlowResourceMvcViewFactory.java | 2 +- .../org/springframework/webflow/mvc/{ => view}/MvcView.java | 2 +- .../webflow/mvc/{ => view}/MvcViewFactoryCreator.java | 2 +- .../webflow/mvc/{ => view}/ViewRenderingErrors.java | 2 +- .../webflow/mvc/{ => view}/ViewResolvingMvcViewFactory.java | 2 +- .../config/FlowBuilderServicesBeanDefinitionParserTests.java | 2 +- .../org/springframework/webflow/mvc/MvcViewFactoryTests.java | 1 + 9 files changed, 9 insertions(+), 8 deletions(-) rename spring-webflow/src/main/java/org/springframework/webflow/mvc/{ => view}/BindingModel.java (98%) rename spring-webflow/src/main/java/org/springframework/webflow/mvc/{ => view}/InternalFlowResourceMvcViewFactory.java (98%) rename spring-webflow/src/main/java/org/springframework/webflow/mvc/{ => view}/MvcView.java (99%) rename spring-webflow/src/main/java/org/springframework/webflow/mvc/{ => view}/MvcViewFactoryCreator.java (98%) rename spring-webflow/src/main/java/org/springframework/webflow/mvc/{ => view}/ViewRenderingErrors.java (98%) rename spring-webflow/src/main/java/org/springframework/webflow/mvc/{ => view}/ViewResolvingMvcViewFactory.java (97%) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParser.java index fbd12554..6e5012b4 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParser.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParser.java @@ -10,7 +10,7 @@ import org.springframework.binding.convert.support.DefaultConversionService; import org.springframework.util.StringUtils; import org.springframework.webflow.engine.builder.support.FlowBuilderServices; import org.springframework.webflow.expression.DefaultExpressionParserFactory; -import org.springframework.webflow.mvc.MvcViewFactoryCreator; +import org.springframework.webflow.mvc.view.MvcViewFactoryCreator; import org.w3c.dom.Element; /** diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/BindingModel.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java similarity index 98% rename from spring-webflow/src/main/java/org/springframework/webflow/mvc/BindingModel.java rename to spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java index 160c21a7..47728c87 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/BindingModel.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java @@ -1,4 +1,4 @@ -package org.springframework.webflow.mvc; +package org.springframework.webflow.mvc.view; import java.util.Collections; import java.util.List; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/InternalFlowResourceMvcViewFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/InternalFlowResourceMvcViewFactory.java similarity index 98% rename from spring-webflow/src/main/java/org/springframework/webflow/mvc/InternalFlowResourceMvcViewFactory.java rename to spring-webflow/src/main/java/org/springframework/webflow/mvc/view/InternalFlowResourceMvcViewFactory.java index f3f72331..12209d15 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/InternalFlowResourceMvcViewFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/InternalFlowResourceMvcViewFactory.java @@ -1,4 +1,4 @@ -package org.springframework.webflow.mvc; +package org.springframework.webflow.mvc.view; import org.springframework.binding.expression.Expression; import org.springframework.context.ApplicationContext; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/MvcView.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java similarity index 99% rename from spring-webflow/src/main/java/org/springframework/webflow/mvc/MvcView.java rename to spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java index 75379456..900f4aff 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/MvcView.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcView.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.mvc; +package org.springframework.webflow.mvc.view; import java.io.IOException; import java.util.HashMap; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/MvcViewFactoryCreator.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcViewFactoryCreator.java similarity index 98% rename from spring-webflow/src/main/java/org/springframework/webflow/mvc/MvcViewFactoryCreator.java rename to spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcViewFactoryCreator.java index faa2b59c..b174395d 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/MvcViewFactoryCreator.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/MvcViewFactoryCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.mvc; +package org.springframework.webflow.mvc.view; import java.util.List; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/ViewRenderingErrors.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/ViewRenderingErrors.java similarity index 98% rename from spring-webflow/src/main/java/org/springframework/webflow/mvc/ViewRenderingErrors.java rename to spring-webflow/src/main/java/org/springframework/webflow/mvc/view/ViewRenderingErrors.java index b8571e6d..57a8a6ba 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/ViewRenderingErrors.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/ViewRenderingErrors.java @@ -1,4 +1,4 @@ -package org.springframework.webflow.mvc; +package org.springframework.webflow.mvc.view; import java.util.List; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/ViewResolvingMvcViewFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/ViewResolvingMvcViewFactory.java similarity index 97% rename from spring-webflow/src/main/java/org/springframework/webflow/mvc/ViewResolvingMvcViewFactory.java rename to spring-webflow/src/main/java/org/springframework/webflow/mvc/view/ViewResolvingMvcViewFactory.java index 1a47ef48..893d23de 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/ViewResolvingMvcViewFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/ViewResolvingMvcViewFactory.java @@ -1,4 +1,4 @@ -package org.springframework.webflow.mvc; +package org.springframework.webflow.mvc.view; import java.util.Iterator; import java.util.List; diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParserTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParserTests.java index f05c3bef..40e489ba 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParserTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowBuilderServicesBeanDefinitionParserTests.java @@ -13,7 +13,7 @@ import org.springframework.webflow.engine.builder.ViewFactoryCreator; import org.springframework.webflow.engine.builder.support.FlowBuilderServices; import org.springframework.webflow.execution.Action; import org.springframework.webflow.execution.ViewFactory; -import org.springframework.webflow.mvc.MvcViewFactoryCreator; +import org.springframework.webflow.mvc.view.MvcViewFactoryCreator; public class FlowBuilderServicesBeanDefinitionParserTests extends TestCase { diff --git a/spring-webflow/src/test/java/org/springframework/webflow/mvc/MvcViewFactoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/mvc/MvcViewFactoryTests.java index 9495624f..e90d81d1 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/mvc/MvcViewFactoryTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/mvc/MvcViewFactoryTests.java @@ -25,6 +25,7 @@ import org.springframework.web.servlet.ViewResolver; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.View; import org.springframework.webflow.execution.ViewFactory; +import org.springframework.webflow.mvc.view.MvcViewFactoryCreator; import org.springframework.webflow.test.GeneratedFlowExecutionKey; import org.springframework.webflow.test.MockExternalContext; import org.springframework.webflow.test.MockRequestContext;