From dd740b9018e7983f1e48297aa313c1c1f36a2d2c Mon Sep 17 00:00:00 2001 From: Jeremy Grelle Date: Thu, 16 Aug 2007 22:22:56 +0000 Subject: [PATCH] IN PROGRESS - issue SWF-388: Extract all JSF-related code into a separate component project http://opensource.atlassian.com/projects/spring/browse/SWF-388 --- .../el/AbstractFlowExecutionPropertyResolver.java | 2 +- .../{ => webflow}/el/DelegatingFlowVariableResolver.java | 2 +- .../{ => webflow}/el/FlowExecutionPropertyResolver.java | 2 +- .../{ => webflow}/el/FlowExecutionVariableResolver.java | 2 +- .../faces/{ => webflow}/el/FlowPropertyResolver.java | 2 +- .../faces/{ => webflow}/el/FlowVariableResolver.java | 2 +- .../faces/webflow/FlowPropertyResolverTests.java | 2 +- .../faces/webflow/FlowVariableResolverTests.java | 2 +- .../faces/webflow/JSF11ManagedBeanAccessTests.java | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) rename spring-faces/src/main/java/org/springframework/faces/{ => webflow}/el/AbstractFlowExecutionPropertyResolver.java (99%) rename spring-faces/src/main/java/org/springframework/faces/{ => webflow}/el/DelegatingFlowVariableResolver.java (98%) rename spring-faces/src/main/java/org/springframework/faces/{ => webflow}/el/FlowExecutionPropertyResolver.java (99%) rename spring-faces/src/main/java/org/springframework/faces/{ => webflow}/el/FlowExecutionVariableResolver.java (98%) rename spring-faces/src/main/java/org/springframework/faces/{ => webflow}/el/FlowPropertyResolver.java (98%) rename spring-faces/src/main/java/org/springframework/faces/{ => webflow}/el/FlowVariableResolver.java (98%) diff --git a/spring-faces/src/main/java/org/springframework/faces/el/AbstractFlowExecutionPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/el/AbstractFlowExecutionPropertyResolver.java similarity index 99% rename from spring-faces/src/main/java/org/springframework/faces/el/AbstractFlowExecutionPropertyResolver.java rename to spring-faces/src/main/java/org/springframework/faces/webflow/el/AbstractFlowExecutionPropertyResolver.java index e82c9920..ea824f01 100644 --- a/spring-faces/src/main/java/org/springframework/faces/el/AbstractFlowExecutionPropertyResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/el/AbstractFlowExecutionPropertyResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.faces.el; +package org.springframework.faces.webflow.el; import javax.faces.el.EvaluationException; import javax.faces.el.PropertyNotFoundException; diff --git a/spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/el/DelegatingFlowVariableResolver.java similarity index 98% rename from spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java rename to spring-faces/src/main/java/org/springframework/faces/webflow/el/DelegatingFlowVariableResolver.java index ab3623e2..c9ddc338 100644 --- a/spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/el/DelegatingFlowVariableResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.faces.el; +package org.springframework.faces.webflow.el; import javax.faces.context.FacesContext; import javax.faces.el.EvaluationException; diff --git a/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowExecutionPropertyResolver.java similarity index 99% rename from spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java rename to spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowExecutionPropertyResolver.java index 824f5c48..6ccc7264 100644 --- a/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowExecutionPropertyResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.faces.el; +package org.springframework.faces.webflow.el; import java.util.Map; diff --git a/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowExecutionVariableResolver.java similarity index 98% rename from spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionVariableResolver.java rename to spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowExecutionVariableResolver.java index 2ab359d3..0d334b35 100644 --- a/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionVariableResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowExecutionVariableResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.faces.el; +package org.springframework.faces.webflow.el; import javax.faces.context.FacesContext; import javax.faces.el.EvaluationException; diff --git a/spring-faces/src/main/java/org/springframework/faces/el/FlowPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowPropertyResolver.java similarity index 98% rename from spring-faces/src/main/java/org/springframework/faces/el/FlowPropertyResolver.java rename to spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowPropertyResolver.java index 58e66404..60e7a006 100644 --- a/spring-faces/src/main/java/org/springframework/faces/el/FlowPropertyResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowPropertyResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.faces.el; +package org.springframework.faces.webflow.el; import javax.faces.context.FacesContext; import javax.faces.el.PropertyResolver; diff --git a/spring-faces/src/main/java/org/springframework/faces/el/FlowVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowVariableResolver.java similarity index 98% rename from spring-faces/src/main/java/org/springframework/faces/el/FlowVariableResolver.java rename to spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowVariableResolver.java index 4f4e9fb7..95335f79 100644 --- a/spring-faces/src/main/java/org/springframework/faces/el/FlowVariableResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/el/FlowVariableResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.faces.el; +package org.springframework.faces.webflow.el; import javax.faces.context.FacesContext; import javax.faces.el.EvaluationException; diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/FlowPropertyResolverTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowPropertyResolverTests.java index 2d9b8230..49ba20c6 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/FlowPropertyResolverTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowPropertyResolverTests.java @@ -23,7 +23,7 @@ import javax.faces.el.ReferenceSyntaxException; import junit.framework.TestCase; import org.easymock.EasyMock; -import org.springframework.faces.el.FlowPropertyResolver; +import org.springframework.faces.webflow.el.FlowPropertyResolver; import org.springframework.webflow.execution.FlowExecution; import org.springframework.webflow.test.MockFlowSession; diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/FlowVariableResolverTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowVariableResolverTests.java index 382a58f6..35978c1c 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/FlowVariableResolverTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/FlowVariableResolverTests.java @@ -22,9 +22,9 @@ import javax.faces.el.VariableResolver; import junit.framework.TestCase; import org.easymock.EasyMock; -import org.springframework.faces.el.FlowVariableResolver; import org.springframework.faces.webflow.FlowExecutionHolder; import org.springframework.faces.webflow.FlowExecutionHolderUtils; +import org.springframework.faces.webflow.el.FlowVariableResolver; import org.springframework.webflow.execution.FlowExecution; import org.springframework.webflow.execution.repository.FlowExecutionKey; diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/JSF11ManagedBeanAccessTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JSF11ManagedBeanAccessTests.java index 3ce2df95..6ca7f091 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/JSF11ManagedBeanAccessTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JSF11ManagedBeanAccessTests.java @@ -8,10 +8,10 @@ import org.easymock.EasyMock; import org.jboss.el.ExpressionFactoryImpl; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.ClassPathResource; -import org.springframework.faces.el.DelegatingFlowVariableResolver; -import org.springframework.faces.el.FlowPropertyResolver; -import org.springframework.faces.el.FlowVariableResolver; import org.springframework.faces.el.Jsf11ELExpressionParser; +import org.springframework.faces.webflow.el.DelegatingFlowVariableResolver; +import org.springframework.faces.webflow.el.FlowPropertyResolver; +import org.springframework.faces.webflow.el.FlowVariableResolver; import org.springframework.util.ResourceUtils; import org.springframework.web.context.support.GenericWebApplicationContext; import org.springframework.web.jsf.DelegatingVariableResolver;