From 95ae514ec2787dc78a4535cc0e1ccf548220a216 Mon Sep 17 00:00:00 2001
From: Jeremy Grelle <jgrelle@vmware.com>
Date: Wed, 2 Apr 2008 16:04:46 +0000
Subject: [PATCH] SWF-514 - Switching to JSF RI as default for JSF 1.2.

---
 spring-faces/ivy.xml                         | 7 ++-----
 spring-webflow-samples/booking-faces/ivy.xml | 8 +++++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml
index 0c65c412..13283476 100644
--- a/spring-faces/ivy.xml
+++ b/spring-faces/ivy.xml
@@ -32,11 +32,8 @@
 		<dependency org="org.richfaces.framework" name="richfaces-api" rev="3.1.4.GA" conf="provided->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.2" conf="compile, jsf12->default" />
-		<dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.2" conf="compile, jsf12->default" />
-    	<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile, jsf12->default" />
-    	<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="compile, jsf12->default" />
+		<dependency org="javax.faces" name="jsf-api" rev="1.2.08" conf="compile, jsf12->default" />
+		<dependency org="javax.faces" name="jsf-impl" rev="1.2.08" conf="compile, jsf12->default" />
     	
     	<!-- JSF 1.1 dependencies -->
     	<dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.1.5" conf="jsf11->default" />
diff --git a/spring-webflow-samples/booking-faces/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml
index d205f8e6..139bf564 100755
--- a/spring-webflow-samples/booking-faces/ivy.xml
+++ b/spring-webflow-samples/booking-faces/ivy.xml
@@ -42,13 +42,15 @@
 		<dependency org="org.jboss" name="jboss-common-core" rev="2.0.4.GA" conf="compile->default"/>
 		<dependency org="org.jboss" name="javassist" rev="3.3.ga" conf="compile->default"/>
 		<dependency org="org.antlr" name="antlr" rev="2.7.6" conf="compile->default"/>
-
-		<!-- Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
-		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
+		<dependency org="org.apache.commons" name="commons-collections" rev="3.2" conf="compile->default" />
+		<dependency org="org.apache" name="commons-codec" rev="1.3" conf="compile, compile->default" />
 		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="compile->default"/>
 		<dependency org="javax.persistence" name="persistence-api" rev="1.0.0" conf="compile->default"/>
 		<dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.9" conf="compile->default"/>
 
+		<!-- Required by "jboss archive browsing" which is used by hibernate-entity manager but not noted in their docs -->
+		<dependency org="edu.oswego.cs" name="concurrent" rev="1.3.4" conf="compile->default"/>
+
 		<!-- build-time only dependencies -->
 		<dependency	org="javax.servlet" name="servlet-api" rev="2.4" conf="provided->default"/>
 		<dependency	org="javax.el" name="el-api" rev="1.0" conf="provided->default"/>