[seam-commits] Seam SVN: r7672 - in branches/Seam_1_2_1_AP: examples/glassfish/nbproject and 17 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Fri Mar 21 11:02:02 EDT 2008


Author: manaRH
Date: 2008-03-21 11:02:02 -0400 (Fri, 21 Mar 2008)
New Revision: 7672

Added:
   branches/Seam_1_2_1_AP/lib/jsf-api.jar
   branches/Seam_1_2_1_AP/lib/jsf-impl.jar
   branches/Seam_1_2_1_AP/lib/jsp-api.jar
Removed:
   branches/Seam_1_2_1_AP/lib/myfaces-api-1.1.4.jar
   branches/Seam_1_2_1_AP/lib/myfaces-impl-1.1.4.jar
Modified:
   branches/Seam_1_2_1_AP/doc/reference/en/modules/configuration.xml
   branches/Seam_1_2_1_AP/examples/glassfish/nbproject/project.xml
   branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/faces-config.xml
   branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/web.xml
   branches/Seam_1_2_1_AP/examples/hibernate2/build.xml
   branches/Seam_1_2_1_AP/examples/hibernate2/nbproject/project.xml
   branches/Seam_1_2_1_AP/examples/hibernate2/resources/faces-config.xml
   branches/Seam_1_2_1_AP/examples/hibernate2/resources/web.xml
   branches/Seam_1_2_1_AP/examples/jpa/build.xml
   branches/Seam_1_2_1_AP/examples/jpa/lib/mc/commons-logging.jar
   branches/Seam_1_2_1_AP/examples/jpa/nbproject/project.xml
   branches/Seam_1_2_1_AP/examples/jpa/resources/faces-config.xml
   branches/Seam_1_2_1_AP/examples/mail/resources/WEB-INF/faces-config.xml
   branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml
   branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/faces-config.xml
   branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/web.xml
   branches/Seam_1_2_1_AP/examples/seampay/resources/WEB-INF/faces-config.xml
   branches/Seam_1_2_1_AP/examples/seamspace/resources/WEB-INF/faces-config.xml
   branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml
   branches/Seam_1_2_1_AP/examples/wiki/Wiki.ipr
   branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/faces-config.xml
   branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/web.xml
   branches/Seam_1_2_1_AP/lib/el-api.jar
   branches/Seam_1_2_1_AP/lib/el-ri.jar
   branches/Seam_1_2_1_AP/lib/servlet-api.jar
   branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml
Log:
JBPAPP-679

Modified: branches/Seam_1_2_1_AP/doc/reference/en/modules/configuration.xml
===================================================================
--- branches/Seam_1_2_1_AP/doc/reference/en/modules/configuration.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/doc/reference/en/modules/configuration.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -662,8 +662,8 @@
             el-api.jar
             el-ri.jar
             jsf-facelets.jar
-            myfaces-api.jar
-            myfaces-impl.jar
+            jsf-api.jar
+            jsf-impl.jar
             jboss-ejb3.jar
             jboss-jca.jar
             jboss-j2ee.jar
@@ -953,8 +953,8 @@
             jboss-microcontainer.jar
             jboss-jca.jar
             ...
-            myfaces-api.jar
-            myfaces-impl.jar
+            jsf-api.jar
+            jsf-impl.jar
             mc-conf.jar/
                 jndi.properties
                 log4j.xml

Modified: branches/Seam_1_2_1_AP/examples/glassfish/nbproject/project.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/glassfish/nbproject/project.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/glassfish/nbproject/project.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -62,7 +62,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../facelets/lib/el-api.jar:../../facelets/lib/el-ri.jar:../../facelets/lib/jsf-facelets.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/hibernate-all.jar:../../lib/myfaces-api-1.1.4.jar:../../lib/myfaces-impl-1.1.4.jar</classpath>
+                <classpath mode="compile">../../facelets/lib/el-api.jar:../../facelets/lib/el-ri.jar:../../facelets/lib/jsf-facelets.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/hibernate-all.jar:../../lib/jsf-api.jar:../../lib/jsf-impl.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>

Modified: branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/faces-config.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/faces-config.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -11,6 +11,11 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
 
+    <application>
+    	<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
+    </application>
+    
     <!-- Navigation rules for the Booking demo app -->
 
     <navigation-rule>

