You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/09/01 11:31:44 UTC
svn commit: r265682 - in /cocoon: blocks/portal/trunk/WEB-INF/
blocks/portal/trunk/WEB-INF/xconf/ blocks/portal/trunk/conf/
blocks/portal/trunk/java/org/apache/cocoon/portal/coplets/
blocks/portal/trunk/java/org/apache/cocoon/portal/security/ blocks/po...
Author: cziegeler
Date: Thu Sep 1 02:31:36 2005
New Revision: 265682
URL: http://svn.apache.org/viewcvs?rev=265682&view=rev
Log:
Create own block for portal sample
Removed:
cocoon/blocks/portal/trunk/WEB-INF/portlet.xml
cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-cowarp.xconf
cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal-tools.samplesxconf
cocoon/blocks/portal/trunk/WEB-INF/xconf/cocoon-portal.samplesxconf
cocoon/blocks/portal/trunk/conf/
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplets/
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/security/
cocoon/blocks/portal/trunk/samples/
Modified:
cocoon/trunk/blocks.properties
cocoon/trunk/gump.xml
Modified: cocoon/trunk/blocks.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?rev=265682&r1=265681&r2=265682&view=diff
==============================================================================
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Thu Sep 1 02:31:36 2005
@@ -53,7 +53,7 @@
# can depend on.
#-----[dependency]: "authentication-fw" depends on "session-fw".
-#-----[dependency]: "authentication-fw" is needed by "portal".
+#-----[dependency]: "authentication-fw" is needed by "portal", "portal-sample".
#include.block.authentication-fw=false
#-----[dependency]: "batik" is needed by "fop", "scratchpad", "tour".
#include.block.batik=false
@@ -79,17 +79,19 @@
#include.block.lucene=false
#include.block.naming=false
#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for samples), "hsqldb" (for samples).
-#-----[dependency]: "ojb" is needed by "portal", "querybean".
+#-----[dependency]: "ojb" is needed by "portal-sample", "querybean".
#include.block.ojb=false
#include.block.paranoid=false
#include.block.poi=false
-#-----[dependency]: "portal" depends on "authentication-fw", "cron", "forms", "ojb", "session-fw", "template" (for samples).
-#-----[dependency]: "portal" is needed by "faces".
+#-----[dependency]: "portal" depends on "authentication-fw", "cron", "forms", "session-fw".
+#-----[dependency]: "portal" is needed by "faces", "portal-sample".
#include.block.portal=false
+#-----[dependency]: "portal-sample" depends on "authentication-fw", "cron", "forms", "ojb", "portal", "session-fw", "template" (for samples).
+#include.block.portal-sample=false
#include.block.profiler=false
#-----[dependency]: "python" depends on "xsp".
#include.block.python=false
-#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal", "xsp".
+#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal", "portal-sample", "xsp".
#include.block.session-fw=false
#-----[dependency]: "velocity" is needed by "petstore", "scratchpad".
#include.block.velocity=false
@@ -117,7 +119,7 @@
#-----[dependency]: "axis" is needed by "scratchpad".
#include.block.axis=false
#-----[dependency]: "cron" depends on "template" (for samples).
-#-----[dependency]: "cron" is needed by "jms", "portal", "scratchpad".
+#-----[dependency]: "cron" is needed by "jms", "portal", "portal-sample", "scratchpad".
#include.block.cron=false
#include.block.deli=false
#-----[dependency]: "eventcache" depends on "jms", "template" (for samples).
@@ -127,7 +129,7 @@
#-----[dependency]: "faces" is needed by "scratchpad".
#include.block.faces=false
#-----[dependency]: "forms" depends on "template".
-#-----[dependency]: "forms" is needed by "apples", "ojb", "petstore", "portal", "querybean", "tour".
+#-----[dependency]: "forms" is needed by "apples", "ojb", "petstore", "portal", "portal-sample", "querybean", "tour".
#include.block.forms=false
#-----[dependency]: "javaflow" depends on "template" (for samples).
#-----[dependency]: "javaflow" is needed by "scratchpad".
@@ -160,7 +162,7 @@
#include.block.stx=false
#-----[dependency]: "taglib" is needed by "faces".
#include.block.taglib=false
-#-----[dependency]: "template" is needed by "chaperon", "cron", "eventcache", "forms", "javaflow", "lucene", "petstore", "portal", "querybean", "scratchpad", "slide", "tour", "webdav".
+#-----[dependency]: "template" is needed by "chaperon", "cron", "eventcache", "forms", "javaflow", "lucene", "petstore", "portal-sample", "querybean", "scratchpad", "slide", "tour", "webdav".
#include.block.template=false
#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop", "template".
#include.block.tour=false
Modified: cocoon/trunk/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?rev=265682&r1=265681&r2=265682&view=diff
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Thu Sep 1 02:31:36 2005
@@ -919,7 +919,57 @@
<depend project="cocoon-block-authentication-fw"/>
<depend project="cocoon-block-forms"/>
<depend project="cocoon-block-cron"/>
+ <depend project="jtidy"/>
+ <depend project="nekohtml"/>
+ <depend project="castor"/>
+ <depend project="commons-collections"/>
+ <depend project="portals-pluto" inherit="runtime"/>
+ <depend project="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"/>
+
+ <nag from="Gump <general@gump.apache.org>" 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"/>
@@ -952,7 +1002,7 @@
<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 <general@gump.apache.org>" to="dev@cocoon.apache.org"/>
</project>