djencks 2004/07/22 23:12:23
Modified: modules/assembly/src/plan default-database-plan.xml
j2ee-server-plan.xml
Log:
using correct names always helps one find things
Revision Changes Path
1.2 +2 -2
incubator-geronimo/modules/assembly/src/plan/default-database-plan.xml
Index: default-database-plan.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/assembly/src/plan/default-database-plan.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default-database-plan.xml 18 Jul 2004 22:18:59 -0000 1.1
+++ default-database-plan.xml 23 Jul 2004 06:12:22 -0000 1.2
@@ -39,12 +39,12 @@
<gbean
name="geronimo.server:type=ThreadPooledTimer,name=JDBCTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
<attribute name="repeatCount" type="int">5</attribute>
<reference
name="TransactionContextManager">geronimo.server:type=TransactionContextManager</reference>
- <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:name=DefaultDatasource</reference>
+ <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEServer=geronimo,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
<reference
name="ThreadPool">geronimo.server:type=ThreadPool,name=DefaultThreadPool</reference>
</gbean>
<gbean
name="geronimo.server:type=ThreadPooledTimer,name=JDBCNonTransactionalThreadPooledTimer"
class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
- <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:name=DefaultDatasource</reference>
+ <reference
name="ManagedConnectionFactoryWrapper">geronimo.server:J2EEServer=geronimo,j2eeType=JCAManagedConnectionFactory,name=DefaultDatasource</reference>
<reference
name="ThreadPool">geronimo.server:type=ThreadPool,name=DefaultThreadPool</reference>
</gbean>
1.39 +3 -3
incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- j2ee-server-plan.xml 18 Jul 2004 22:18:59 -0000 1.38
+++ j2ee-server-plan.xml 23 Jul 2004 06:12:22 -0000 1.39
@@ -230,9 +230,9 @@
<attribute name="transactionalTimerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=TransactionalThreadPooledTimer</attribute>
<attribute name="nonTransactionalTimerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ThreadPooledTimer,name=NonTransactionalThreadPooledTimer</attribute>
<reference name="Repository">*:role=Repository,*</reference>
- <reference
name="EJBConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer</reference>
- <reference
name="WebConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/J2EEDeployer</reference>
- <reference
name="ConnectorConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer</reference>
+ <reference
name="EJBConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server</reference>
+ <reference
name="WebConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/Server</reference>
+ <reference
name="ConnectorConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
</gbean>
<gbean
name="geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/Server"
class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder"/>
