Author: cziegeler Date: Mon Jan 17 13:52:23 2005 New Revision: 125446 URL: http://svn.apache.org/viewcvs?view=rev&rev=125446 Log: No need for patching xconf anymore Added: cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.samplesxconf cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.samplesxconf Removed: 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/ 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/template/conf/ 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 Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf
Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Added: cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.samplesxconf Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.samplesxconf?view=auto&rev=125446 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.samplesxconf Mon Jan 17 13:52:23 2005 @@ -0,0 +1,43 @@ +<?xml version="1.0"?> +<!-- + 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. + 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. +--> + +<!--+ + | + | SVN $Id: cocoon-faces-samples.xconf 125443 2005-01-17 20:39:52Z cziegeler $ + +--> +<components> + <!-- Include dependencies --> + <include src="context://WEB-INF/xconf/cocoon-faces.xconf"/> + + <component-instance role="org.apache.cocoon.taglib.TagSelector" class="org.apache.cocoon.core.container.DefaultServiceSelector"> + <!-- + - CarStore Demo taglib: Custom components + --> + <taglib name="http://java.sun.com/jsf/demo/components"; logger="sitemap.taglib.jsf.demo" class="org.apache.cocoon.core.container.StandaloneServiceSelector"> + <tag name="area" class="org.apache.cocoon.faces.samples.components.taglib.AreaTag" logger="sitemap.taglib.jsf.demo"/> + <tag name="map" class="org.apache.cocoon.faces.samples.components.taglib.MapTag" logger="sitemap.taglib.jsf.demo"/> + </taglib> + + <!-- + - CarStore Demo taglib: Custom validator + --> + <taglib name="urn:carstoretaglibrary_1.1" logger="sitemap.taglib.jsf.carstore" class="org.apache.cocoon.core.container.StandaloneServiceSelector"> + <tag name="format_validator" class="org.apache.cocoon.faces.samples.carstore.FormatValidatorTag" logger="sitemap.taglib.jsf.carstore"/> + </taglib> + + </component-instance> +</components> Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Added: cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.samplesxconf Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.samplesxconf?view=auto&rev=125446 ============================================================================== --- (empty file) +++ cocoon/trunk/src/blocks/portal/WEB-INF/xconf/cocoon-portal.samplesxconf Mon Jan 17 13:52:23 2005 @@ -0,0 +1,311 @@ +<?xml version="1.0"?> +<!-- + 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. + 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. +--> +<!--+ + | + | SVN $Id: cocoon-portal-samples.xconf 125443 2005-01-17 20:39:52Z cziegeler $ + +--> +<components> + <!-- Include dependencies --> + <include src="context://WEB-INF/xconf/cocoon-portal.xconf"/> + + <!-- THIS IS A SAMPLE PORTAL + It demonstrates several features of the portal engine, + so it's not optimized for production. Make sure that + if you use the portal for your own projects that you + remove all unused stuff from the configuration! + --> + <component class="org.apache.cocoon.portal.impl.PortalServiceImpl" logger="portal" role="org.apache.cocoon.portal.PortalService"> + <portals> + <portal name="portal"> + <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Auth</profile-manager> + <!-- This is the sample portal: + - we use the auth profile manager + --> + <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Auth</profile-manager> + <!-- These are the skins the user can choose from: --> + <skins> + <skin name="basic" base-path="context://samples/blocks/portal/skins/basic"> + <thumbnail-path>images/thumb.jpg</thumbnail-path> + </skin> + <skin name="common" base-path="context://samples/blocks/portal/skins/common"> + <thumbnail-path>images/thumb.jpg</thumbnail-path> + </skin> + </skins> + </portal> + </portals> + </component> + + <component class="org.apache.cocoon.portal.profile.impl.AuthenticationProfileManager" logger="portal" role="org.apache.cocoon.portal.profile.ProfileManager/Auth"> + </component> + + <!-- Renderer configuration --> + <component class="org.apache.cocoon.core.container.DefaultServiceSelector" role="org.apache.cocoon.portal.layout.renderer.RendererSelector"> + <renderer name="column" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" > + <aspects> + <aspect type="xslt"> + <parameter name="style" value="{portal-skin:skin.basepath}/styles/column.xsl"/> + </aspect> + <aspect type="parameter"> + <parameter name="tag-name" value="column-layout"/> + </aspect> + <aspect type="composite-content"> + <parameter name="root-tag" value="false"/> + </aspect> + </aspects> + </renderer> + <renderer name="row" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" > + <aspects> + <aspect type="xslt"> + <parameter name="style" value="{portal-skin:skin.basepath}/styles/row.xsl"/> + </aspect> + <aspect type="parameter"> + <parameter name="tag-name" value="row-layout"/> + </aspect> + <aspect type="composite-content"> + <parameter name="root-tag" value="false"/> + </aspect> + </aspects> + </renderer> + <renderer name="tab" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" > + <aspects> + <aspect type="xslt"> + <parameter name="style" value="{portal-skin:skin.basepath}/styles/tab.xsl"/> + </aspect> + <aspect type="parameter"> + <parameter name="tag-name" value="tab-layout"/> + </aspect> + <aspect type="history"/> + <aspect type="tab-content"> + <parameter name="root-tag" value="false"/> + <parameter name="store" value="session"/> + </aspect> + </aspects> + </renderer> + <renderer name="rawtab" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" > + <aspects> + <aspect type="parameter"> + <parameter name="tag-name" value="tab-layout"/> + </aspect> + <aspect type="history"/> + <aspect type="tab-content"> + <parameter name="root-tag" value="false"/> + <parameter name="store" value="session"/> + </aspect> + </aspects> + </renderer> + <renderer name="linktab" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal"> + <aspects> + <aspect type="xslt"> + <parameter name="style" value="{portal-skin:skin.basepath}/styles/linktab.xsl"/> + </aspect> + <aspect type="parameter"> + <parameter name="tag-name" value="linktab-layout"/> + </aspect> + <aspect type="history"/> + <aspect type="tab-content"> + <parameter name="root-tag" value="false"/> + <parameter name="store" value="session"/> + </aspect> + </aspects> + </renderer> + <renderer name="window" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" > + <aspects> + <aspect type="xslt"> + <parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/> + </aspect> + <aspect type="parameter"> + <parameter name="tag-name" value="window"/> + </aspect> + <aspect type="window"> + <parameter name="root-tag" value="false"/> + </aspect> + <aspect type="coplet-removing"/> + <aspect type="coplet-full-screen"/> + <aspect type="coplet-sizing"/> + <aspect type="history"/> + <aspect type="basket"/> + <aspect type="coplet-cinclude"/> + </aspects> + </renderer> + <renderer name="frame" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" > + <aspects> + <aspect type="frame"> + <parameter name="store" value="request"/> + </aspect> + </aspects> + </renderer> + <renderer name="nowindow" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal"> + <aspects> + <aspect type="history"/> + <aspect type="coplet"/> + </aspects> + </renderer> + <renderer name="portlet-window" + class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" + logger="portal"> + <aspects> + <aspect type="xslt"> + <parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/> + </aspect> + <aspect type="parameter"> + <parameter name="tag-name" value="window"/> + </aspect> + <aspect type="portlet-window"> + <parameter name="root-tag" value="false"/> + </aspect> + <aspect type="coplet-removing"/> + <aspect type="history"/> + <aspect type="basket"/> + <aspect type="coplet-cinclude"/> + </aspects> + </renderer> + <renderer name="link" + class="org.apache.cocoon.portal.layout.renderer.impl.DefaultLinkRenderer" + logger="portal"/> + <renderer name="decorated-frame" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal"> + <aspects> + <aspect type="xslt"> + <parameter name="style" value="{portal-skin:skin.basepath}/styles/frame.xsl"/> + </aspect> + <aspect type="parameter"> + <parameter name="tag-name" value="frame"/> + </aspect> + <aspect type="frame"> + <parameter name="store" value="request"/> + </aspect> + </aspects> + </renderer> + </component> + +<!-- Layout factory configuration --> +<component class="org.apache.cocoon.portal.layout.impl.DefaultLayoutFactory" + role="org.apache.cocoon.portal.layout.LayoutFactory"> + <layouts> + <layout name="column" + class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"> + <renderers default="column"> + <renderer name="column"/> + </renderers> + </layout> + <layout name="row" + class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl"> + <renderers default="row"> + <renderer name="row"/> + </renderers> + </layout> + <layout name="tab" + class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl" + item-class="org.apache.cocoon.portal.layout.NamedItem"> + <renderers default="tab"> + <renderer name="tab"/> + </renderers> + </layout> + <layout name="rawtab" + class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl" + item-class="org.apache.cocoon.portal.layout.NamedItem"> + <renderers default="rawtab"> + <renderer name="rawtab"/> + </renderers> + </layout> + <layout name="linktab" + class="org.apache.cocoon.portal.layout.impl.CompositeLayoutImpl" + item-class="org.apache.cocoon.portal.layout.NamedItem"> + <renderers default="linktab"> + <renderer name="linktab"/> + </renderers> + </layout> + <layout name="frame" + class="org.apache.cocoon.portal.layout.impl.FrameLayout" + create-id="true"> + <renderers default="frame"> + <renderer name="frame"/> + </renderers> + </layout> + <layout name="coplet" + class="org.apache.cocoon.portal.layout.impl.CopletLayout"> + <renderers default="window"> + <renderer name="window"/> + <renderer name="portlet-window"/> + <renderer name="nowindow"/> + </renderers> + </layout> + <layout name="link" + class="org.apache.cocoon.portal.layout.impl.LinkLayout" + create-id="true"> + <renderers default="link"> + <renderer name="link"/> + </renderers> + <aspects> + <aspect name="link-layout-key" + class="java.lang.String" + store="session" + auto-create="false"> + </aspect> + <aspect name="link-layout-id" + class="java.lang.String" + store="session" + auto-create="false"> + </aspect> + <!-- + <aspect name="static" + class="java.lang.Boolean" + store="persistent" + auto-create="true" + value="false"> + </aspect> + --> + </aspects> + </layout> + </layouts> +</component> + +<!-- Coplet factory configuration --> +<component class="org.apache.cocoon.portal.coplet.impl.DefaultCopletFactory" + role="org.apache.cocoon.portal.coplet.CopletFactory"> + <coplets> + <coplet name="standard" + class="org.apache.cocoon.portal.coplet.CopletData"> + <coplet-data-aspects> + <!-- Use only the 'memory' aspect store with aspect datas! --> + <aspect auto-create="true" class="java.lang.Boolean" name="sizable" store="memory" value="true"/> + <aspect auto-create="true" class="java.lang.Boolean" name="mandatory" store="memory" value="false"/> + <!-- + <aspect name="maxpageable" + class="java.lang.Boolean" + store="memory" + auto-create="true" + value="true"/> + --> + </coplet-data-aspects> + + <coplet-instance-data-aspects> + <!-- Choose from tempory, request and session aspect store: --> + <aspect name="size" + class="java.lang.Integer" + store="session" + auto-create="true" + value="1"/> + <aspect name="fullScreen" + class="java.lang.Boolean" + store="temporary" + auto-create="true" + value="false"/> + </coplet-instance-data-aspects> + </coplet> + </coplets> + </component> +</components> Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Deleted: /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=auto&rev=125445 ============================================================================== Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java?view=diff&rev=125446&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java&r1=125445&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java&r2=125446 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Mon Jan 17 13:52:23 2005 @@ -702,6 +702,9 @@ String uri = src.getURI(); if (!loadedURIs.contains(uri)) { + if ( this.getLogger().isDebugEnabled() ) { + this.getLogger().debug("Loading configuration from: " + uri); + } // load it and store it in the read set Configuration includeConfig = null; try { Modified: cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf?view=diff&rev=125446&p1=cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf&r1=125445&p2=cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf&r2=125446 ============================================================================== --- cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf (original) +++ cocoon/trunk/src/webapp/WEB-INF/cocoon.xconf Mon Jan 17 13:52:23 2005 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - 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. @@ -28,4 +28,15 @@ <include src="context://WEB-INF/xconf/cocoon-core.xconf"/> + <!--+ + | Include all configuration files ending with ".xconf" + | from the xconf directory. + +--> + <include dir="context://WEB-INF/xconf" postfix=".xconf"/> + + <!--+ + | Include all configuration files ending with ".samplesxconf" + | from the xconf directory. + +--> + <include dir="context://WEB-INF/xconf" postfix=".samplesxconf"/> </cocoon>
