You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/09/11 06:38:10 UTC
svn commit: r280072 - in /geronimo/trunk/modules/assembly/src/plan:
j2ee-deployer-plan.xml j2ee-runtime-deployer-plan.xml
Author: djencks
Date: Sat Sep 10 21:38:07 2005
New Revision: 280072
URL: http://svn.apache.org/viewcvs?rev=280072&view=rev
Log:
Add the orb names to the appropriate builders
Modified:
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?rev=280072&r1=280071&r2=280072&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sat Sep 10 21:38:07 2005
@@ -122,19 +122,19 @@
<uri>antlr/jars/antlr-${antlr_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
+ <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
</dependency>
<dependency>
<uri>asm/jars/asm-${asm_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
+ <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
+ <uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
</dependency>
<dependency>
- <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
+ <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
</dependency>
@@ -224,14 +224,23 @@
<gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
- <reference name="Builders"><name>*</name></reference>
- <reference name="Store"><module>org/apache/geronimo/DeployerSystem</module><name>*</name></reference>
+ <reference name="Builders">
+ <name>*</name>
+ </reference>
+ <reference name="Store">
+ <module>org/apache/geronimo/DeployerSystem</module>
+ <name>*</name>
+ </reference>
</gbean>
<gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
- <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
- <reference name="XmlAttributeBuilders"><name>*</name></reference>
+ <reference name="Repository">
+ <gbean-name>*:name=Repository,*</gbean-name>
+ </reference>
+ <reference name="XmlAttributeBuilders">
+ <name>*</name>
+ </reference>
<reference name="XmlReferenceBuilders">
<name>*</name>
</reference>
@@ -250,15 +259,32 @@
<attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
<attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
<attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
- <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
- <reference name="EJBConfigBuilder"><name>EJBBuilder</name></reference>
- <reference name="EJBReferenceBuilder"><name>ServerEJBReferenceBuilder</name></reference>
- <reference name="WebConfigBuilder"><name>WebBuilder</name></reference>
- <reference name="ConnectorConfigBuilder"><name>ConnectorBuilder</name></reference>
- <reference name="ResourceReferenceBuilder"><name>ConnectorBuilder</name></reference>
- <reference name="AppClientConfigBuilder"><name>AppClientBuilder</name></reference>
- <reference name="ServiceReferenceBuilder"><name>WebServiceBuilder</name></reference>
- </gbean>
+ <attribute name="corbaGBeanObjectName">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ServerCorba,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
+ <reference name="Repository">
+ <gbean-name>*:name=Repository,*</gbean-name>
+ </reference>
+ <reference name="EJBConfigBuilder">
+ <name>EJBBuilder</name>
+ </reference>
+ <reference name="EJBReferenceBuilder">
+ <name>ServerEJBReferenceBuilder</name>
+ </reference>
+ <reference name="WebConfigBuilder">
+ <name>WebBuilder</name>
+ </reference>
+ <reference name="ConnectorConfigBuilder">
+ <name>ConnectorBuilder</name>
+ </reference>
+ <reference name="ResourceReferenceBuilder">
+ <name>ConnectorBuilder</name>
+ </reference>
+ <reference name="AppClientConfigBuilder">
+ <name>AppClientBuilder</name>
+ </reference>
+ <reference name="ServiceReferenceBuilder">
+ <name>WebServiceBuilder</name>
+ </reference>
+ </gbean>
<gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
<attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
@@ -279,7 +305,9 @@
<attribute name="defaultIdleTimeoutMinutes">15</attribute>
<attribute name="defaultXATransactionCaching">true</attribute>
<attribute name="defaultXAThreadCaching">false</attribute>
- <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <reference name="Repository">
+ <gbean-name>*:name=Repository,*</gbean-name>
+ </reference>
</gbean>
<gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
@@ -290,7 +318,9 @@
<attribute name="defaultIdleTimeoutMinutes">15</attribute>
<attribute name="defaultXATransactionCaching">true</attribute>
<attribute name="defaultXAThreadCaching">false</attribute>
- <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <reference name="Repository">
+ <gbean-name>*:name=Repository,*</gbean-name>
+ </reference>
</gbean>
<gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
@@ -298,12 +328,26 @@
<attribute name="defaultServerParentId">org/apache/geronimo/Server</attribute>
<attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
<attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
- <reference name="EJBReferenceBuilder"><name>ClientEJBReferenceBuilder</name></reference>
- <reference name="ConnectorModuleBuilder"><name>ClientConnectorBuilder</name></reference>
- <reference name="ResourceReferenceBuilder"><name>ConnectorBuilder</name></reference>
- <reference name="ServiceReferenceBuilder"><name>WebServiceBuilder</name></reference>
- <reference name="Store"><module>org/apache/geronimo/DeployerSystem</module><name>*</name></reference>
- <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=org/apache/geronimo/ClientCorba,J2EEServer=client,j2eeType=CORBABean,name=Server,*</attribute>
+ <reference name="EJBReferenceBuilder">
+ <name>ClientEJBReferenceBuilder</name>
+ </reference>
+ <reference name="ConnectorModuleBuilder">
+ <name>ClientConnectorBuilder</name>
+ </reference>
+ <reference name="ResourceReferenceBuilder">
+ <name>ConnectorBuilder</name>
+ </reference>
+ <reference name="ServiceReferenceBuilder">
+ <name>WebServiceBuilder</name>
+ </reference>
+ <reference name="Store">
+ <module>org/apache/geronimo/DeployerSystem</module>
+ <name>*</name>
+ </reference>
+ <reference name="Repository">
+ <gbean-name>*:name=Repository,*</gbean-name>
+ </reference>
</gbean>
<gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder">
@@ -332,7 +376,9 @@
servicemix/jars/spring-${servicemix_spring_version}.jar,
servicemix/jars/servicemix-${servicemix_version}.jar
</attribute>
- <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <reference name="Repository">
+ <gbean-name>*:name=Repository,*</gbean-name>
+ </reference>
</gbean>
@@ -340,8 +386,12 @@
<gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/web/tomcat</attribute>
<references name="ModuleBuilders">
- <pattern><gbean-name>geronimo.deployer:j2eeType=ModuleBuilder,name=JettyWebBuilder,*</gbean-name></pattern>
- <pattern><gbean-name>geronimo.deployer:j2eeType=ModuleBuilder,name=TomcatWebBuilder,*</gbean-name></pattern>
+ <pattern>
+ <gbean-name>geronimo.deployer:j2eeType=ModuleBuilder,name=JettyWebBuilder,*</gbean-name>
+ </pattern>
+ <pattern>
+ <gbean-name>geronimo.deployer:j2eeType=ModuleBuilder,name=TomcatWebBuilder,*</gbean-name>
+ </pattern>
</references>
</gbean>
@@ -409,7 +459,6 @@
<gbean-name>*:name=Repository,*</gbean-name>
</reference>
</gbean>
-
</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?rev=280072&r1=280071&r2=280072&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Sat Sep 10 21:38:07 2005
@@ -116,6 +116,7 @@
<attribute name="connectionTrackerObjectName">geronimo.server:name=ConnectionTracker,*</attribute>
<attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
<attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
+ <attribute name="corbaGBeanObjectName">geronimo.server:J2EEServer=geronimo,j2eeType=CORBABean,name=Server,*</attribute>
<reference name="Repository">
<gbean-name>*:name=Repository,*</gbean-name>
</reference>
@@ -187,6 +188,7 @@
<attribute name="defaultServerParentId">org/apache/geronimo/Server</attribute>
<attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
<attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
+ <attribute name="corbaGBeanObjectName">geronimo.client:J2EEServer=client,j2eeType=CORBABean,name=Server,*</attribute>
<reference name="EJBReferenceBuilder">
<name>ClientEJBReferenceBuilder</name>
</reference>