Return-Path: 
 <commits-return-1916-apmail-gump-commits-archive=www.apache.org@gump.apache.org>
Delivered-To: apmail-gump-commits-archive@www.apache.org
Received: (qmail 65761 invoked from network); 16 Sep 2005 04:27:59 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 16 Sep 2005 04:27:59 -0000
Received: (qmail 88621 invoked by uid 500); 16 Sep 2005 04:27:59 -0000
Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@gump.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@gump.apache.org>
List-Post: <mailto:commits@gump.apache.org>
List-Id: <commits.gump.apache.org>
Reply-To: general@gump.apache.org
Delivered-To: mailing list commits@gump.apache.org
Received: (qmail 88607 invoked by uid 99); 16 Sep 2005 04:27:59 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Sep 2005 21:27:59 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 15 Sep 2005 21:28:06 -0700
Received: (qmail 65738 invoked by uid 65534); 16 Sep 2005 04:27:55 -0000
Message-ID: <20050916042755.65737.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r289377 - /gump/metadata/project/cocoon/module.xml
Date: Fri, 16 Sep 2005 04:27:54 -0000
To: commits@gump.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: bodewig
Date: Thu Sep 15 21:27:51 2005
New Revision: 289377

URL: http://svn.apache.org/viewcvs?rev=289377&view=rev
Log:
merge in Cocoon's local changes

Modified:
    gump/metadata/project/cocoon/module.xml

Modified: gump/metadata/project/cocoon/module.xml
URL: http://svn.apache.org/viewcvs/gump/metadata/project/cocoon/module.xml?rev=289377&r1=289376&r2=289377&view=diff
==============================================================================
--- gump/metadata/project/cocoon/module.xml (original)
+++ gump/metadata/project/cocoon/module.xml Thu Sep 15 21:27:51 2005
@@ -137,6 +137,8 @@
             locallib="core/rhino-1.6R1.jar"/>  
     <depend project="ehcache"
             groupId="ehcache" artifactId="ehcache" version="1.1"/> 
+    <depend project="knopflerfish-framework"/>  
+    <depend project="knopflerfish-log"/>  
     <!-- what's this!?! -->     
     <depend project="jing"/>  
     <depend project="junit"
@@ -795,6 +797,8 @@
     <depend project="javamail"/>
     <depend project="jaf"/>
 
+    <library name="geronimo-spec-activation"/>
+    <library name="geronimo-spec-javamail"/>
     <library name="javamail"/>
     <library name="jaf"/>
 
@@ -919,22 +923,88 @@
     <depend project="cocoon-block-authentication-fw"/>
     <depend project="cocoon-block-forms"/>
     <depend project="cocoon-block-cron"/>
+    <depend project="nekohtml"/>
+    <depend project="castor"/>
+    <depend project="commons-collections"/>
+    <depend project="portals-pluto" inherit="runtime"/>
+    <depend project="portals-bridges" ids="portals-bridges-common"/>
+    <depend project="cowarp"/>
+    <depend project="ws-axis"/>
+    <depend project="wsdl4j"/>
+    <depend project="wsrp4j"/>
+    <depend project="commons-discovery"/>
+
+    <library name="nekohtml"/>
+    <library name="castor"/>
+    <library name="commons-collections"/>
+    <library name="pluto"/>
+    <library name="portlet-api"/>
+    <library name="portals-bridges-common"/>
+    <library name="cowarp"/>
+    <library name="axis"/>
+    <library name="axis-saaj"/>
+    <library name="axis-jaxrpc"/>
+    <library name="wsdl4j"/>
+    <library name="commons-discovery"/>
+    <library name="wsrp4j-shared"/>
+    <library name="wsrp4j-consumer"/>
+
+    <work nested="tools/anttasks"/>
+    <home nested="build/cocoon-@@DATE@@"/>
+
+    <jar name="blocks/portal-block.jar"/>
+
+    <nag from="Gump &lt;general@gump.apache.org&gt;" to="dev@cocoon.apache.org"/>
+  </project>
+
+  <project name="cocoon-block-portal-sample" status="stable" dir="src/blocks/portal-sample/trunk">
+    <package>org.apache.cocoon</package>
+
+    <ant target="gump-block">
+      <property name="block-name" value="portal-sample"/>
+      <property name="build" value="build/cocoon-@@DATE@@"/>
+    </ant>
+
+    <depend project="cocoon" inherit="all"/>
+    <depend project="cocoon-block-session-fw"/>
+    <depend project="cocoon-block-authentication-fw"/>
+    <depend project="cocoon-block-forms"/>
+    <depend project="cocoon-block-cron"/>
+    <depend project="cocoon-block-ojb"/>
+    <depend project="cocoon-block-portal"/>
     <depend project="cocoon-block-template" type="samples"/>
     <depend project="jtidy"/>
