svn commit: rev 53797 - in cocoon/trunk: . src/blocks/faces src/blocks/scratchpad/lib

[vgritsenko]

Author: vgritsenko
Date: Tue Oct  5 07:23:41 2004
New Revision: 53797

Added:
   cocoon/trunk/src/blocks/faces/
      - copied from rev 53793, cocoon/branches/BRANCH_2_1_X/src/blocks/faces/
Removed:
   cocoon/trunk/src/blocks/scratchpad/lib/commons-beanutils-core-1.7.jar
   cocoon/trunk/src/blocks/scratchpad/lib/commons-digester-1.5.jar
Modified:
   cocoon/trunk/gump.xml
   cocoon/trunk/status.xml
Log:
copy faces block from 2.1 branch


Modified: cocoon/trunk/gump.xml
==============================================================================
--- cocoon/trunk/gump.xml       (original)
+++ cocoon/trunk/gump.xml       Tue Oct  5 07:23:41 2004
@@ -21,7 +21,6 @@
     | $Id$
     +-->
 <module name="cocoon">
-
   <url href="http://cocoon.apache.org/"/>
   <description>Java XML Framework</description>
   <svn repository="cocoon" dir="trunk/"/>
@@ -159,6 +158,7 @@
     <depend project="cocoon-block-xsp"/>
     <depend project="cocoon-block-javaflow"/>
     <depend project="cocoon-block-repository"/>
+    <depend project="cocoon-block-faces"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>
@@ -1168,6 +1168,31 @@
     <nag from="Gump &lt;general@gump.apache.org&gt;" 
to="dev@cocoon.apache.org"/>
   </project>
 
+  <project name="cocoon-block-faces" status="unstable">
+    <package>org.apache.cocoon</package>
+
+    <ant target="faces-block">
+      <property name="block-name" value="faces"/>
+      <property name="version" value="@@DATE@@"/>
+    </ant>
+
+    <depend project="cocoon" inherit="all"/>
+    <depend project="cocoon-block-taglib"/>
+    <depend project="cocoon-block-portal"/>
+    <depend project="commons-beanutils-core" inherit="all"/>
+    <depend project="commons-digester" inherit="all"/>
+    <!-- FIXME Add commons-el dependency -->
+    <depend project="jakarta-servletapi-5" inherit="all"/>
+    <!-- FIXME Add myfaces dependency -->
+
+    <work nested="tools/anttasks"/>
+    <home nested="build/cocoon-@@DATE@@"/>
+
+    <jar name="blocks/faces-block.jar"/>
+
+    <nag from="Gump &lt;general@gump.apache.org&gt;" 
to="dev@cocoon.apache.org"/>
+  </project>
+
 <!--
   <project name="cocoon-block-jcr" status="unstable">
     <package>org.apache.cocoon</package>
@@ -1184,8 +1209,7 @@
 
     <jar name="blocks/jcr-block.jar"/>
 
-    <nag from="Gump" to="dev@cocoon.apache.org"/>
-
+    <nag from="Gump &lt;general@gump.apache.org&gt;" 
to="dev@cocoon.apache.org"/>
   </project>
 -->
 

Modified: cocoon/trunk/status.xml
==============================================================================
--- cocoon/trunk/status.xml     (original)
+++ cocoon/trunk/status.xml     Tue Oct  5 07:23:41 2004
@@ -304,6 +304,9 @@
    </action>
  </release>
  <release version="2.1.6" date="TBD">
+   <action dev="VG" type="add">
+     Faces block: Added JSF CarStore demo.
+   </action>
    <action dev="VG" type="fix">
      Flow preserves global variables on sitemap reload.
    </action>
@@ -351,6 +354,9 @@
      AbstractSAXTransformer namespaceURI and defaultNamespaceURI must never
      be null. When extending AbstractSAXTransformer make sure to set
      defaultNamespaceURI in the constructor.
+   </action>
+   <action dev="VG" type="add">
+     Faces block: Initial implementation of JavaServer Faces for Cocoon.
    </action>
    <action dev="VG" type="add">
      Taglib block: Initial implementation of BodyTag.