You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2004/02/06 19:33:36 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon cocoon.roles
sylvain 2004/02/06 10:33:36
Modified: src/blocks/databases/conf db-modules.xroles
src/blocks/precept/conf precept.xroles
src/blocks/session-fw/conf session.xroles
src/blocks/web3/conf web3.xroles
src/java/org/apache/cocoon cocoon.roles
Log:
Changing component selectors to ExtendedComponentSelector so they are ParentAware
Revision Changes Path
1.2 +1 -1 cocoon-2.1/src/blocks/databases/conf/db-modules.xroles
Index: db-modules.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/conf/db-modules.xroles,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- db-modules.xroles 9 Mar 2003 00:03:01 -0000 1.1
+++ db-modules.xroles 6 Feb 2004 18:33:36 -0000 1.2
@@ -4,6 +4,6 @@
<role name="org.apache.cocoon.components.modules.database.AutoIncrementModuleSelector"
shorthand="autoincrement-modules"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
</xroles>
1.2 +2 -2 cocoon-2.1/src/blocks/precept/conf/precept.xroles
Index: precept.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/precept/conf/precept.xroles,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- precept.xroles 9 Mar 2003 00:05:35 -0000 1.1
+++ precept.xroles 6 Feb 2004 18:33:36 -0000 1.2
@@ -3,14 +3,14 @@
<role name="org.apache.cocoon.precept.PreceptorBuilderSelector"
shorthand="preceptor-impl"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"
default-hint="easyrelax">
<hint shorthand="easyrelax" class="org.apache.cocoon.precept.preceptors.easyrelax.PreceptorBuilderImpl"/>
</role>
<role name="org.apache.cocoon.precept.InstanceSelector"
shorthand="instance-impl"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"
default-hint="dom">
<hint shorthand="dom" class="org.apache.cocoon.precept.stores.dom.simple.InstanceImpl"/>
<hint shorthand="bean" class="org.apache.cocoon.precept.stores.bean.InstanceImpl"/>
1.4 +1 -1 cocoon-2.1/src/blocks/session-fw/conf/session.xroles
Index: session.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/conf/session.xroles,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- session.xroles 23 May 2003 12:13:13 -0000 1.3
+++ session.xroles 6 Feb 2004 18:33:36 -0000 1.4
@@ -24,7 +24,7 @@
<role name="org.apache.cocoon.webapps.session.context.SessionContextProviderSelector"
shorthand="session-context-providers"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector">
</role>
</xroles>
1.2 +1 -1 cocoon-2.1/src/blocks/web3/conf/web3.xroles
Index: web3.xroles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/web3/conf/web3.xroles,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web3.xroles 9 Mar 2003 00:06:34 -0000 1.1
+++ web3.xroles 6 Feb 2004 18:33:36 -0000 1.2
@@ -7,7 +7,7 @@
<role name="org.apache.cocoon.components.web3.Web3StreamerSelector"
shorthand="web3-streamer"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector">
<hint shorthand="default"
class="org.apache.cocoon.components.web3.impl.DefaultWeb3StreamerImpl"/>
<!-- your streamer here -->
1.12 +6 -6 cocoon-2.1/src/java/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cocoon.roles 11 Dec 2003 18:20:08 -0000 1.11
+++ cocoon.roles 6 Feb 2004 18:33:36 -0000 1.12
@@ -16,7 +16,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector">
</role>
<role name="org.apache.excalibur.source.SourceResolver"
@@ -86,14 +86,14 @@
<role name="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
shorthand="markup-languages"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector">
<hint shorthand="sitemap-language" class="org.apache.cocoon.components.language.markup.CocoonMarkupLanguage"/>
<hint shorthand="xsp-language" class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage"/>
</role>
<role name="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
shorthand="programming-languages"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector">
<hint shorthand="java-language" class="org.apache.cocoon.components.language.programming.java.JavaLanguage"/>
<hint shorthand="js-language" class="org.apache.cocoon.components.language.programming.javascript.JavascriptLanguage"/>
<hint shorthand="python-language" class="org.apache.cocoon.components.language.programming.python.PythonLanguage"/>
@@ -112,7 +112,7 @@
<role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
shorthand="datasources"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector">
<hint shorthand="jdbc" class="org.apache.avalon.excalibur.datasource.ResourceLimitingJdbcDataSource"/>
<!-- hint shorthand="jdbc" class="org.apache.avalon.excalibur.datasource.JdbcDataSource"/ -->
<hint shorthand="j2ee" class="org.apache.avalon.excalibur.datasource.J2eeDataSource"/>
@@ -165,11 +165,11 @@
<!-- input/output modules -->
<role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
shorthand="input-modules"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
<role name="org.apache.cocoon.components.modules.output.OutputModuleSelector"
shorthand="output-modules"
- default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+ default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
<role name="org.apache.cocoon.components.modules.input.SitemapVariableHolder"
shorthand="global-variables"