Modified: branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/web.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/web.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate/resources/WEB-INF/web.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -29,8 +29,9 @@
     <servlet-mapping>
       <servlet-name>Seam Resource Servlet</servlet-name>
       <url-pattern>/seam/resource/*</url-pattern>
-    </servlet-mapping>     
-        
+    </servlet-mapping>             
+    
+    <!-- JSF RI  -->
     <listener>
         <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
     </listener>

Modified: branches/Seam_1_2_1_AP/examples/hibernate2/build.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/build.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/build.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -150,8 +150,8 @@
         <include name="el-api.jar" />
         <include name="el-ri.jar" />
         <include name="jsf-facelets.jar" />
-        <include name="myfaces-api-1.1.4.jar" />
-        <include name="myfaces-impl-1.1.4.jar" />
+        <include name="jsf-api.jar" />
+        <include name="jsf-impl.jar" />
         <include name="thirdparty-all.jar" />
         <include name="commons*.jar" />
       </lib>
@@ -212,8 +212,8 @@
         <include name="el-api.jar" />
         <include name="el-ri.jar" />
         <include name="jsf-facelets.jar" />
-        <include name="myfaces-api-1.1.4.jar" />
-        <include name="myfaces-impl-1.1.4.jar" />
+	<include name="jsf-api.jar" />
+        <include name="jsf-impl.jar" />
         <include name="thirdparty-all.jar" />
         <include name="commons*.jar" />
       </lib>
@@ -267,9 +267,9 @@
         <include name="ajax4jsf*.jar" />
         <include name="oscache*.jar" />
         <include name="jsf-facelets.jar" />
-        <include name="myfaces-api-1.1.4.jar" />
-        <include name="myfaces-impl-1.1.4.jar" />
-        <include name="thirdparty-all.jar" />
+	<include name="jsf-api.jar" />
+        <include name="jsf-impl.jar" />
+	<include name="thirdparty-all.jar" />
         <include name="commons*.jar" />
       </lib>
       <lib dir="${hibernatelib}">

Modified: branches/Seam_1_2_1_AP/examples/hibernate2/nbproject/project.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/nbproject/project.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/nbproject/project.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -53,7 +53,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../jboss-seam-debug.jar:../../jboss-seam-gen.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/myfaces-api-1.1.4.jar:../../lib/hibernate-all.jar</classpath>
+                <classpath mode="compile">../../jboss-seam-debug.jar:../../jboss-seam-gen.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/jsf-api.jar:../../lib/hibernate-all.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>

Modified: branches/Seam_1_2_1_AP/examples/hibernate2/resources/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/resources/faces-config.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/resources/faces-config.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -10,7 +10,9 @@
     xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+    
     <application>
+    	<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
         <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
     </application>
     

Modified: branches/Seam_1_2_1_AP/examples/hibernate2/resources/web.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/hibernate2/resources/web.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/hibernate2/resources/web.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -66,9 +66,14 @@
       <param-value>true</param-value>    
     </context-param>  
     
-    <!-- MyFaces -->    
+    <!-- MyFaces     
     <listener>        
       <listener-class>com.sun.faces.config.ConfigureListener</listener-class>    
+    </listener>-->
+    
+    <!-- JSF RI  -->
+    <listener>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
     </listener>     
     
     <session-config>

Modified: branches/Seam_1_2_1_AP/examples/jpa/build.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/jpa/build.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/jpa/build.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -154,8 +154,8 @@
         <include name="ajax4jsf*.jar" />
         <include name="oscache*.jar" />
         <include name="jsf-facelets.jar" />
-        <include name="myfaces-api-1.1.4.jar" />
-        <include name="myfaces-impl-1.1.4.jar" />
+        <include name="jsf-api.jar" />
+        <include name="jsf-impl.jar" />
         <include name="thirdparty-all.jar" />
         <include name="commons*.jar" />
       </lib>
@@ -214,8 +214,8 @@
         <include name="ajax4jsf*.jar" />
         <include name="oscache*.jar" />
         <include name="jsf-facelets.jar" />
-        <include name="myfaces-api-1.1.4.jar" />
-        <include name="myfaces-impl-1.1.4.jar" />
+        <include name="jsf-api.jar" />
+        <include name="jsf-impl.jar" />
         <include name="thirdparty-all.jar" />
         <include name="commons*.jar" />
       </lib>
@@ -267,8 +267,8 @@
         <include name="ajax4jsf*.jar" />
         <include name="oscache*.jar" />
         <include name="jsf-facelets.jar" />
-        <include name="myfaces-api-1.1.4.jar" />
-        <include name="myfaces-impl-1.1.4.jar" />
+        <include name="jsf-api.jar" />
+        <include name="jsf-impl.jar" />
         <include name="thirdparty-all.jar" />
         <include name="commons*.jar" />
       </lib>

Modified: branches/Seam_1_2_1_AP/examples/jpa/lib/mc/commons-logging.jar
===================================================================
(Binary files differ)

Modified: branches/Seam_1_2_1_AP/examples/jpa/nbproject/project.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/jpa/nbproject/project.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/jpa/nbproject/project.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -62,7 +62,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../facelets/lib/el-api.jar:../../facelets/lib/el-ri.jar:../../facelets/lib/jsf-facelets.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/hibernate-all.jar:../../lib/myfaces-api-1.1.4.jar:../../lib/myfaces-impl-1.1.4.jar</classpath>
+                <classpath mode="compile">../../facelets/lib/el-api.jar:../../facelets/lib/el-ri.jar:../../facelets/lib/jsf-facelets.jar:../../jboss-seam-ui.jar:../../jboss-seam.jar:../../lib/hibernate-all.jar:../../lib/jsf-api.jar:../../lib/jsf-impl-1.1.4.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>

Modified: branches/Seam_1_2_1_AP/examples/jpa/resources/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/jpa/resources/faces-config.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/jpa/resources/faces-config.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -10,7 +10,9 @@
     xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+
     <application>
+    	<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
         <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
     </application>
     

Modified: branches/Seam_1_2_1_AP/examples/mail/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/mail/resources/WEB-INF/faces-config.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/mail/resources/WEB-INF/faces-config.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -22,8 +22,8 @@
    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
 
     <application>
+    	<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
         <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
-        <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
     </application>	
 
     <lifecycle>

Modified: branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -21,14 +21,14 @@
     <java>jboss-seam.jar</java>
   </module>
   
-  <module>
+  <!--  <module>
     <java>el-api.jar</java>
   </module>
 
   <module>
     <java>el-ri.jar</java>
-  </module>
-  
+  </module>-->
+    
    <module>
 	    <java>drools-compiler-4.0.2.jar</java>
 	</module>
@@ -46,7 +46,7 @@
 	</module>
   
   <module>
-    <java>jcaptcha-all-1.0-RC3.jar</java>
+    <java>jcaptcha-all-1.0-RC4.jar</java>
   </module>
   
 </application>
\ No newline at end of file

Modified: branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/faces-config.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/faces-config.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -5,7 +5,8 @@
 <faces-config>
 
     <application>
-        <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
+        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
     </application>
 
     <!-- Phase listener needed for all Seam applications -->

Modified: branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/web.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/web.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seambay/resources/WEB-INF/web.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -33,9 +33,15 @@
 
     <!-- MyFaces -->
 
+    <!--  <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>-->
+    
+    <!-- JSF RI  -->
     <listener>
-        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
     </listener>
+    
 
     <context-param>
         <param-name>javax.faces.STATE_SAVING_METHOD</param-name>

Modified: branches/Seam_1_2_1_AP/examples/seampay/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seampay/resources/WEB-INF/faces-config.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seampay/resources/WEB-INF/faces-config.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -10,7 +10,6 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
     <!-- Facelets support -->
     <application>
-        <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
         <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
         <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
     </application>

Modified: branches/Seam_1_2_1_AP/examples/seamspace/resources/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/seamspace/resources/WEB-INF/faces-config.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/seamspace/resources/WEB-INF/faces-config.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -11,7 +11,7 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
 
     <application>
-        <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
+    	<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
         <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
     </application>
 

Modified: branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -107,7 +107,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../lib/myfaces-impl-1.1.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -693,8 +693,8 @@
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/myfaces-impl-1.1.4.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/myfaces-impl-1.1.4.jar!/</url>
+      <attribute name="URI" value="/WEB-INF/lib/jsf-impl.jar" />
+      <url>jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/</url>
     </containerElement>
     <containerElement type="library" level="module">
       <attribute name="method" value="1" />

Modified: branches/Seam_1_2_1_AP/examples/wiki/Wiki.ipr
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/Wiki.ipr	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/wiki/Wiki.ipr	2008-03-21 15:02:02 UTC (rev 7672)
@@ -315,7 +315,7 @@
     <library name="jsf">
       <CLASSES>
         <root url="jar://$PROJECT_DIR$/lib/myfaces-api-1.1.4.jar!/" />
-        <root url="jar://$PROJECT_DIR$/lib/myfaces-impl-1.1.4.jar!/" />
+        <root url="jar://$PROJECT_DIR$/lib/jsf-impl.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-beanutils-1.7.0.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-codec-1.3.jar!/" />
         <root url="jar://$PROJECT_DIR$/lib/commons-collections-3.1.jar!/" />

Modified: branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/faces-config.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/faces-config.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/faces-config.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -11,6 +11,7 @@
       <!--
       <view-handler>org.jboss.seam.ui.facelet.SeamFaceletViewHandler</view-handler>
       -->
+        <el-resolver>org.jboss.seam.jsf.SeamELResolver</el-resolver>
    </application>
 
     <!-- Why do I have to define this here again? It's already in wiki.taglib.xml! -->

Modified: branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/web.xml
===================================================================
--- branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/web.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/examples/wiki/src/etc/WEB-INF/web.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -72,11 +72,15 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-   <!-- MyFaces -->
-
+   <!-- MyFaces 
    <listener>
       <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-   </listener>
+   </listener>-->
+   
+   <!-- JSF RI  -->
+    <listener>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+    </listener>
 
    <!-- Facelets development mode (disable in production) -->
 

Modified: branches/Seam_1_2_1_AP/lib/el-api.jar
===================================================================
(Binary files differ)

Modified: branches/Seam_1_2_1_AP/lib/el-ri.jar
===================================================================
(Binary files differ)

Added: branches/Seam_1_2_1_AP/lib/jsf-api.jar
===================================================================
(Binary files differ)


Property changes on: branches/Seam_1_2_1_AP/lib/jsf-api.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/Seam_1_2_1_AP/lib/jsf-impl.jar
===================================================================
(Binary files differ)


Property changes on: branches/Seam_1_2_1_AP/lib/jsf-impl.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/Seam_1_2_1_AP/lib/jsp-api.jar
===================================================================
(Binary files differ)


Property changes on: branches/Seam_1_2_1_AP/lib/jsp-api.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/Seam_1_2_1_AP/lib/myfaces-api-1.1.4.jar
===================================================================
(Binary files differ)

Deleted: branches/Seam_1_2_1_AP/lib/myfaces-impl-1.1.4.jar
===================================================================
(Binary files differ)

Modified: branches/Seam_1_2_1_AP/lib/servlet-api.jar
===================================================================
(Binary files differ)

Modified: branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml
===================================================================
--- branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml	2008-03-21 11:10:44 UTC (rev 7671)
+++ branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml	2008-03-21 15:02:02 UTC (rev 7672)
@@ -80,7 +80,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">lib/ant.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-codec-1.3.jar:lib/commons-collections-3.1.jar:lib/commons-digester-1.6.jar:lib/commons-el-1.0.jar:lib/commons-lang-2.1.jar:lib/el-api.jar:lib/el-ri.jar:lib/hibernate-all.jar:lib/hsqldb.jar:lib/javax.servlet.jsp.jar:lib/jboss-aop-jdk50.jar:lib/jboss-cache-jdk50.jar:lib/jboss-ejb3-all.jar:lib/jboss-seam-debug.jar:lib/jboss-seam-ui.jar:lib/jboss-seam.jar:lib/jbpm-jpdl.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl-1.1.0.jar:lib/mailstuff.jar:lib/myfaces-api-1.1.4.jar:lib/myfaces-impl-1.1.4.jar:lib/portlet-api-lib.jar:lib/servlet-api.jar:lib/testng-4.5.1-jdk15.jar:lib/thirdparty-all.jar</classpath>
+                <classpath mode="compile">lib/ant.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-codec-1.3.jar:lib/commons-collections-3.1.jar:lib/commons-digester-1.6.jar:lib/commons-el-1.0.jar:lib/commons-lang-2.1.jar:lib/el-api.jar:lib/el-ri.jar:lib/hibernate-all.jar:lib/hsqldb.jar:lib/javax.servlet.jsp.jar:lib/jboss-aop-jdk50.jar:lib/jboss-cache-jdk50.jar:lib/jboss-ejb3-all.jar:lib/jboss-seam-debug.jar:lib/jboss-seam-ui.jar:lib/jboss-seam.jar:lib/jbpm-jpdl.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl-1.1.0.jar:lib/mailstuff.jar:lib/jsf-api.jar:lib/jsf-impl.jar:lib/portlet-api-lib.jar:lib/servlet-api.jar:lib/testng-4.5.1-jdk15.jar:lib/thirdparty-all.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>




More information about the seam-commits mailing list