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/.classpath

@@ -3,5 +3,34 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/global/ognl.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-binding.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-core.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-web.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-webflow.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-webmvc.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/avalon-framework.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-beanutils.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-codec.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-collections.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-digester.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/commons-discovery.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/concurrent.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/el-api.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/logkit.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/myfaces-api.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/myfaces-impl.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/shale-remoting.jar"/>
+	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
+	<classpathentry kind="lib" path="lib/test/jboss-el.jar"/>
+	<classpathentry kind="lib" path="lib/test/junit.jar"/>
+	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/test/shale-test.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/servlet-api.jar"/>
+	<classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

spring-faces/ivy.xml

@@ -7,14 +7,42 @@
 		<conf name="global" visibility="private" />
 		<conf name="buildtime" visibility="private" />
 		<conf name="test" visibility="private" />
+		
+		<!-- public JSF configurations other projects may use -->
+		<conf name="default" extends="jsf12" />
+		<conf name="jsf11" visibility="public" extends="global" />
+		<conf name="jsf12" visibility="public" extends="global" />
 	</configurations>
 
 	<dependencies defaultconf="global->default">
 		<!-- global dependencies -->
+		<dependency org="org.springframework" name="spring-webflow" rev="latest.integration" />
 
 		<!-- build time only dependencies -->
+		<dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="buildtime->default" />
+		<dependency org="javax.el" name="el-api" rev="1.0" conf="buildtime->default" />
+		
+		<!-- JSF 1.2 dependencies -->
+		<!-- note that at this time we depend on MyFaces, not JSF-RI -->
+		<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.0" conf="buildtime, jsf12->default" />
+		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.0" conf="buildtime, jsf12->default" />
+		<dependency org="concurrent" name="concurrent" rev="1.3.4" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-digester" name="commons-digester" rev="1.8" conf="buildtime, jsf12->default" >
+    		<exclude module="servlet-api"/>
+    	</dependency>
+    	<dependency org="commons-codec" name="commons-codec" rev="1.3" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-discovery" name="commons-discovery" rev="0.4" conf="buildtime, jsf12->default" />
+    	<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="buildtime, jsf12->default" />
+		<dependency org="org.apache.shale" name="shale-remoting" rev="1.0.4" conf="buildtime, jsf12->default" />
 		
 		<!-- test dependencies -->
+		<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
+		<dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default" />
+		<dependency org="org.easymock" name="easymock" rev="2.2" conf="test->default" />
+		<dependency org="jboss" name="jboss-el" rev="1.0" conf="test->default"/>
+		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
+		<dependency org="org.springframework" name="spring-mock" rev="2.1-m3" conf="test->default" />
+		
 	</dependencies>
 
 </ivy-module>

spring-faces/src/etc/test-resources/log4j.properties

@@ -0,0 +1,18 @@
+log4j.rootCategory=WARN, stdout, logfile
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.appender.logfile=org.apache.log4j.RollingFileAppender
+log4j.appender.logfile.File=@TEST_RESULTS_DIR@/@PROJECT_NAME@.log
+log4j.appender.logfile.MaxFileSize=512KB
+
+# Keep three backup files
+log4j.appender.logfile.MaxBackupIndex=3
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+#Pattern to output : date priority [category] - <message>line_separator
+log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.category.org.springframework.webflow=DEBUG
+log4j.category.org.springframework.binding=DEBUG

spring-faces/src/main/java/org/springframework/faces/el/AbstractFlowExecutionPropertyResolver.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.el;
 
 import javax.faces.el.EvaluationException;
 import javax.faces.el.PropertyNotFoundException;

spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java

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

spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.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.el;
 
 import java.util.Map;
 

spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionVariableResolver.java

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

spring-faces/src/main/java/org/springframework/faces/el/FlowPropertyResolver.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.el;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.PropertyResolver;

spring-faces/src/main/java/org/springframework/faces/el/FlowVariableResolver.java

@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
+import org.springframework.faces.webflow.FlowExecutionHolderUtils;
+
 /**
  * Custom variable resolver that resolves the current FlowExecution object for binding expressions prefixed with
  * {@link #FLOW_SCOPE_VARIABLE}. For instance "flowScope.myBean.myProperty". Designed to be used in conjunction with

spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELExpressionParser.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.el.ELContext;
 import javax.el.ELResolver;

spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELResolverAdapter.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import java.util.Collections;
 import java.util.Iterator;

spring-faces/src/main/java/org/springframework/faces/el/Jsf12ELExpressionParser.java

@@ -1,4 +1,4 @@
-package org.springframework.webflow.executor.jsf;
+package org.springframework.faces.el;
 
 import javax.el.ELContext;
 import javax.el.ExpressionFactory;