Author: cziegeler
Date: Sat Feb 12 11:16:16 2005
New Revision: 153527
URL: http://svn.apache.org/viewcvs?view=rev&rev=153527
Log:
Block dependencies are now added during build time to the different xconf files
Added:
cocoon/trunk/tools/src/anttasks/BlockConfigTask.java (with props)
Modified:
cocoon/trunk/src/blocks/apples/WEB-INF/xconf/cocoon-apples.xconf
cocoon/trunk/src/blocks/asciiart/WEB-INF/xconf/cocoon-asciiart.xconf
cocoon/trunk/src/blocks/authentication-fw/WEB-INF/xconf/cocoon-authentication-fw.xconf
cocoon/trunk/src/blocks/axis/WEB-INF/xconf/cocoon-axis.xconf
cocoon/trunk/src/blocks/batik/WEB-INF/xconf/cocoon-batik.xconf
cocoon/trunk/src/blocks/bsf/WEB-INF/xconf/cocoon-bsf.xconf
cocoon/trunk/src/blocks/chaperon/WEB-INF/xconf/cocoon-chaperon.xconf
cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cocoon-cron.xconf
cocoon/trunk/src/blocks/databases/WEB-INF/xconf/cocoon-databases.xconf
cocoon/trunk/src/blocks/deli/WEB-INF/xconf/cocoon-deli.xconf
cocoon/trunk/src/blocks/eventcache/WEB-INF/xconf/cocoon-eventcache.xconf
cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf
cocoon/trunk/src/blocks/fop/WEB-INF/xconf/cocoon-fop.xconf
cocoon/trunk/src/blocks/hsqldb/WEB-INF/xconf/cocoon-hsqldb.xconf
cocoon/trunk/src/blocks/html/WEB-INF/xconf/cocoon-html.xconf
cocoon/trunk/src/blocks/itext/WEB-INF/xconf/cocoon-itext.xconf
cocoon/trunk/src/blocks/javaflow/WEB-INF/xconf/cocoon-javaflow.xconf
cocoon/trunk/src/blocks/jfor/WEB-INF/xconf/cocoon-jfor.xconf
cocoon/trunk/src/blocks/jms/WEB-INF/xconf/cocoon-jms.xconf
cocoon/trunk/src/blocks/jsp/WEB-INF/xconf/cocoon-jsp.xconf
cocoon/trunk/src/blocks/linkrewriter/WEB-INF/xconf/cocoon-linkrewriter.xconf
cocoon/trunk/src/blocks/lucene/WEB-INF/xconf/cocoon-lucene.xconf
cocoon/trunk/src/blocks/mail/WEB-INF/xconf/cocoon-mail.xconf
cocoon/trunk/src/blocks/midi/WEB-INF/xconf/cocoon-midi.xconf
cocoon/trunk/src/blocks/naming/WEB-INF/xconf/cocoon-naming.xconf
cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf
cocoon/trunk/src/blocks/paranoid/WEB-INF/xconf/cocoon-paranoid.xconf
cocoon/trunk/src/blocks/petstore/WEB-INF/xconf/cocoon-petstore.xconf
cocoon/trunk/src/blocks/poi/WEB-INF/xconf/cocoon-poi.xconf
cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.xconf
cocoon/trunk/src/blocks/proxy/WEB-INF/xconf/cocoon-proxy.xconf
cocoon/trunk/src/blocks/python/WEB-INF/xconf/cocoon-python.xconf
cocoon/trunk/src/blocks/qdox/WEB-INF/xconf/cocoon-qdox.xconf
cocoon/trunk/src/blocks/querybean/WEB-INF/xconf/cocoon-querybean.xconf
cocoon/trunk/src/blocks/repository/WEB-INF/xconf/cocoon-repository.xconf
cocoon/trunk/src/blocks/scratchpad/WEB-INF/xconf/cocoon-scratchpad.xconf
cocoon/trunk/src/blocks/serializers/WEB-INF/xconf/cocoon-serializers.xconf
cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf
cocoon/trunk/src/blocks/slide/WEB-INF/xconf/cocoon-slide.xconf
cocoon/trunk/src/blocks/slop/WEB-INF/xconf/cocoon-slop.xconf
cocoon/trunk/src/blocks/stx/WEB-INF/xconf/cocoon-stx.xconf
cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf
cocoon/trunk/src/blocks/template/WEB-INF/xconf/cocoon-template.xconf
cocoon/trunk/src/blocks/tour/WEB-INF/xconf/cocoon-tour.xconf
cocoon/trunk/src/blocks/velocity/WEB-INF/xconf/cocoon-velocity.xconf
cocoon/trunk/src/blocks/web3/WEB-INF/xconf/cocoon-web3.xconf
cocoon/trunk/src/blocks/webdav/WEB-INF/xconf/cocoon-webdav.xconf
cocoon/trunk/src/blocks/xmldb/WEB-INF/xconf/cocoon-xmldb.xconf
cocoon/trunk/src/blocks/xsp/WEB-INF/xconf/cocoon-xsp.xconf
cocoon/trunk/tools/src/blocks-build.xsl
cocoon/trunk/tools/targets/init-build.xml
Modified: cocoon/trunk/src/blocks/apples/WEB-INF/xconf/cocoon-apples.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/apples/WEB-INF/xconf/cocoon-apples.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/apples/WEB-INF/xconf/cocoon-apples.xconf (original)
+++ cocoon/trunk/src/blocks/apples/WEB-INF/xconf/cocoon-apples.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-forms.xconf"/>
-
<flow-interpreters>
<component-instance
class="org.apache.cocoon.components.flow.apples.ApplesProcessor"
Modified: cocoon/trunk/src/blocks/asciiart/WEB-INF/xconf/cocoon-asciiart.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/asciiart/WEB-INF/xconf/cocoon-asciiart.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/asciiart/WEB-INF/xconf/cocoon-asciiart.xconf
(original)
+++ cocoon/trunk/src/blocks/asciiart/WEB-INF/xconf/cocoon-asciiart.xconf Sat
Feb 12 11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id: sitemap.xmap 123887 2005-01-02 15:12:01Z sylvain $
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified:
cocoon/trunk/src/blocks/authentication-fw/WEB-INF/xconf/cocoon-authentication-fw.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/authentication-fw/WEB-INF/xconf/cocoon-authentication-fw.xconf?view=diff&r1=153526&r2=153527
==============================================================================
---
cocoon/trunk/src/blocks/authentication-fw/WEB-INF/xconf/cocoon-authentication-fw.xconf
(original)
+++
cocoon/trunk/src/blocks/authentication-fw/WEB-INF/xconf/cocoon-authentication-fw.xconf
Sat Feb 12 11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-session-fw.xconf"/>
-
<!-- Include roles -->
<include
src="resource://org/apache/cocoon/webapps/authentication/authentication.roles"/>
Modified: cocoon/trunk/src/blocks/axis/WEB-INF/xconf/cocoon-axis.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/axis/WEB-INF/xconf/cocoon-axis.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/axis/WEB-INF/xconf/cocoon-axis.xconf (original)
+++ cocoon/trunk/src/blocks/axis/WEB-INF/xconf/cocoon-axis.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/axis/axis.roles"/>
Modified: cocoon/trunk/src/blocks/batik/WEB-INF/xconf/cocoon-batik.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/batik/WEB-INF/xconf/cocoon-batik.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/batik/WEB-INF/xconf/cocoon-batik.xconf (original)
+++ cocoon/trunk/src/blocks/batik/WEB-INF/xconf/cocoon-batik.xconf Sat Feb 12
11:16:16 2005
@@ -20,7 +20,5 @@
| SVN $Id: sitemap.xmap 123887 2005-01-02 15:12:01Z sylvain $
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/bsf/WEB-INF/xconf/cocoon-bsf.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/bsf/WEB-INF/xconf/cocoon-bsf.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/bsf/WEB-INF/xconf/cocoon-bsf.xconf (original)
+++ cocoon/trunk/src/blocks/bsf/WEB-INF/xconf/cocoon-bsf.xconf Sat Feb 12
11:16:16 2005
@@ -20,7 +20,5 @@
| SVN $Id: sitemap.xmap 123887 2005-01-02 15:12:01Z sylvain $
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/chaperon/WEB-INF/xconf/cocoon-chaperon.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/chaperon/WEB-INF/xconf/cocoon-chaperon.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/chaperon/WEB-INF/xconf/cocoon-chaperon.xconf
(original)
+++ cocoon/trunk/src/blocks/chaperon/WEB-INF/xconf/cocoon-chaperon.xconf Sat
Feb 12 11:16:16 2005
@@ -20,7 +20,5 @@
| SVN $Id: sitemap.xmap 123887 2005-01-02 15:12:01Z sylvain $
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-xsp.xconf"/>
-
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cocoon-cron.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cocoon-cron.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cocoon-cron.xconf (original)
+++ cocoon/trunk/src/blocks/cron/WEB-INF/xconf/cocoon-cron.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<component role="org.apache.cocoon.components.cron.JobScheduler"
class="org.apache.cocoon.components.cron.CocoonQuartzJobScheduler"
logger="cron" preload="true">
Modified: cocoon/trunk/src/blocks/databases/WEB-INF/xconf/cocoon-databases.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/WEB-INF/xconf/cocoon-databases.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/databases/WEB-INF/xconf/cocoon-databases.xconf
(original)
+++ cocoon/trunk/src/blocks/databases/WEB-INF/xconf/cocoon-databases.xconf Sat
Feb 12 11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-xsp.xconf"/>
-
<!-- Include roles -->
<include
src="resource://org/apache/cocoon/components/database/database.roles"/>
Modified: cocoon/trunk/src/blocks/deli/WEB-INF/xconf/cocoon-deli.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/deli/WEB-INF/xconf/cocoon-deli.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/deli/WEB-INF/xconf/cocoon-deli.xconf (original)
+++ cocoon/trunk/src/blocks/deli/WEB-INF/xconf/cocoon-deli.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/deli/deli.roles"/>
Modified:
cocoon/trunk/src/blocks/eventcache/WEB-INF/xconf/cocoon-eventcache.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/eventcache/WEB-INF/xconf/cocoon-eventcache.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/eventcache/WEB-INF/xconf/cocoon-eventcache.xconf
(original)
+++ cocoon/trunk/src/blocks/eventcache/WEB-INF/xconf/cocoon-eventcache.xconf
Sat Feb 12 11:16:16 2005
@@ -20,10 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-jms.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-xsp.xconf"/>
-
<component
class="org.apache.cocoon.caching.impl.JMSEventMessageListener"
role="org.apache.cocoon.caching.impl.JMSEventMessageListener"
logger="core.jms">
<parameter name="connection" value="local-topics"/>
Modified: cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf (original)
+++ cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf Sat Feb 12
11:16:16 2005
@@ -20,10 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-portal.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-taglib.xconf"/>
-
<component-instance role="org.apache.cocoon.taglib.TagSelector"
class="org.apache.cocoon.core.container.DefaultServiceSelector">
<taglib name="http://java.sun.com/jsf/core"; logger="sitemap.taglib.jsf"
class="org.apache.cocoon.core.container.StandaloneServiceSelector">
<tag name="actionListener"
class="org.apache.cocoon.faces.taglib.ActionListenerTag"
logger="sitemap.taglib.jsf"/>
Modified: cocoon/trunk/src/blocks/fop/WEB-INF/xconf/cocoon-fop.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/fop/WEB-INF/xconf/cocoon-fop.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/fop/WEB-INF/xconf/cocoon-fop.xconf (original)
+++ cocoon/trunk/src/blocks/fop/WEB-INF/xconf/cocoon-fop.xconf Sat Feb 12
11:16:16 2005
@@ -20,7 +20,5 @@
| SVN $Id: sitemap.xmap 123887 2005-01-02 15:12:01Z sylvain $
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-batik.xconf"/>
-
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/hsqldb/WEB-INF/xconf/cocoon-hsqldb.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/hsqldb/WEB-INF/xconf/cocoon-hsqldb.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/hsqldb/WEB-INF/xconf/cocoon-hsqldb.xconf (original)
+++ cocoon/trunk/src/blocks/hsqldb/WEB-INF/xconf/cocoon-hsqldb.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-databases.xconf"/>
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/hsqldb/hsqldb.roles"/>
Modified: cocoon/trunk/src/blocks/html/WEB-INF/xconf/cocoon-html.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/html/WEB-INF/xconf/cocoon-html.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/html/WEB-INF/xconf/cocoon-html.xconf (original)
+++ cocoon/trunk/src/blocks/html/WEB-INF/xconf/cocoon-html.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<component-instance
role="org.apache.excalibur.xml.sax.SAXParser/HTML"
class="org.apache.excalibur.xml.sax.JTidyHTMLParser"
Modified: cocoon/trunk/src/blocks/itext/WEB-INF/xconf/cocoon-itext.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/itext/WEB-INF/xconf/cocoon-itext.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/itext/WEB-INF/xconf/cocoon-itext.xconf (original)
+++ cocoon/trunk/src/blocks/itext/WEB-INF/xconf/cocoon-itext.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/javaflow/WEB-INF/xconf/cocoon-javaflow.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/javaflow/WEB-INF/xconf/cocoon-javaflow.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/javaflow/WEB-INF/xconf/cocoon-javaflow.xconf
(original)
+++ cocoon/trunk/src/blocks/javaflow/WEB-INF/xconf/cocoon-javaflow.xconf Sat
Feb 12 11:16:16 2005
@@ -20,11 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies
- <include src="context://WEB-INF/xconf/cocoon-forms.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-ojb.xconf"/>
- -->
-
<flow-interpreters>
<component-instance name="java"
class="org.apache.cocoon.components.flow.java.JavaInterpreter" logger="flow"/>
</flow-interpreters>
Modified: cocoon/trunk/src/blocks/jfor/WEB-INF/xconf/cocoon-jfor.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/jfor/WEB-INF/xconf/cocoon-jfor.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/jfor/WEB-INF/xconf/cocoon-jfor.xconf (original)
+++ cocoon/trunk/src/blocks/jfor/WEB-INF/xconf/cocoon-jfor.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/jms/WEB-INF/xconf/cocoon-jms.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/jms/WEB-INF/xconf/cocoon-jms.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/jms/WEB-INF/xconf/cocoon-jms.xconf (original)
+++ cocoon/trunk/src/blocks/jms/WEB-INF/xconf/cocoon-jms.xconf Sat Feb 12
11:16:16 2005
@@ -20,10 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-databases.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-hsqldb.xconf"/>
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/jms/jms.roles"/>
Modified: cocoon/trunk/src/blocks/jsp/WEB-INF/xconf/cocoon-jsp.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/jsp/WEB-INF/xconf/cocoon-jsp.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/jsp/WEB-INF/xconf/cocoon-jsp.xconf (original)
+++ cocoon/trunk/src/blocks/jsp/WEB-INF/xconf/cocoon-jsp.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/jsp/jsp.roles"/>
Modified:
cocoon/trunk/src/blocks/linkrewriter/WEB-INF/xconf/cocoon-linkrewriter.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/linkrewriter/WEB-INF/xconf/cocoon-linkrewriter.xconf?view=diff&r1=153526&r2=153527
==============================================================================
---
cocoon/trunk/src/blocks/linkrewriter/WEB-INF/xconf/cocoon-linkrewriter.xconf
(original)
+++
cocoon/trunk/src/blocks/linkrewriter/WEB-INF/xconf/cocoon-linkrewriter.xconf
Sat Feb 12 11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<input-modules>
<!-- For the sitedemo sample -->
Modified: cocoon/trunk/src/blocks/lucene/WEB-INF/xconf/cocoon-lucene.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/lucene/WEB-INF/xconf/cocoon-lucene.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/lucene/WEB-INF/xconf/cocoon-lucene.xconf (original)
+++ cocoon/trunk/src/blocks/lucene/WEB-INF/xconf/cocoon-lucene.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-xsp.xconf"/>
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/search/lucene.roles"/>
Modified: cocoon/trunk/src/blocks/mail/WEB-INF/xconf/cocoon-mail.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/mail/WEB-INF/xconf/cocoon-mail.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/mail/WEB-INF/xconf/cocoon-mail.xconf (original)
+++ cocoon/trunk/src/blocks/mail/WEB-INF/xconf/cocoon-mail.xconf Sat Feb 12
11:16:16 2005
@@ -20,10 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-asciiart.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-scratchpad.xconf"/>
-
<!--+
| Component for simplified mail sending.
+-->
Modified: cocoon/trunk/src/blocks/midi/WEB-INF/xconf/cocoon-midi.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/midi/WEB-INF/xconf/cocoon-midi.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/midi/WEB-INF/xconf/cocoon-midi.xconf (original)
+++ cocoon/trunk/src/blocks/midi/WEB-INF/xconf/cocoon-midi.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/naming/WEB-INF/xconf/cocoon-naming.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/naming/WEB-INF/xconf/cocoon-naming.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/naming/WEB-INF/xconf/cocoon-naming.xconf (original)
+++ cocoon/trunk/src/blocks/naming/WEB-INF/xconf/cocoon-naming.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf (original)
+++ cocoon/trunk/src/blocks/ojb/WEB-INF/xconf/cocoon-ojb.xconf Sat Feb 12
11:16:16 2005
@@ -20,11 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-forms.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-databases.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-hsqldb.xconf"/>
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/ojb/ojb.roles"/>
Modified: cocoon/trunk/src/blocks/paranoid/WEB-INF/xconf/cocoon-paranoid.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/paranoid/WEB-INF/xconf/cocoon-paranoid.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/paranoid/WEB-INF/xconf/cocoon-paranoid.xconf
(original)
+++ cocoon/trunk/src/blocks/paranoid/WEB-INF/xconf/cocoon-paranoid.xconf Sat
Feb 12 11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/petstore/WEB-INF/xconf/cocoon-petstore.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/petstore/WEB-INF/xconf/cocoon-petstore.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/petstore/WEB-INF/xconf/cocoon-petstore.xconf
(original)
+++ cocoon/trunk/src/blocks/petstore/WEB-INF/xconf/cocoon-petstore.xconf Sat
Feb 12 11:16:16 2005
@@ -20,9 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-velocity.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-forms.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-databases.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-hsqldb.xconf"/>
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/poi/WEB-INF/xconf/cocoon-poi.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/poi/WEB-INF/xconf/cocoon-poi.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/poi/WEB-INF/xconf/cocoon-poi.xconf (original)
+++ cocoon/trunk/src/blocks/poi/WEB-INF/xconf/cocoon-poi.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.xconf (original)
+++ cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.xconf Sat Feb 12
11:16:16 2005
@@ -20,11 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-session-fw.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-authentication-fw.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-html.xconf"/>
-
<!-- Portal service definition template
<component class="org.apache.cocoon.portal.impl.PortalServiceImpl"
logger="portal" role="org.apache.cocoon.portal.PortalService">
<portals>
Modified: cocoon/trunk/src/blocks/proxy/WEB-INF/xconf/cocoon-proxy.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/proxy/WEB-INF/xconf/cocoon-proxy.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/proxy/WEB-INF/xconf/cocoon-proxy.xconf (original)
+++ cocoon/trunk/src/blocks/proxy/WEB-INF/xconf/cocoon-proxy.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/python/WEB-INF/xconf/cocoon-python.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/python/WEB-INF/xconf/cocoon-python.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/python/WEB-INF/xconf/cocoon-python.xconf (original)
+++ cocoon/trunk/src/blocks/python/WEB-INF/xconf/cocoon-python.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-xsp.xconf"/>
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/qdox/WEB-INF/xconf/cocoon-qdox.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/qdox/WEB-INF/xconf/cocoon-qdox.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/qdox/WEB-INF/xconf/cocoon-qdox.xconf (original)
+++ cocoon/trunk/src/blocks/qdox/WEB-INF/xconf/cocoon-qdox.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<source-factories>
<component-instance
class="org.apache.cocoon.components.source.impl.QDoxSourceFactory"
Modified: cocoon/trunk/src/blocks/querybean/WEB-INF/xconf/cocoon-querybean.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/querybean/WEB-INF/xconf/cocoon-querybean.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/querybean/WEB-INF/xconf/cocoon-querybean.xconf
(original)
+++ cocoon/trunk/src/blocks/querybean/WEB-INF/xconf/cocoon-querybean.xconf Sat
Feb 12 11:16:16 2005
@@ -20,8 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-forms.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-lucene.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-ojb.xconf"/>
+ <!-- Dummy config that other blocks can import -->
</components>
Modified:
cocoon/trunk/src/blocks/repository/WEB-INF/xconf/cocoon-repository.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/repository/WEB-INF/xconf/cocoon-repository.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/repository/WEB-INF/xconf/cocoon-repository.xconf
(original)
+++ cocoon/trunk/src/blocks/repository/WEB-INF/xconf/cocoon-repository.xconf
Sat Feb 12 11:16:16 2005
@@ -20,10 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-databases.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-eventcache.xconf"/>
-
<!-- Include roles -->
<include
src="resource://org/apache/cocoon/components/repository/repository.roles"/>
Modified:
cocoon/trunk/src/blocks/scratchpad/WEB-INF/xconf/cocoon-scratchpad.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/WEB-INF/xconf/cocoon-scratchpad.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/WEB-INF/xconf/cocoon-scratchpad.xconf
(original)
+++ cocoon/trunk/src/blocks/scratchpad/WEB-INF/xconf/cocoon-scratchpad.xconf
Sat Feb 12 11:16:16 2005
@@ -20,15 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-batik.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-cron.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-velocity.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-xsp.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-javaflow.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-repository.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-faces.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-axis.xconf"/>
<!-- Include different scratchpad projects -->
<include
src="context://WEB-INF/xconf/cocoon-scratchpad-caching-source.xconf"/>
<include src="context://WEB-INF/xconf/cocoon-scratchpad-groovyflow.xconf"/>
Modified:
cocoon/trunk/src/blocks/serializers/WEB-INF/xconf/cocoon-serializers.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/serializers/WEB-INF/xconf/cocoon-serializers.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/serializers/WEB-INF/xconf/cocoon-serializers.xconf
(original)
+++ cocoon/trunk/src/blocks/serializers/WEB-INF/xconf/cocoon-serializers.xconf
Sat Feb 12 11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified:
cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf
(original)
+++ cocoon/trunk/src/blocks/session-fw/WEB-INF/xconf/cocoon-session-fw.xconf
Sat Feb 12 11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-xsp.xconf"/>
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/webapps/session/session.roles"/>
Modified: cocoon/trunk/src/blocks/slide/WEB-INF/xconf/cocoon-slide.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/WEB-INF/xconf/cocoon-slide.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/slide/WEB-INF/xconf/cocoon-slide.xconf (original)
+++ cocoon/trunk/src/blocks/slide/WEB-INF/xconf/cocoon-slide.xconf Sat Feb 12
11:16:16 2005
@@ -20,10 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-jms.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-repository.xconf"/>
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/slide/slide.roles"/>
Modified: cocoon/trunk/src/blocks/slop/WEB-INF/xconf/cocoon-slop.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slop/WEB-INF/xconf/cocoon-slop.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/slop/WEB-INF/xconf/cocoon-slop.xconf (original)
+++ cocoon/trunk/src/blocks/slop/WEB-INF/xconf/cocoon-slop.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/stx/WEB-INF/xconf/cocoon-stx.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/stx/WEB-INF/xconf/cocoon-stx.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/stx/WEB-INF/xconf/cocoon-stx.xconf (original)
+++ cocoon/trunk/src/blocks/stx/WEB-INF/xconf/cocoon-stx.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf (original)
+++ cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<component role="org.apache.cocoon.jxpath.JXPathCocoonContexts"
class="org.apache.cocoon.jxpath.JXPathCocoonContexts"
logger="core.jxpath"/>
Modified: cocoon/trunk/src/blocks/template/WEB-INF/xconf/cocoon-template.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/WEB-INF/xconf/cocoon-template.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/template/WEB-INF/xconf/cocoon-template.xconf
(original)
+++ cocoon/trunk/src/blocks/template/WEB-INF/xconf/cocoon-template.xconf Sat
Feb 12 11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/tour/WEB-INF/xconf/cocoon-tour.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/tour/WEB-INF/xconf/cocoon-tour.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/tour/WEB-INF/xconf/cocoon-tour.xconf (original)
+++ cocoon/trunk/src/blocks/tour/WEB-INF/xconf/cocoon-tour.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-forms.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-batik.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-fop.xconf"/>
- <include src="context://WEB-INF/xconf/cocoon-slop.xconf"/>
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/velocity/WEB-INF/xconf/cocoon-velocity.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/velocity/WEB-INF/xconf/cocoon-velocity.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/velocity/WEB-INF/xconf/cocoon-velocity.xconf
(original)
+++ cocoon/trunk/src/blocks/velocity/WEB-INF/xconf/cocoon-velocity.xconf Sat
Feb 12 11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Modified: cocoon/trunk/src/blocks/web3/WEB-INF/xconf/cocoon-web3.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/web3/WEB-INF/xconf/cocoon-web3.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/web3/WEB-INF/xconf/cocoon-web3.xconf (original)
+++ cocoon/trunk/src/blocks/web3/WEB-INF/xconf/cocoon-web3.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
-
<!-- Include roles -->
<include src="resource://org/apache/cocoon/components/web3/web3.roles"/>
Modified: cocoon/trunk/src/blocks/webdav/WEB-INF/xconf/cocoon-webdav.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/webdav/WEB-INF/xconf/cocoon-webdav.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/webdav/WEB-INF/xconf/cocoon-webdav.xconf (original)
+++ cocoon/trunk/src/blocks/webdav/WEB-INF/xconf/cocoon-webdav.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-repository.xconf"/>
-
<component role="org.apache.cocoon.components.repository.RepositoryManager"
class="org.apache.cocoon.components.repository.RepositoryManager"
logger="core.repository">
Modified: cocoon/trunk/src/blocks/xmldb/WEB-INF/xconf/cocoon-xmldb.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xmldb/WEB-INF/xconf/cocoon-xmldb.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/xmldb/WEB-INF/xconf/cocoon-xmldb.xconf (original)
+++ cocoon/trunk/src/blocks/xmldb/WEB-INF/xconf/cocoon-xmldb.xconf Sat Feb 12
11:16:16 2005
@@ -20,9 +20,6 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <include src="context://WEB-INF/xconf/cocoon-databases.xconf"/>
-
<source-factories>
<!-- xmldb pseudo protocol -->
<component-instance
class="org.apache.cocoon.components.source.impl.XMLDBSourceFactory"
name="xmldb">
Modified: cocoon/trunk/src/blocks/xsp/WEB-INF/xconf/cocoon-xsp.xconf
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xsp/WEB-INF/xconf/cocoon-xsp.xconf?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/src/blocks/xsp/WEB-INF/xconf/cocoon-xsp.xconf (original)
+++ cocoon/trunk/src/blocks/xsp/WEB-INF/xconf/cocoon-xsp.xconf Sat Feb 12
11:16:16 2005
@@ -20,6 +20,5 @@
| SVN $Id$
+-->
<components>
- <!-- Include dependencies -->
- <!-- NO DEPENDENCIES -->
+ <!-- Dummy config that other blocks can import -->
</components>
Added: cocoon/trunk/tools/src/anttasks/BlockConfigTask.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/anttasks/BlockConfigTask.java?view=auto&rev=153527
==============================================================================
--- cocoon/trunk/tools/src/anttasks/BlockConfigTask.java (added)
+++ cocoon/trunk/tools/src/anttasks/BlockConfigTask.java Sat Feb 12 11:16:16
2005
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+
+/**
+ * Ant task to add block dependencies to xconf configuration
+ *
+ * @version CVS $Id$
+ */
+public final class BlockConfigTask extends Task {
+
+ private File file;
+ private String depends;
+
+ /**
+ * Set file, which should be patched.
+ *
+ * @param file File, which should be patched.
+ */
+ public void setFile(File file) {
+ this.file = file;
+ }
+
+ public void setDepends(String depends) {
+ this.depends = depends;
+ }
+
+ /**
+ * Execute task.
+ */
+ public void execute() throws BuildException {
+ if (this.file == null) {
+ throw new BuildException("file attribute is required",
this.getLocation());
+ }
+ if ( this.depends == null ) {
+ throw new BuildException("depends attribute is required",
this.getLocation());
+ }
+ final List dependencies = new ArrayList();
+ final StringTokenizer st = new StringTokenizer(this.depends, ",");
+ while ( st.hasMoreTokens() ) {
+ String token = st.nextToken();
+ dependencies.add(token);
+ }
+
+ if ( dependencies.size() > 0 ) {
+ try {
+ Document doc = DocumentCache.getDocument(this.file, this);
+ Element elem = doc.getDocumentElement();
+ Node firstChild = elem.getFirstChild();
+ for(int i=0; i<dependencies.size();i++) {
+ final String token = (String)dependencies.get(i);
+ Node n;
+ n = doc.createTextNode(" ");
+ elem.insertBefore(n, firstChild);
+
+ n = doc.createComment("Include dependencies");
+ elem.insertBefore(n, firstChild);
+
+ n = doc.createTextNode("\n ");
+ elem.insertBefore(n, firstChild);
+
+ n = doc.createElement("include");
+ ((Element)n).setAttribute("src",
"context://WEB-INF/xconf/" + token + ".xconf");
+ elem.insertBefore(n, firstChild);
+
+ n = doc.createTextNode("\n");
+ elem.insertBefore(n, firstChild);
+ }
+ DocumentCache.writeDocument(this.file, doc, this);
+ DocumentCache.storeDocument(this.file, doc, this);
+ } catch (SAXException e) {
+ throw new BuildException("SAXException:" +e);
+ } catch (IOException ioe) {
+ throw new BuildException("IOException: "+ioe);
+ }
+ }
+ }
+
+
+}
Propchange: cocoon/trunk/tools/src/anttasks/BlockConfigTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/tools/src/anttasks/BlockConfigTask.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/tools/src/blocks-build.xsl
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/blocks-build.xsl?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/tools/src/blocks-build.xsl (original)
+++ cocoon/trunk/tools/src/blocks-build.xsl Sat Feb 12 11:16:16 2005
@@ -702,6 +702,13 @@
</xsl:if>
</xsl:attribute>
<block-patch name="{$block-name}" dir="[EMAIL PROTECTED]"/>
+ <block-config
file="${{build.webapp}}/WEB-INF/xconf/cocoon-{$block-name}.xconf">
+ <xsl:attribute name="depends">
+ <xsl:for-each select="depend[contains(@project,'cocoon-block-')]">
+ <xsl:text>cocoon-</xsl:text><xsl:value-of
select="substring-after(@project,'cocoon-block-')"/><xsl:text>,</xsl:text>
+ </xsl:for-each>
+ </xsl:attribute>
+ </block-config>
</target>
<target name="[EMAIL PROTECTED]"
unless="internal.exclude.block.{$block-name}">
Modified: cocoon/trunk/tools/targets/init-build.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xml?view=diff&r1=153526&r2=153527
==============================================================================
--- cocoon/trunk/tools/targets/init-build.xml (original)
+++ cocoon/trunk/tools/targets/init-build.xml Sat Feb 12 11:16:16 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -162,6 +162,11 @@
<taskdef name="sitemap-components"
classname="SitemapTask"
classpathref="tasks.classpath"/>
+
+ <!-- A task to add dependencies to block configurations -->
+ <taskdef name="block-config"
+ classname="BlockConfigTask"
+ classpathref="tasks.classpath"/>
<!-- Jing is used in various targets for XML validation with RELAX NG -->
<taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask"
