cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject svn commit: r123745 - in cocoon/trunk/src: blocks/apples/conf blocks/authentication-fw/conf blocks/axis/conf blocks/cron/conf blocks/databases/conf blocks/deli/conf blocks/eventcache/conf blocks/faces/conf blocks/forms/conf blocks/hsqldb/conf blocks/html/conf blocks/javaflow/conf blocks/jms/conf blocks/jsp/conf blocks/linkrewriter/conf blocks/lucene/conf blocks/mail/conf blocks/ojb/conf blocks/portal-fw/conf blocks/portal/conf blocks/profiler/conf blocks/qdox/conf blocks/repository/conf blocks/scratchpad/conf blocks/session-fw/conf blocks/slide/conf blocks/taglib/conf blocks/web3/conf blocks/webdav/conf blocks/woody/conf blocks/xmldb/conf core/java/org/apache/cocoon/core/container core/java/org/apache/cocoon/core/source
Date Thu, 30 Dec 2004 23:18:37 GMT
Author: sylvain
Date: Thu Dec 30 15:18:35 2004
New Revision: 123745

URL: http://svn.apache.org/viewcvs?view=rev&rev=123745
Log:
Included xconfs are now relative to the current file
Modified:
   cocoon/trunk/src/blocks/apples/conf/include-apples.xconf
   cocoon/trunk/src/blocks/authentication-fw/conf/include-authentication-fw.xconf
   cocoon/trunk/src/blocks/axis/conf/include-axis.xconf
   cocoon/trunk/src/blocks/cron/conf/include-cron.xconf
   cocoon/trunk/src/blocks/databases/conf/include-databases.xconf
   cocoon/trunk/src/blocks/deli/conf/include-deli.xconf
   cocoon/trunk/src/blocks/eventcache/conf/include-eventcache.xconf
   cocoon/trunk/src/blocks/faces/conf/include-faces.xconf
   cocoon/trunk/src/blocks/forms/conf/include-forms.xconf
   cocoon/trunk/src/blocks/hsqldb/conf/include-hsqldb.xconf
   cocoon/trunk/src/blocks/html/conf/include-html.xconf
   cocoon/trunk/src/blocks/javaflow/conf/include-javaflow.xconf
   cocoon/trunk/src/blocks/jms/conf/include-jms.xconf
   cocoon/trunk/src/blocks/jsp/conf/include-jsp.xconf
   cocoon/trunk/src/blocks/linkrewriter/conf/include-linkrewriter.xconf
   cocoon/trunk/src/blocks/lucene/conf/include-lucene.xconf
   cocoon/trunk/src/blocks/mail/conf/include-mail.xconf
   cocoon/trunk/src/blocks/ojb/conf/include-ojb.xconf
   cocoon/trunk/src/blocks/portal-fw/conf/include-portal-fw.xconf
   cocoon/trunk/src/blocks/portal/conf/include-portal.xconf
   cocoon/trunk/src/blocks/profiler/conf/include-profiler.xconf
   cocoon/trunk/src/blocks/qdox/conf/include-qdox.xconf
   cocoon/trunk/src/blocks/repository/conf/include-repository.xconf
   cocoon/trunk/src/blocks/scratchpad/conf/include-scratchpad.xconf
   cocoon/trunk/src/blocks/session-fw/conf/include-session-fw.xconf
   cocoon/trunk/src/blocks/slide/conf/include-slide.xconf
   cocoon/trunk/src/blocks/taglib/conf/include-taglib.xconf
   cocoon/trunk/src/blocks/web3/conf/include-web3.xconf
   cocoon/trunk/src/blocks/webdav/conf/include-webdav.xconf
   cocoon/trunk/src/blocks/woody/conf/include-woody.xconf
   cocoon/trunk/src/blocks/xmldb/conf/include-xmldb.xconf
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/source/SimpleSourceResolver.java

