Author: djencks
Date: Fri Nov 12 00:19:20 2004
New Revision: 57506
Added:
geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
Modified:
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Log:
remove all builder code and gbeans from server configuration and move it to a
child configuration
Modified: geronimo/trunk/modules/assembly/maven.xml
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Fri Nov 12 00:19:20 2004
@@ -233,6 +233,14 @@
<ant:arg value="target/plan/j2ee-server-plan.xml"/>
</ant:java>
+ <!-- build the runtime deployer configuration -->
+ <ant:echo>Building runtime deployer configuration</ant:echo>
+ <ant:java fork="true" jar="${distDir}/bin/deployer.jar"
failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="distribute"/>
+ <ant:arg value="target/plan/j2ee-runtime-deployer-plan.xml"/>
+ </ant:java>
+
<!-- building tranql connector default database configuration-->
<ant:echo>Building default database configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar"
failonerror="true">
Added: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
Fri Nov 12 00:19:20 2004
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 57116 $ $Date: 2004-11-09 17:34:38 -0800 (Tue, 09 Nov 2004) $ -->
+
+<!--
+Child of the org/apache/geronimo/Server configuration that includes deployment
services
+-->
+<configuration
+ xmlns="http://geronimo.apache.org/xml/ns/deployment";
+ configId="org/apache/geronimo/RuntimeDeployer"
+ parentId="org/apache/geronimo/Server"
+ >
+
+ <dependency>
+ <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+
<uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+
<uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+
<uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+
<uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
+ </dependency>
+
+
+ <!-- deployer gbeans -->
+ <gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/Server"
class="org.apache.geronimo.deployment.Deployer">
+ <reference
name="Builders">geronimo.deployer:role=Builder,config=org/apache/geronimo/Server,*</reference>
+ <reference
name="Store">geronimo.system:role=ConfigurationStore,type=Local</reference>
+ </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>
+ <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/Server</reference>
+ <reference
name="EJBReferenceBuilder">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>
+ <reference
name="ResourceReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
+ <reference
name="AppClientConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=AppClient,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">
+ <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
+ </gbean>
+
+ <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=ClientEJBReferenceBuilder,config=org/apache/geronimo/Server"
class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
+
+ <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>
+ <attribute name="defaultIdleTimeoutMinutes" type="int">15</attribute>
+ <attribute name="defaultXATransactionCaching"
type="boolean">true</attribute>
+ <attribute name="defaultXAThreadCaching"
type="boolean">false</attribute>
+ </gbean>
+
+ <gbean
name="geronimo.deployer:role=ModuleBuilder,type=AppClient,config=org/apache/geronimo/Server"
class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
+ <attribute
name="defaultClientParentId">org/apache/geronimo/Client</attribute>
+ <attribute
name="defaultServerParentId">org/apache/geronimo/Server</attribute>
+ <attribute name="transactionContextManagerObjectName"
type="javax.management.ObjectName">geronimo.client:type=TransactionContextManager</attribute>
+ <attribute name="connectionTrackerObjectName"
type="javax.management.ObjectName">geronimo.client:type=ConnectionTracker</attribute>
+ <reference
name="EJBReferenceBuilder">geronimo.deployer:role=ClientEJBReferenceBuilder,config=org/apache/geronimo/Server</reference>
+ <reference
name="ConnectorModuleBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
+ <reference
name="ResourceReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
+ <reference
name="Store">*:role=ConfigurationStore,type=Local</reference>
+ <reference name="Repository">*:role=Repository,*</reference>
+ </gbean>
+
+<!-- <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 -->
+</configuration>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Fri Nov
12 00:19:20 2004
@@ -30,39 +30,7 @@
parentId="org/apache/geronimo/System"
>
- <!-- needed for online deployment -->
- <!-- should be removed once openejb gets a separate builder module-->
- <dependency>
- <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
-
<uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
-
<uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
-
<uri>geronimo/jars/geronimo-client-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
-
<uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
- </dependency>
-
+
<!--runtime dependencies-->
<dependency>
<uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
@@ -258,73 +226,4 @@
<attribute name="applicationConfigName"
type="java.lang.String">JMX</attribute>
</gbean>
- <!-- todo move to child config once we sort out the packaging -->
- <gbean
name="geronimo.deployment:role=Deployer,config=org/apache/geronimo/Server"
class="org.apache.geronimo.deployment.Deployer">
- <reference
name="Builders">geronimo.deployer:role=Builder,config=org/apache/geronimo/Server,*</reference>
- <reference
name="Store">geronimo.system:role=ConfigurationStore,type=Local</reference>
- </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>
- <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/Server</reference>
- <reference
name="EJBReferenceBuilder">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>
- <reference
name="ResourceReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
- <reference
name="AppClientConfigBuilder">geronimo.deployer:role=ModuleBuilder,type=AppClient,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">
- <attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
- </gbean>
-
- <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=ClientEJBReferenceBuilder,config=org/apache/geronimo/Server"
class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
-
- <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>
- <attribute name="defaultIdleTimeoutMinutes" type="int">15</attribute>
- <attribute name="defaultXATransactionCaching"
type="boolean">true</attribute>
- <attribute name="defaultXAThreadCaching"
type="boolean">false</attribute>
- </gbean>
-
- <gbean
name="geronimo.deployer:role=ModuleBuilder,type=AppClient,config=org/apache/geronimo/Server"
class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
- <attribute
name="defaultClientParentId">org/apache/geronimo/Client</attribute>
- <attribute
name="defaultServerParentId">org/apache/geronimo/Server</attribute>
- <attribute name="transactionContextManagerObjectName"
type="javax.management.ObjectName">geronimo.client:type=TransactionContextManager</attribute>
- <attribute name="connectionTrackerObjectName"
type="javax.management.ObjectName">geronimo.client:type=ConnectionTracker</attribute>
- <reference
name="EJBReferenceBuilder">geronimo.deployer:role=ClientEJBReferenceBuilder,config=org/apache/geronimo/Server</reference>
- <reference
name="ConnectorModuleBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
- <reference
name="ResourceReferenceBuilder">geronimo.deployer:role=ModuleBuilder,type=Connector,config=org/apache/geronimo/Server</reference>
- <reference
name="Store">*:role=ConfigurationStore,type=Local</reference>
- <reference name="Repository">*:role=Repository,*</reference>
- </gbean>
-
-<!-- <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 -->
</configuration>
