IN PROGRESS - issue SWF-388: Extract all JSF-related code into a separate component project

http://opensource.atlassian.com/projects/spring/browse/SWF-388

spring-faces/src/test/java/org/springframework/faces/webflow/FlowNavigationHandlerArgumentExtractorTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import junit.framework.TestCase;
 

spring-faces/src/test/java/org/springframework/faces/webflow/FlowPropertyResolverTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import javax.faces.el.EvaluationException;
 import javax.faces.el.PropertyNotFoundException;

spring-faces/src/test/java/org/springframework/faces/webflow/FlowSystemCleanupFilterTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.IOException;
 

spring-faces/src/test/java/org/springframework/faces/webflow/FlowVariableResolverTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;

spring-faces/src/test/java/org/springframework/faces/webflow/JSF11ManagedBeanAccessTests.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.FileNotFoundException;
 
@@ -12,10 +12,6 @@ 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.FlowExecutionHolder;
-import org.springframework.faces.webflow.FlowExecutionHolderUtils;
-import org.springframework.faces.webflow.FlowNavigationHandler;
-import org.springframework.faces.webflow.FlowPhaseListener;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.jsf.DelegatingVariableResolver;
@@ -124,7 +120,7 @@ public class JSF11ManagedBeanAccessTests extends AbstractXmlFlowExecutionTests {
 	protected FlowDefinitionResource getFlowDefinitionResource() {
 		try {
 			return createFlowDefinitionResource(ResourceUtils.getFile(
-					"classpath:org/springframework/webflow/executor/jsf/jsf-flow.xml").getPath());
+					"classpath:org/springframework/faces/webflow/jsf-flow.xml").getPath());
 		} catch (FileNotFoundException e) {
 			fail(e.getMessage());
 			return null;
@@ -137,8 +133,7 @@ public class JSF11ManagedBeanAccessTests extends AbstractXmlFlowExecutionTests {
 
 		ctx = new GenericWebApplicationContext();
 		XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx);
-		xmlReader.loadBeanDefinitions(new ClassPathResource(
-				"org/springframework/webflow/executor/jsf/jsf-flow-beans.xml"));
+		xmlReader.loadBeanDefinitions(new ClassPathResource("org/springframework/faces/webflow/jsf-flow-beans.xml"));
 		ctx.refresh();
 
 		jsf.externalContext().getApplicationMap().put(

spring-faces/src/test/java/org/springframework/faces/webflow/JSF12ManagedBeanAccessTests.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import org.jboss.el.ExpressionFactoryImpl;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;

spring-faces/src/test/java/org/springframework/faces/webflow/JSFManagedBean.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.util.ArrayList;
 import java.util.List;

spring-faces/src/test/java/org/springframework/faces/webflow/JSFMockHelper.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import org.apache.shale.test.base.AbstractJsfTestCase;
 import org.apache.shale.test.mock.MockApplication;

spring-faces/src/test/java/org/springframework/faces/webflow/JSFModel.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 public class JSFModel {
 	String value;

spring-faces/src/test/java/org/springframework/faces/webflow/MockApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.util.Collection;
 import java.util.Iterator;

spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.util.Iterator;
 

spring-faces/src/test/java/org/springframework/faces/webflow/MockJsfExternalContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.IOException;
 import java.io.InputStream;

spring-faces/src/test/java/org/springframework/faces/webflow/MockService.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 public interface MockService {
 

spring-faces/src/test/java/org/springframework/faces/webflow/MockViewHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.webflow;
 
 import java.io.IOException;
 import java.util.Locale;

spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml

@@ -10,8 +10,8 @@
 
 	<flow:enable-scopes/>
 	
-	<bean name="jsfModel" class="org.springframework.webflow.executor.jsf.JSFModel" scope="prototype"/>
+	<bean name="jsfModel" class="org.springframework.faces.webflow.JSFModel" scope="prototype"/>
 	
-	<bean name="flowScopedModel" class="org.springframework.webflow.executor.jsf.JSFModel" scope="flow"/>
+	<bean name="flowScopedModel" class="org.springframework.faces.webflow.JSFModel" scope="flow"/>
 
 </beans>