djencks 2004/11/07 12:30:55
Modified: modules/assembly/src/plan deployer-system-plan.xml
j2ee-deployer-plan.xml j2ee-server-plan.xml
system-plan.xml
Log:
implement GERONIMO-435. Every builder can specify the default parentId. For
services, a module can specify the empty string parentId="" to get no parent.
Revision Changes Path
1.4 +1 -0
openejb/modules/assembly/src/plan/deployer-system-plan.xml
Index: deployer-system-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/deployer-system-plan.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deployer-system-plan.xml 15 Jul 2004 03:34:20 -0000 1.3
+++ deployer-system-plan.xml 7 Nov 2004 17:30:55 -0000 1.4
@@ -24,6 +24,7 @@
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
configId="org/apache/geronimo/DeployerSystem"
+ parentId=""
>
<!-- ServerInfo service -->
1.26 +5 -1 openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- j2ee-deployer-plan.xml 6 Nov 2004 20:03:37 -0000 1.25
+++ j2ee-deployer-plan.xml 7 Nov 2004 17:30:55 -0000 1.26
@@ -102,10 +102,12 @@
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=Service,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<reference name="Repository">*:role=Repository,*</reference>
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
<attribute name="transactionContextManagerObjectName"
type="javax.management.ObjectName">geronimo.server:type=TransactionContextManager</attribute>
<attribute name="connectionTrackerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
@@ -119,10 +121,12 @@
</gbean>
<gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/J2EEDeployer"
class="org.openejb.deployment.OpenEJBModuleBuilder">
- <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
+<!-- <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>-->
</gbean>
<gbean
name="geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/J2EEDeployer"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="defaultMaxSize" type="int">10</attribute>
<attribute name="defaultMinSize" type="int">0</attribute>
<attribute name="defaultBlockingTimeoutMilliseconds"
type="int">5000</attribute>
1.33 +17 -1 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- j2ee-server-plan.xml 6 Nov 2004 20:03:37 -0000 1.32
+++ j2ee-server-plan.xml 7 Nov 2004 17:30:55 -0000 1.33
@@ -247,10 +247,12 @@
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=Service,config=org/apache/geronimo/Server"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<reference name="Repository">*:role=Repository,*</reference>
</gbean>
<gbean
name="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="j2eeServer"
type="javax.management.ObjectName">geronimo.server:j2eeType=J2EEServer,name=geronimo</attribute>
<attribute name="transactionContextManagerObjectName"
type="javax.management.ObjectName">geronimo.server:type=TransactionContextManager</attribute>
<attribute name="connectionTrackerObjectName"
type="javax.management.ObjectName">geronimo.server:type=ConnectionTracker</attribute>
@@ -263,9 +265,13 @@
<reference
name="ResourceReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
</gbean>
- <gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server"
class="org.openejb.deployment.OpenEJBModuleBuilder"/>
+ <gbean
name="geronimo.deployer:role=ModuleBuilder,type=EJB,config=org/apache/geronimo/Server"
class="org.openejb.deployment.OpenEJBModuleBuilder">
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
+<!-- <reference
name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>-->
+ </gbean>
<gbean
name="geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server"
class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute name="defaultMaxSize" type="int">10</attribute>
<attribute name="defaultMinSize" type="int">0</attribute>
<attribute name="defaultBlockingTimeoutMilliseconds"
type="int">5000</attribute>
@@ -273,6 +279,16 @@
<attribute name="defaultXATransactionCaching"
type="boolean">true</attribute>
<attribute name="defaultXAThreadCaching"
type="boolean">false</attribute>
</gbean>
+
+ <!-- these need names that include the parent id so they don't conflict
with the deployer namens-->
+<!-- <gbean name="openejb.CORBA:type=Compiler,vendor=Ant"
class="org.openejb.corba.compiler.AntCompiler"/>-->
+<!---->
+<!-- <gbean name="openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB"
class="org.openejb.corba.compiler.OpenORBSkeletonGenerator">-->
+<!-- <attribute name="props" type="java.util.Properties">-->
+<!-- </attribute>-->
+<!-- <reference
name="Compiler">openejb.CORBA:type=Compiler,vendor=Ant</reference>-->
+<!-- </gbean>-->
+
<!-- end deployment block -->
<gbean name="openejb.CORBA:type=Server"
class="org.openejb.corba.CORBABean">
1.9 +1 -0 openejb/modules/assembly/src/plan/system-plan.xml
Index: system-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/system-plan.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- system-plan.xml 5 Oct 2004 23:32:29 -0000 1.8
+++ system-plan.xml 7 Nov 2004 17:30:55 -0000 1.9
@@ -29,6 +29,7 @@
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment";
configId="org/apache/geronimo/System"
+ parentId=""
>
<!-- ServerInfo service -->