Modified: cocoon/trunk/src/blocks/apples/conf/include-apples.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/apples/conf/include-apples.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/apples/conf/include-apples.xconf&r1=123744&p2=cocoon/trunk/src/blocks/apples/conf/include-apples.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/apples/conf/include-apples.xconf	(original)
+++ cocoon/trunk/src/blocks/apples/conf/include-apples.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-apples.xconf']">
-  <include src="WEB-INF/xconf/cocoon-apples.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-apples.xconf']">
+  <include src="xconf/cocoon-apples.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/authentication-fw/conf/include-authentication-fw.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/authentication-fw/conf/include-authentication-fw.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/authentication-fw/conf/include-authentication-fw.xconf&r1=123744&p2=cocoon/trunk/src/blocks/authentication-fw/conf/include-authentication-fw.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/authentication-fw/conf/include-authentication-fw.xconf	(original)
+++ cocoon/trunk/src/blocks/authentication-fw/conf/include-authentication-fw.xconf	Thu Dec
30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-authentication-fw.xconf']">
-  <include src="WEB-INF/xconf/cocoon-authentication-fw.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-authentication-fw.xconf']">
+  <include src="xconf/cocoon-authentication-fw.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/axis/conf/include-axis.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/axis/conf/include-axis.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/axis/conf/include-axis.xconf&r1=123744&p2=cocoon/trunk/src/blocks/axis/conf/include-axis.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/axis/conf/include-axis.xconf	(original)
+++ cocoon/trunk/src/blocks/axis/conf/include-axis.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-axis.xconf']">
-  <include src="WEB-INF/xconf/cocoon-axis.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-axis.xconf']">
+  <include src="xconf/cocoon-axis.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/cron/conf/include-cron.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/cron/conf/include-cron.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/cron/conf/include-cron.xconf&r1=123744&p2=cocoon/trunk/src/blocks/cron/conf/include-cron.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/cron/conf/include-cron.xconf	(original)
+++ cocoon/trunk/src/blocks/cron/conf/include-cron.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-cron.xconf']">
-  <include src="WEB-INF/xconf/cocoon-cron.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-cron.xconf']">
+  <include src="xconf/cocoon-cron.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/databases/conf/include-databases.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/conf/include-databases.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/databases/conf/include-databases.xconf&r1=123744&p2=cocoon/trunk/src/blocks/databases/conf/include-databases.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/databases/conf/include-databases.xconf	(original)
+++ cocoon/trunk/src/blocks/databases/conf/include-databases.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-databases.xconf']">
-  <include src="WEB-INF/xconf/cocoon-databases.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-databases.xconf']">
+  <include src="xconf/cocoon-databases.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/deli/conf/include-deli.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/deli/conf/include-deli.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/deli/conf/include-deli.xconf&r1=123744&p2=cocoon/trunk/src/blocks/deli/conf/include-deli.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/deli/conf/include-deli.xconf	(original)
+++ cocoon/trunk/src/blocks/deli/conf/include-deli.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-deli.xconf']">
-  <include src="WEB-INF/xconf/cocoon-deli.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-deli.xconf']">
+  <include src="xconf/cocoon-deli.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/eventcache/conf/include-eventcache.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/eventcache/conf/include-eventcache.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/eventcache/conf/include-eventcache.xconf&r1=123744&p2=cocoon/trunk/src/blocks/eventcache/conf/include-eventcache.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/eventcache/conf/include-eventcache.xconf	(original)
+++ cocoon/trunk/src/blocks/eventcache/conf/include-eventcache.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-eventcache.xconf']">
-  <include src="WEB-INF/xconf/cocoon-eventcache.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-eventcache.xconf']">
+  <include src="xconf/cocoon-eventcache.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/faces/conf/include-faces.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/conf/include-faces.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/faces/conf/include-faces.xconf&r1=123744&p2=cocoon/trunk/src/blocks/faces/conf/include-faces.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/faces/conf/include-faces.xconf	(original)
+++ cocoon/trunk/src/blocks/faces/conf/include-faces.xconf	Thu Dec 30 15:18:35 2004
@@ -16,7 +16,7 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-faces.xconf']">
-  <include src="WEB-INF/xconf/cocoon-faces.xconf"/>
-  <include src="WEB-INF/xconf/cocoon-faces-samples.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-faces.xconf']">
+  <include src="xconf/cocoon-faces.xconf"/>
+  <include src="xconf/cocoon-faces-samples.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/forms/conf/include-forms.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/forms/conf/include-forms.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/forms/conf/include-forms.xconf&r1=123744&p2=cocoon/trunk/src/blocks/forms/conf/include-forms.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/forms/conf/include-forms.xconf	(original)
+++ cocoon/trunk/src/blocks/forms/conf/include-forms.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-forms.xconf']">
-  <include src="WEB-INF/xconf/cocoon-forms.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-forms.xconf']">
+  <include src="xconf/cocoon-forms.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/hsqldb/conf/include-hsqldb.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/hsqldb/conf/include-hsqldb.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/hsqldb/conf/include-hsqldb.xconf&r1=123744&p2=cocoon/trunk/src/blocks/hsqldb/conf/include-hsqldb.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/hsqldb/conf/include-hsqldb.xconf	(original)
+++ cocoon/trunk/src/blocks/hsqldb/conf/include-hsqldb.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-hsqldb.xconf']">
-  <include src="WEB-INF/xconf/cocoon-hsqldb.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-hsqldb.xconf']">
+  <include src="xconf/cocoon-hsqldb.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/html/conf/include-html.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/html/conf/include-html.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/html/conf/include-html.xconf&r1=123744&p2=cocoon/trunk/src/blocks/html/conf/include-html.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/html/conf/include-html.xconf	(original)
+++ cocoon/trunk/src/blocks/html/conf/include-html.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-html.xconf']">
-  <include src="WEB-INF/xconf/cocoon-html.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-html.xconf']">
+  <include src="xconf/cocoon-html.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/javaflow/conf/include-javaflow.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/javaflow/conf/include-javaflow.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/javaflow/conf/include-javaflow.xconf&r1=123744&p2=cocoon/trunk/src/blocks/javaflow/conf/include-javaflow.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/javaflow/conf/include-javaflow.xconf	(original)
+++ cocoon/trunk/src/blocks/javaflow/conf/include-javaflow.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-javaflow.xconf']">
-  <include src="WEB-INF/xconf/cocoon-javaflow.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-javaflow.xconf']">
+  <include src="xconf/cocoon-javaflow.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/jms/conf/include-jms.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/jms/conf/include-jms.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/jms/conf/include-jms.xconf&r1=123744&p2=cocoon/trunk/src/blocks/jms/conf/include-jms.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/jms/conf/include-jms.xconf	(original)
+++ cocoon/trunk/src/blocks/jms/conf/include-jms.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-jms.xconf']">
-  <include src="WEB-INF/xconf/cocoon-jms.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-jms.xconf']">
+  <include src="xconf/cocoon-jms.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/jsp/conf/include-jsp.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/jsp/conf/include-jsp.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/jsp/conf/include-jsp.xconf&r1=123744&p2=cocoon/trunk/src/blocks/jsp/conf/include-jsp.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/jsp/conf/include-jsp.xconf	(original)
+++ cocoon/trunk/src/blocks/jsp/conf/include-jsp.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-jsp.xconf']">
-  <include src="WEB-INF/xconf/cocoon-jsp.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-jsp.xconf']">
+  <include src="xconf/cocoon-jsp.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/linkrewriter/conf/include-linkrewriter.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/linkrewriter/conf/include-linkrewriter.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/linkrewriter/conf/include-linkrewriter.xconf&r1=123744&p2=cocoon/trunk/src/blocks/linkrewriter/conf/include-linkrewriter.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/linkrewriter/conf/include-linkrewriter.xconf	(original)
+++ cocoon/trunk/src/blocks/linkrewriter/conf/include-linkrewriter.xconf	Thu Dec 30 15:18:35
2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-linkrewriter.xconf']">
-  <include src="WEB-INF/xconf/cocoon-linkrewriter.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-linkrewriter.xconf']">
+  <include src="xconf/cocoon-linkrewriter.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/lucene/conf/include-lucene.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/lucene/conf/include-lucene.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/lucene/conf/include-lucene.xconf&r1=123744&p2=cocoon/trunk/src/blocks/lucene/conf/include-lucene.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/lucene/conf/include-lucene.xconf	(original)
+++ cocoon/trunk/src/blocks/lucene/conf/include-lucene.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-lucene.xconf']">
-  <include src="WEB-INF/xconf/cocoon-lucene.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-lucene.xconf']">
+  <include src="xconf/cocoon-lucene.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/mail/conf/include-mail.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/mail/conf/include-mail.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/mail/conf/include-mail.xconf&r1=123744&p2=cocoon/trunk/src/blocks/mail/conf/include-mail.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/mail/conf/include-mail.xconf	(original)
+++ cocoon/trunk/src/blocks/mail/conf/include-mail.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-mail.xconf']">
-  <include src="WEB-INF/xconf/cocoon-mail.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-mail.xconf']">
+  <include src="xconf/cocoon-mail.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/ojb/conf/include-ojb.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/ojb/conf/include-ojb.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/ojb/conf/include-ojb.xconf&r1=123744&p2=cocoon/trunk/src/blocks/ojb/conf/include-ojb.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/ojb/conf/include-ojb.xconf	(original)
+++ cocoon/trunk/src/blocks/ojb/conf/include-ojb.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-ojb.xconf']">
-  <include src="WEB-INF/xconf/cocoon-ojb.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-ojb.xconf']">
+  <include src="xconf/cocoon-ojb.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/portal-fw/conf/include-portal-fw.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal-fw/conf/include-portal-fw.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/portal-fw/conf/include-portal-fw.xconf&r1=123744&p2=cocoon/trunk/src/blocks/portal-fw/conf/include-portal-fw.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/portal-fw/conf/include-portal-fw.xconf	(original)
+++ cocoon/trunk/src/blocks/portal-fw/conf/include-portal-fw.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-portal-fw.xconf']">
-  <include src="WEB-INF/xconf/cocoon-portal-fw.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-portal-fw.xconf']">
+  <include src="xconf/cocoon-portal-fw.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/portal/conf/include-portal.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/conf/include-portal.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/portal/conf/include-portal.xconf&r1=123744&p2=cocoon/trunk/src/blocks/portal/conf/include-portal.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/portal/conf/include-portal.xconf	(original)
+++ cocoon/trunk/src/blocks/portal/conf/include-portal.xconf	Thu Dec 30 15:18:35 2004
@@ -16,7 +16,7 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-portal.xconf']">
-  <include src="WEB-INF/xconf/cocoon-portal.xconf"/>
-  <include src="WEB-INF/xconf/cocoon-portal-samples.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-portal.xconf']">
+  <include src="xconf/cocoon-portal.xconf"/>
+  <include src="xconf/cocoon-portal-samples.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/profiler/conf/include-profiler.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/profiler/conf/include-profiler.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/profiler/conf/include-profiler.xconf&r1=123744&p2=cocoon/trunk/src/blocks/profiler/conf/include-profiler.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/profiler/conf/include-profiler.xconf	(original)
+++ cocoon/trunk/src/blocks/profiler/conf/include-profiler.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-profiler.xconf']">
-  <include src="WEB-INF/xconf/cocoon-profiler.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-profiler.xconf']">
+  <include src="xconf/cocoon-profiler.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/qdox/conf/include-qdox.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/qdox/conf/include-qdox.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/qdox/conf/include-qdox.xconf&r1=123744&p2=cocoon/trunk/src/blocks/qdox/conf/include-qdox.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/qdox/conf/include-qdox.xconf	(original)
+++ cocoon/trunk/src/blocks/qdox/conf/include-qdox.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-qdox.xconf']">
-  <include src="WEB-INF/xconf/cocoon-qdox.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-qdox.xconf']">
+  <include src="xconf/cocoon-qdox.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/repository/conf/include-repository.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/repository/conf/include-repository.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/repository/conf/include-repository.xconf&r1=123744&p2=cocoon/trunk/src/blocks/repository/conf/include-repository.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/repository/conf/include-repository.xconf	(original)
+++ cocoon/trunk/src/blocks/repository/conf/include-repository.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-repository.xconf']">
-  <include src="WEB-INF/xconf/cocoon-repository.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-repository.xconf']">
+  <include src="xconf/cocoon-repository.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/scratchpad/conf/include-scratchpad.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/conf/include-scratchpad.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/scratchpad/conf/include-scratchpad.xconf&r1=123744&p2=cocoon/trunk/src/blocks/scratchpad/conf/include-scratchpad.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/scratchpad/conf/include-scratchpad.xconf	(original)
+++ cocoon/trunk/src/blocks/scratchpad/conf/include-scratchpad.xconf	Thu Dec 30 15:18:35 2004
@@ -16,9 +16,9 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-scratchpad-caching-source.xconf']">
-  <include src="WEB-INF/xconf/cocoon-scratchpad-caching-source.xconf"/>
-  <include src="WEB-INF/xconf/cocoon-scratchpad-groovyflow.xconf"/>
-  <include src="WEB-INF/xconf/cocoon-scratchpad-intercepted-flow.xconf"/>
-  <include src="WEB-INF/xconf/cocoon-scratchpad-zip-source.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-scratchpad-caching-source.xconf']">
+  <include src="xconf/cocoon-scratchpad-caching-source.xconf"/>
+  <include src="xconf/cocoon-scratchpad-groovyflow.xconf"/>
+  <include src="xconf/cocoon-scratchpad-intercepted-flow.xconf"/>
+  <include src="xconf/cocoon-scratchpad-zip-source.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/session-fw/conf/include-session-fw.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/session-fw/conf/include-session-fw.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/session-fw/conf/include-session-fw.xconf&r1=123744&p2=cocoon/trunk/src/blocks/session-fw/conf/include-session-fw.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/conf/include-session-fw.xconf	(original)
+++ cocoon/trunk/src/blocks/session-fw/conf/include-session-fw.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-session-fw.xconf']">
-  <include src="WEB-INF/xconf/cocoon-session-fw.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-session-fw.xconf']">
+  <include src="xconf/cocoon-session-fw.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/slide/conf/include-slide.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/slide/conf/include-slide.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/slide/conf/include-slide.xconf&r1=123744&p2=cocoon/trunk/src/blocks/slide/conf/include-slide.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/slide/conf/include-slide.xconf	(original)
+++ cocoon/trunk/src/blocks/slide/conf/include-slide.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-slide.xconf']">
-  <include src="WEB-INF/xconf/cocoon-slide.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-slide.xconf']">
+  <include src="xconf/cocoon-slide.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/taglib/conf/include-taglib.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/taglib/conf/include-taglib.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/taglib/conf/include-taglib.xconf&r1=123744&p2=cocoon/trunk/src/blocks/taglib/conf/include-taglib.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/taglib/conf/include-taglib.xconf	(original)
+++ cocoon/trunk/src/blocks/taglib/conf/include-taglib.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-taglib.xconf']">
-  <include src="WEB-INF/xconf/cocoon-taglib.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-taglib.xconf']">
+  <include src="xconf/cocoon-taglib.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/web3/conf/include-web3.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/web3/conf/include-web3.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/web3/conf/include-web3.xconf&r1=123744&p2=cocoon/trunk/src/blocks/web3/conf/include-web3.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/web3/conf/include-web3.xconf	(original)
+++ cocoon/trunk/src/blocks/web3/conf/include-web3.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-web3.xconf']">
-  <include src="WEB-INF/xconf/cocoon-web3.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-web3.xconf']">
+  <include src="xconf/cocoon-web3.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/webdav/conf/include-webdav.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/webdav/conf/include-webdav.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/webdav/conf/include-webdav.xconf&r1=123744&p2=cocoon/trunk/src/blocks/webdav/conf/include-webdav.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/webdav/conf/include-webdav.xconf	(original)
+++ cocoon/trunk/src/blocks/webdav/conf/include-webdav.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-webdav.xconf']">
-  <include src="WEB-INF/xconf/cocoon-webdav.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-webdav.xconf']">
+  <include src="xconf/cocoon-webdav.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/woody/conf/include-woody.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/woody/conf/include-woody.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/woody/conf/include-woody.xconf&r1=123744&p2=cocoon/trunk/src/blocks/woody/conf/include-woody.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/woody/conf/include-woody.xconf	(original)
+++ cocoon/trunk/src/blocks/woody/conf/include-woody.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-woody.xconf']">
-  <include src="WEB-INF/xconf/cocoon-woody.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-woody.xconf']">
+  <include src="xconf/cocoon-woody.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/blocks/xmldb/conf/include-xmldb.xconf
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xmldb/conf/include-xmldb.xconf?view=diff&rev=123745&p1=cocoon/trunk/src/blocks/xmldb/conf/include-xmldb.xconf&r1=123744&p2=cocoon/trunk/src/blocks/xmldb/conf/include-xmldb.xconf&r2=123745
==============================================================================
--- cocoon/trunk/src/blocks/xmldb/conf/include-xmldb.xconf	(original)
+++ cocoon/trunk/src/blocks/xmldb/conf/include-xmldb.xconf	Thu Dec 30 15:18:35 2004
@@ -16,6 +16,6 @@
 -->
 <!-- SVN $Id$ -->
 
