bloritsch 01/04/17 09:04:16
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Roles.java
cocoon.roles
Log:
Role updates for DataSources and Avalon 4.0 pre-beta
Revision Changes Path
No revision
No revision
1.1.2.14 +3 -3 xml-cocoon/src/org/apache/cocoon/Attic/Roles.java
Index: Roles.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Roles.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- Roles.java 2001/04/17 10:32:38 1.1.2.13
+++ Roles.java 2001/04/17 16:04:12 1.1.2.14
@@ -12,7 +12,7 @@
* Created this interface to specify the Avalon role names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/04/17 10:32:38 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/04/17 16:04:12 $
*/
public interface Roles {
@@ -28,10 +28,10 @@
String PROGRAMMING_LANGUAGE =
"org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector";
String PROGRAM_GENERATOR =
"org.apache.cocoon.components.language.generator.ProgramGenerator";
String CLASS_LOADER =
"org.apache.cocoon.components.classloader.ClassLoaderManager";
- String POOL_CONTROLLER =
"org.apache.avalon.util.pool.PoolController";
+ String POOL_CONTROLLER = "org.apache.excalibur.pool.PoolController";
String SAX_CONNECTOR =
"org.apache.cocoon.components.saxconnector.SAXConnector";
String IMAGE_ENCODER =
"org.apache.cocoon.components.image.ImageEncoderSelector";
- String DB_CONNECTION =
"org.apache.avalon.util.datasource.DataSourceComponentSelector";
+ String DB_CONNECTION =
"org.apache.excalibur.datasource.DataSourceComponentSelector";
String URL_FACTORY =
"org.apache.cocoon.components.url.URLFactory";
String ACTIONS = "org.apache.cocoon.acting.ActionSelector";
1.1.2.5 +4 -4 xml-cocoon/src/org/apache/cocoon/Attic/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/cocoon.roles,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- cocoon.roles 2001/04/17 10:32:40 1.1.2.4
+++ cocoon.roles 2001/04/17 16:04:13 1.1.2.5
@@ -40,7 +40,7 @@
shorthand="classloader"
default-class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
- <role name="org.apache.avalon.util.pool.PoolController"
+ <role name="org.apache.excalibur.pool.PoolController"
shorthand="pool-controller"
default-class="org.apache.avalon.component.DefaultComponentPoolController"/>
@@ -51,11 +51,11 @@
<role name="org.apache.cocoon.components.image.ImageEncoderSelector"
shorthand="image-encoder"/>
- <role name="org.apache.avalon.util.datasource.DataSourceComponentSelector"
+ <role name="org.apache.excalibur.datasource.DataSourceComponentSelector"
shorthand="datasources"
default-class="org.apache.avalon.component.DefaultComponentSelector">
- <hint shorthand="jdbc"
class="org.apache.avalon.util.datasource.JdbcDataSource"/>
- <hint shorthand="j2ee"
class="org.apache.avalon.util.datasource.J2eeDataSource"/>
+ <hint shorthand="jdbc"
class="org.apache.excalibur.datasource.JdbcDataSource"/>
+ <hint shorthand="j2ee"
class="org.apache.exvalibur.datasource.J2eeDataSource"/>
</role>
<role name="org.apache.cocoon.components.url.URLFactory"
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
