You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2005/10/11 02:11:17 UTC

svn commit: r312769 - in /struts/shale/trunk: build.properties.sample build.xml docs/release-notes-1.0.0.html use-cases/build.xml use-cases/src/web/WEB-INF/web.xml

Author: craigmcc
Date: Mon Oct 10 17:10:36 2005
New Revision: 312769

URL: http://svn.apache.org/viewcvs?rev=312769&view=rev
Log:
Now that MyFaces has passed the JSF 1.1 TCK, make it the default JSF impl used
by the use cases example application.  Also, simplify the use cases build
script because MyFaces 1.1.0 no longer requires a custom listener.

Also, update the MyFaces dependency from version 1.0.9 to 1.1.0.  If you are
using the Ant build scripts, you will need to run "ant download-dependencies"
once (from the top level Shale directory) to pick up this change.

Modified:
    struts/shale/trunk/build.properties.sample
    struts/shale/trunk/build.xml
    struts/shale/trunk/docs/release-notes-1.0.0.html
    struts/shale/trunk/use-cases/build.xml
    struts/shale/trunk/use-cases/src/web/WEB-INF/web.xml

Modified: struts/shale/trunk/build.properties.sample
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.properties.sample?rev=312769&r1=312768&r2=312769&view=diff
==============================================================================
--- struts/shale/trunk/build.properties.sample (original)
+++ struts/shale/trunk/build.properties.sample Mon Oct 10 17:10:36 2005
@@ -44,18 +44,18 @@
 
 # The absolute or relative pathname of the JavaServer Faces 
 # implementation
-jsf.home = ${lib.dir}/jsf-ri
-#jsf.home = ${lib.dir}/myfaces
+#jsf.home = ${lib.dir}/jsf-ri
+jsf.home = ${lib.dir}/myfaces
 
 # The absolute pathname of the JavaServer Faces API jar file
 # for your implementation
-jsf-api.jar = ${jsf.home}/jsf-api.jar
-#jsf-api.jar = ${jsf.home}/myfaces-api.jar
+#jsf-api.jar = ${jsf.home}/jsf-api.jar
+jsf-api.jar = ${jsf.home}/myfaces-api.jar
 
 # The absolute pathname of the JavaServer Faces implementation jar file
 # for your implementation
-jsf-impl.jar = ${jsf.home}/jsf-impl.jar
-#jsf-impl.jar = ${jsf.home}/myfaces-impl.jar
+#jsf-impl.jar = ${jsf.home}/jsf-impl.jar
+jsf-impl.jar = ${jsf.home}/myfaces-impl.jar
 
 # The absolute or relative pathname of the Apache Struts 
 # distribution

Modified: struts/shale/trunk/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=312769&r1=312768&r2=312769&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Mon Oct 10 17:10:36 2005
@@ -460,15 +460,15 @@
     <mkdir        dir="${lib.dir}/myfaces"/>
     <get         dest="${lib.dir}/myfaces/myfaces-api.jar"
          ignoreerrors="true"
-                  src="${maven.repo}/myfaces/jars/myfaces-jsf-api-1.0.9.jar"
+                  src="${maven.repo}/myfaces/jars/myfaces-api-1.1.0.jar"
          usetimestamp="true"/>
     <get         dest="${lib.dir}/myfaces/myfaces-extensions.jar"
          ignoreerrors="true"
-                  src="${maven.repo}/myfaces/jars/myfaces-extensions-1.0.9.jar"
+                  src="${maven.repo}/myfaces/jars/tomahawk-1.1.0.jar"
          usetimestamp="true"/>
     <get         dest="${lib.dir}/myfaces/myfaces-impl.jar"
          ignoreerrors="true"
-                  src="${maven.repo}/myfaces/jars/myfaces-impl-1.0.9.jar"
+                  src="${maven.repo}/myfaces/jars/myfaces-impl-1.1.0.jar"
          usetimestamp="true"/>
 
     <mkdir        dir="${lib.dir}/portlet-api"/>

Modified: struts/shale/trunk/docs/release-notes-1.0.0.html
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/docs/release-notes-1.0.0.html?rev=312769&r1=312768&r2=312769&view=diff
==============================================================================
--- struts/shale/trunk/docs/release-notes-1.0.0.html (original)
+++ struts/shale/trunk/docs/release-notes-1.0.0.html Mon Oct 10 17:10:36 2005
@@ -329,18 +329,6 @@
     &lt;/filter-mapping&gt;
     </pre>
 
-    <p>If your JavaServer Faces implementation requires a listener registration,
-    configure it here.  For example, MyFaces 1.0.9 requires the following
-    (note - it is likely that future versions of MyFaces will not require this):</p>
-
-    <pre>
-    &lt;listener&gt;
-      &lt;listener-class&gt;
-        org.apache.myfaces.webapp.StartupServletContextListener
-      &lt;/listener-class&gt;
-    &lt;/listener&gt;
-    </pre>
-
     <p>Configure the Commons Chain configuration listener, so that command
     chains definitions specified by the application, and those defined
     internally by Shale, will be loaded at application startup time.</p>

Modified: struts/shale/trunk/use-cases/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=312769&r1=312768&r2=312769&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Mon Oct 10 17:10:36 2005
@@ -240,12 +240,7 @@
   <target name="static.myfaces" depends="static.jsfri"
             if="myfaces.present">
 
-    <replace        dir="${build.home}/${context.path}/WEB-INF"
-                  token="MYFACES_BEGIN"
-                  value="&lt;!-- MyFaces Listener --&gt;"/>
-    <replace        dir="${build.home}/${context.path}/WEB-INF"
-                  token="MYFACES_END"
-                  value=""/>
+    <!-- No custom listener required with MyFaces 1.1.0 or later -->
 
   </target>
 
@@ -276,8 +271,10 @@
                   file="${commons-el.jar}"/>
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
                   file="${commons-fileupload.jar}"/>
+<!-- Not using extension components
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
                   file="${jsf.home}/myfaces-extensions.jar"/>
+-->
 
   </target>
 

Modified: struts/shale/trunk/use-cases/src/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/web/WEB-INF/web.xml?rev=312769&r1=312768&r2=312769&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/src/web/WEB-INF/web.xml (original)
+++ struts/shale/trunk/use-cases/src/web/WEB-INF/web.xml Mon Oct 10 17:10:36 2005
@@ -64,15 +64,6 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-MYFACES_BEGIN
-  <listener>
-    <listener-class>
-      org.apache.myfaces.webapp.StartupServletContextListener
-    </listener-class>
-  </listener>
-MYFACES_END
-
-
   <!-- Commons Chain Configuration Listener -->
   <listener>
     <listener-class>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org