svn commit: r233500 - in /cocoon/blocks/faces/trunk: conf/faces-listener.xweb samples/myfaces-patch.diff samples/samples.xml samples/sitemap.xmap

[vg...@apache.org]

Author: vgritsenko
Date: Fri Aug 19 09:03:52 2005
New Revision: 233500

URL: http://svn.apache.org/viewcvs?rev=233500&view=rev
Log:
    <action dev="VG" type="update">
      Faces block: Updated MyFaces libraries to the SVN r233484, get rid of patched
      version.
    </action>


Removed:
    cocoon/blocks/faces/trunk/samples/myfaces-patch.diff
Modified:
    cocoon/blocks/faces/trunk/conf/faces-listener.xweb
    cocoon/blocks/faces/trunk/samples/samples.xml
    cocoon/blocks/faces/trunk/samples/sitemap.xmap

Modified: cocoon/blocks/faces/trunk/conf/faces-listener.xweb
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/conf/faces-listener.xweb?rev=233500&r1=233499&r2=233500&view=diff
==============================================================================
--- cocoon/blocks/faces/trunk/conf/faces-listener.xweb (original)
+++ cocoon/blocks/faces/trunk/conf/faces-listener.xweb Fri Aug 19 09:03:52 2005
@@ -23,7 +23,7 @@
       - JavaServer Faces configuration loader. For Sun's RI implementation use
       - com.sun.faces.config.ConfigureListener class.
       -->
-    <listener-class>net.sourceforge.myfaces.webapp.StartupServletContextListener</listener-class>
+    <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
   </listener>
 
 </xweb>

Modified: cocoon/blocks/faces/trunk/samples/samples.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/samples/samples.xml?rev=233500&r1=233499&r2=233500&view=diff
==============================================================================
--- cocoon/blocks/faces/trunk/samples/samples.xml (original)
+++ cocoon/blocks/faces/trunk/samples/samples.xml Fri Aug 19 09:03:52 2005
@@ -30,13 +30,10 @@
       block for supported forms processing framework.
     </note>
     <note>
-      Faces block comes with MyFaces JSF implementation with this small patch
-      applied. Cocoon Faces block can also be run with Sun (JSF 1.1_01) and
-      IBM implementations (WSAD 5.1.2, requires patching).
+      Faces block comes with <a href="http://myfaces.apache.org/">MyFaces</a>
+      JSF implementation. Cocoon Faces block can also be run with Sun (JSF 1.1_01)
+      and IBM implementations (WSAD 5.1.2, requires patching).
     </note>
-    <sample name="Patch" href="myfaces-patch.diff">
-      Patch against MyFaces CVS repository as of 20040916.
-    </sample>
   </group>
 
   <group name="JavaServer Faces">

Modified: cocoon/blocks/faces/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/samples/sitemap.xmap?rev=233500&r1=233499&r2=233500&view=diff
==============================================================================
--- cocoon/blocks/faces/trunk/samples/sitemap.xmap (original)
+++ cocoon/blocks/faces/trunk/samples/sitemap.xmap Fri Aug 19 09:03:52 2005
@@ -92,13 +92,6 @@
       </map:match>
 
       <!--
-        - MyFaces Patch
-        -->
-      <map:match pattern="*.diff">
-        <map:read mime-type="text/plain" src="{1}.diff"/>
-      </map:match>
-
-      <!--
         - Action invoking JavaServer Faces lifecycle.
         - Render phase of the lifecycle dispatches view render request
         - back to the sitemap.