+    <depend project="nekohtml"/>
     <depend project="castor"/>
     <depend project="commons-collections"/>
-    <depend project="jakarta-pluto" inherit="runtime"/>
+    <depend project="portals-pluto" inherit="runtime"/>
+    <depend project="portals-bridges" ids="portals-bridges-common"/>
+    <depend project="cowarp"/>
+    <depend project="ws-axis"/>
+    <depend project="wsdl4j"/>
+    <depend project="wsrp4j"/>
+    <depend project="commons-discovery"/>
 
     <library name="jtidy"/>
+    <library name="nekohtml"/>
     <library name="castor"/>
     <library name="commons-collections"/>
     <library name="pluto"/>
     <library name="portlet-api"/>
+    <library name="portals-bridges-common"/>
+    <library name="cowarp"/>
+    <library name="axis"/>
+    <library name="axis-saaj"/>
+    <library name="axis-jaxrpc"/>
+    <library name="wsdl4j"/>
+    <library name="commons-discovery"/>
+    <library name="wsrp4j-shared"/>
+    <library name="wsrp4j-consumer"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>
 
-    <jar name="blocks/portal-block.jar"/>
+    <jar name="blocks/portal-sample-block.jar"/>
 
     <nag from="Gump &lt;general@gump.apache.org&gt;" to="dev@cocoon.apache.org"/>
   </project>
@@ -1408,6 +1478,7 @@
 
     <library name="jcr"/>
     <library name="jackrabbit"/>
+    <library name="lucene"/>
 
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>
@@ -1537,10 +1608,39 @@
     <jar name="lib/optional/jackrabbit-20050422T153417.jar"/>
   </project>
 
+  <project name="cowarp">
+    <url href="http://osoco.sourceforge.net/cowarp/"/>
+    <package>org.osoco.cowarp</package>
+    <jar name="lib/optional/cowarp-0.3.jar"/>
+  </project>
+
   <project name="garbage">
     <!-- It would be better to *build* Garbage actually. -->
     <package>org.apache.garbage</package>
     <jar name="lib/optional/apache-garbage-0.0.jar"/>
+  </project>
+
+  <project name="wsrp4j">
+    <url href="http://ws.apache.org/wsrp4j/"/>
+    <package>org.apache.wsrp4j</package>
+    <jar name="lib/optional/wsrp4j-shared-0.3-dev.jar"/>
+    <jar name="lib/optional/wsrp4j-consumer-0.3-dev.jar"/>
+  </project>
+
+  <project name="knopflerfish-framework">
+    <url href="http://www.knopflerfish.org/"/>
+    <description>
+      Knopflerfish Framework
+    </description>
+    <jar name="core/knopflerfish-framework-1.3.3.jar"/>
+  </project>
+
+  <project name="knopflerfish-log">
+    <url href="http://www.knopflerfish.org/"/>
+    <description>
+      Knopflerfish Log
+    </description>
+    <jar name="core/knopflerfish-log_all-1.0.0.jar"/>
   </project>
 
   <!-- jmock doesn't compile against JUnit or ASM HEAD -->