djencks 2003/12/08 20:20:49
Modified: modules/core/src/conf boot-service.xml
modules/core/src/deploy connector-service.xml
Log:
Organize mbeans a little better
Revision Changes Path
1.24 +12 -8 incubator-geronimo/modules/core/src/conf/boot-service.xml
Index: boot-service.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/conf/boot-service.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- boot-service.xml 17 Nov 2003 10:51:53 -0000 1.23
+++ boot-service.xml 9 Dec 2003 04:20:48 -0000 1.24
@@ -10,6 +10,17 @@
</class-space>
+ <mbean code="org.apache.geronimo.xml.deployment.LocalEntityResolver"
name="geronimo.xml:role=LocalEntityResolver">
+ <constructor>
+ <arg type="java.io.File">
+ src/schema
+ </arg>
+ </constructor>
+ <attribute name="ConfigFile">
+ ${geronimo.home}/etc/resolver.properties
+ </attribute>
+ </mbean>
+
<!-- Log4j Logging Service -->
<!--
<mbean code="org.apache.geronimo.core.logging.log4j.Log4jService"
name="geronimo.core:role=Logging">
@@ -33,12 +44,5 @@
descriptor="org.apache.geronimo.transaction.TransactionManagerProxy">
</mbean>
- <mbean name="geronimo.connector:role=CachedConnectionManager"
-
descriptor="org/apache/geronimo/connector/outbound/CachedConnectionManager.xml">
- </mbean>
-
- <mbean
descriptor="org.apache.geronimo.connector.deployment.ConnectorDeploymentPlanner"
- name="geronimo.deployment:role=DeploymentPlanner,type=Connector">
- </mbean>
</components>
1.3 +14 -4
incubator-geronimo/modules/core/src/deploy/connector-service.xml
Index: connector-service.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/deploy/connector-service.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- connector-service.xml 27 Nov 2003 02:30:21 -0000 1.2
+++ connector-service.xml 9 Dec 2003 04:20:49 -0000 1.3
@@ -6,7 +6,7 @@
<!-- Starts the Work Manager -->
<!-- ============================================================ -->
<mbean
descriptor="org.apache.geronimo.connector.work.GeronimoWorkManager"
- name="geronimo.jca:role=WorkManager">
+ name="geronimo.connector:role=WorkManager">
<constructor>
<arg type="int">0</arg> <!-- synchronous-->
<arg type="int">10</arg>
@@ -19,10 +19,20 @@
- <!-- ============================================================ -->
- <!-- ============================================================ -->
- <mbean name="geronimo.transaction:role=BootstrapContext"
+ <!-- ============================================================== -->
+ <!-- bootstrap context. The endpoint reference to the work manager -->
+ <!-- is concealed in the geronimo mbean info -->
+ <!-- ============================================================== -->
+ <mbean name="geronimo.connector:role=BootstrapContext"
descriptor="org.apache.geronimo.connector.BootstrapContext">
+ </mbean>
+
+ <mbean name="geronimo.connector:role=ConnectionTrackingCoordinator"
+
descriptor="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
+ </mbean>
+
+ <mbean
descriptor="org.apache.geronimo.connector.deployment.ConnectorDeploymentPlanner"
+ name="geronimo.deployment:role=DeploymentPlanner,type=Connector">
</mbean>
</components>