-<xconf xpath="/cocoon" unless="include[@src='WEB-INF/xconf/cocoon-xmldb.xconf']">
-  <include src="WEB-INF/xconf/cocoon-xmldb.xconf"/>
+<xconf xpath="/cocoon" unless="include[@src='xconf/cocoon-xmldb.xconf']">
+  <include src="xconf/cocoon-xmldb.xconf"/>
 </xconf>

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java?view=diff&rev=123745&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java&r1=123744&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java&r2=123745
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
Thu Dec 30 15:18:35 2004
@@ -17,6 +17,7 @@
 package org.apache.cocoon.core.container;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -298,31 +299,31 @@
      */
     public void configure(Configuration configuration) throws ConfigurationException {
         // Setup location
-        if (this.location == null) {
-            // First call to configure()
-            this.location = configuration.getLocation();
+        this.location = configuration.getLocation();
+        
+        // Find the current URI
+        String currentURI;
+        int pos = this.location.lastIndexOf(':');
+        if (pos == -1) {
+            // No available location: start at the context
+            currentURI = "context://";
+        } else {
+            pos = this.location.lastIndexOf(':', pos);
+            currentURI = this.location.substring(0, pos-1);
         }
         
         try {
             // and load configuration with a empty list of loaded configurations
-            doConfigure(configuration, new HashSet());
+            doConfigure(configuration, currentURI, new HashSet());
         } finally {
             // Release any source resolver that may have been created to load includes
             releaseCachedSourceResolver();
         }
     }
 
-    private void doConfigure(final Configuration configuration, Set loadedURIs) 
-    throws ConfigurationException {
-        
-        // Read roles
-        String rolesURI = configuration.getAttribute("roles", null);
-        if (rolesURI != null) {
-            Configuration roles = loadConfiguration(rolesURI, configuration.getLocation());
-            this.roleManager.configure(roles);
-        }
+    private void doConfigure(final Configuration configuration, String contextURI, Set loadedURIs)

+        throws ConfigurationException {
 
-        // Set components
         final Configuration[] configurations = configuration.getChildren();
 
         for( int i = 0; i < configurations.length; i++ ) {
@@ -331,38 +332,7 @@
             final String componentName = componentConfig.getName();
             
             if ("include".equals(componentName)) {
-                String includeURI = componentConfig.getAttribute("src", null);
-                String directoryURI = null;
-                if ( includeURI == null ) {
-                    // check for directories
-                    directoryURI = componentConfig.getAttribute("dir", null);           
        
-                }
-                if ( includeURI == null && directoryURI == null ) {
-                    throw new ConfigurationException("Include element in component configuration
must either have a src or a dir attribute.");
-                }
-                
-                if ( includeURI != null ) {
-                    this.loadURI(includeURI, componentConfig, loadedURIs);
-                } else {
-                    this.getSourceResolver();
-                    Source directory = null;
-                    try {
-                        directory = this.cachedSourceResolver.resolveURI(directoryURI);
-                        if ( directory instanceof TraversableSource ) {
-                            final Iterator children = ((TraversableSource)directory).getChildren().iterator();
-                            while ( children.hasNext() ) {
-                                Source s = (Source)children.next();
-                                this.loadURI(s.getURI(), componentConfig, loadedURIs);
-                            }
-                        } else {
-                            throw new ConfigurationException("Include.dir must point to a
directory, '" + directory.getURI() + "' is not a directory.'");
-                        }
-                    } catch (IOException ioe) {
-                        throw new ConfigurationException("Unable to read configurations from
" + directoryURI);
-                    } finally {
-                        this.cachedSourceResolver.release(directory);
-                    }
-                }
+                handleInclude(contextURI, loadedURIs, componentConfig);
 
             } else {
                 // Component declaration
@@ -401,46 +371,84 @@
             }
         }
     }
-
-    protected void loadURI(String includeURI, Configuration componentConfig, Set loadedURIs)

-    throws ConfigurationException {
-        // If already loaded: skip to next configuration element
-        // First get a source resolver and make uri absolute!
-        this.getSourceResolver();
-        Source src = null;
+    
+    protected void handleInclude(String contextURI, Set loadedURIs, Configuration includeStatement)
+            throws ConfigurationException {
+        String includeURI = includeStatement.getAttribute("src", null);
+        String directoryURI = null;
+        if ( includeURI == null ) {
+            // check for directories
+            directoryURI = includeStatement.getAttribute("dir", null);                  
 
+        }
+        if ( includeURI == null && directoryURI == null ) {
+            throw new ConfigurationException("Include statement must either have a 'src'
or 'dir' attribute, at " +
+                    includeStatement.getLocation());
+        }
         
-        try {
+        // Setup the source resolver if needed
+        setupSourceResolver();
+        
+        if ( includeURI != null ) {
+            Source src;
             try {
-                src = this.cachedSourceResolver.resolveURI(includeURI);
-                includeURI = src.getURI();
+                src = this.cachedSourceResolver.resolveURI(includeURI, contextURI, null);
             } catch (Exception e) {
-                throw new ConfigurationException("Cannot load '" + includeURI + "' at " +
componentConfig.getLocation(), e);
-            } 
+                throw new ConfigurationException("Cannot load '" + includeURI + "' at " +
includeStatement.getLocation(), e);
+            }
             
-            if (!loadedURIs.contains(includeURI)) {
+            loadURI(src, loadedURIs, includeStatement);
+        } else {
+            Source directory = null;
+            try {
+                directory = this.cachedSourceResolver.resolveURI(directoryURI, contextURI,
null);
+                if ( directory instanceof TraversableSource ) {
+                    final Iterator children = ((TraversableSource)directory).getChildren().iterator();
+                    while ( children.hasNext() ) {
+                        Source s = (Source)children.next();
+                        this.loadURI(s, loadedURIs, includeStatement);
+                    }
+                } else {
+                    throw new ConfigurationException("Include.dir must point to a directory,
'" + directory.getURI() + "' is not a directory.'");
+                }
+            } catch (IOException ioe) {
+                throw new ConfigurationException("Unable to read configurations from " +
directoryURI);
+            } finally {
+                this.cachedSourceResolver.release(directory);
+            }
+        }
+    }
+
+    protected void loadURI(Source src, Set loadedURIs, Configuration includeStatement) 
+    throws ConfigurationException {
+        // If already loaded: do nothing
+        try {
+            
+            String uri = src.getURI();
+            
+            if (!loadedURIs.contains(uri)) {
                 // load it and store it in the read set
                 Configuration includeConfig = null;
                 try {
                     DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
-                    includeConfig = builder.build(src.getInputStream(), includeURI);
+                    includeConfig = builder.build(src.getInputStream(), uri);
                 } catch (ConfigurationException ce) {
                     throw ce;
                 } catch (Exception e) {
-                    throw new ConfigurationException("Cannot load '" + includeURI + "' at
" + componentConfig.getLocation(), e);
+                    throw new ConfigurationException("Cannot load '" + uri + "' at " + includeStatement.getLocation(),
e);
                 }
-                loadedURIs.add(includeURI);
+                loadedURIs.add(uri);
                 
                 // what is it?
                 String includeKind = includeConfig.getName();
                 if (includeKind.equals("components")) {
                     // more components
-                    doConfigure(includeConfig, loadedURIs);
+                    doConfigure(includeConfig, uri, loadedURIs);
                 } else if (includeKind.equals("role-list")) {
                     // more roles
                     this.roleManager.configure(includeConfig);
                 } else {
                     throw new ConfigurationException("Unknow document '" + includeKind +
"' included at " +
-                            componentConfig.getLocation());
+                            includeStatement.getLocation());
                 }
             }
         } finally {
@@ -637,39 +645,10 @@
     }
     
     /**
-     * Load a Configuration from a given URI.
-     * 
-     * @param uri the configuration's URI
-     * @param location the location where the load occurs (used to raise meaningful errors)
-     * @return the configuration
-     * @throws ConfigurationException
-     */
-    private Configuration loadConfiguration(String uri, String location) throws ConfigurationException
{
-        
-        // First get a source resolver
-        this.getSourceResolver();
-        Configuration result;
-        Source src = null;
-        try {
-            src = this.cachedSourceResolver.resolveURI(uri);
-            DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
-            result = builder.build(src.getInputStream(), src.getURI());
-        } catch (ConfigurationException ce) {
-            throw ce;
-        } catch (Exception e) {
-            throw new ConfigurationException("Cannot load '" + uri + "' at " + location,
e);
-        } finally {
-            this.cachedSourceResolver.release(src);
-        }
-        
-        return result;
-    }
-    
-    /**
      * If the parent manager does not exist or does not
      * provide a source resolver, a simple one is created here to load the file.
      */
-    protected void getSourceResolver() {
+    protected void setupSourceResolver() {
         if (this.cachedSourceResolver == null) {
             
             if (this.parentManager != null && this.parentManager.hasService(SourceResolver.ROLE))
{

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/source/SimpleSourceResolver.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/source/SimpleSourceResolver.java?view=diff&rev=123745&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/source/SimpleSourceResolver.java&r1=123744&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/source/SimpleSourceResolver.java&r2=123745
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/source/SimpleSourceResolver.java	(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/source/SimpleSourceResolver.java	Thu
Dec 30 15:18:35 2004
@@ -97,17 +97,18 @@
     }
 
     public Source resolveURI(String uri) throws MalformedURLException, IOException {
-        return resolveURI(contextBase, uri, null);
+        return resolveURI(uri, contextBase, null);
     }
 
-    public Source resolveURI(String base, String uri, Map params) throws MalformedURLException,
IOException {
+    public Source resolveURI(String uri, String base, Map params) throws MalformedURLException,
IOException {
         if (uri.startsWith("resource://")) {
             return resourceFactory.getSource(uri, null);
         } else if (uri.startsWith("context://")) {
             // Strip "context://" and resolve relative to the context base
-            return resolveURI(this.contextBase, uri.substring("context://".length()), params);
+            return resolveURI(uri.substring("context://".length()), this.contextBase, params);
         } else {
-            URL url = new URL(new URL(base), uri);
+            URL baseURL = new URL(base);
+            URL url = new URL(baseURL, uri);
             return this.urlFactory.getSource(url.toExternalForm(), params);
         }
     }

Mime
View raw message