geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r366676 - in /geronimo/trunk: assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/ assemblies/j2ee-tomcat-server/ assemblies/j2ee-tomcat-server/src/var/config/ configs/axis-deployer/ configs/axis-deployer/src/ configs/...
Date Sat, 07 Jan 2006 05:37:29 GMT
Author: djencks
Date: Fri Jan  6 21:37:04 2006
New Revision: 366676

URL: http://svn.apache.org/viewcvs?rev=366676&view=rev
Log:
GERONIMO-1427  First step towards separating openejb and axis into separate configs

Added:
    geronimo/trunk/configs/axis/
      - copied from r358893, geronimo/trunk/configs/j2ee-server/
    geronimo/trunk/configs/axis-deployer/
      - copied from r358893, geronimo/trunk/configs/j2ee-deployer/
    geronimo/trunk/configs/axis-deployer/LICENSE.txt
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-deployer/LICENSE.txt
    geronimo/trunk/configs/axis-deployer/NOTICE.txt
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-deployer/NOTICE.txt
    geronimo/trunk/configs/axis-deployer/maven.xml
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-deployer/maven.xml
    geronimo/trunk/configs/axis-deployer/project.properties
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-deployer/project.properties
    geronimo/trunk/configs/axis-deployer/project.xml
      - copied, changed from r366666, geronimo/trunk/configs/j2ee-deployer/project.xml
    geronimo/trunk/configs/axis-deployer/src/
      - copied from r366666, geronimo/trunk/configs/j2ee-deployer/src/
    geronimo/trunk/configs/axis/LICENSE.txt
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-server/LICENSE.txt
    geronimo/trunk/configs/axis/NOTICE.txt
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-server/NOTICE.txt
    geronimo/trunk/configs/axis/maven.xml
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-server/maven.xml
    geronimo/trunk/configs/axis/project.properties
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-server/project.properties
    geronimo/trunk/configs/axis/project.xml
      - copied, changed from r366666, geronimo/trunk/configs/j2ee-server/project.xml
    geronimo/trunk/configs/axis/src/
      - copied from r366666, geronimo/trunk/configs/j2ee-server/src/
    geronimo/trunk/configs/openejb/
      - copied from r358893, geronimo/trunk/configs/j2ee-server/
    geronimo/trunk/configs/openejb-deployer/
      - copied from r358893, geronimo/trunk/configs/j2ee-deployer/
    geronimo/trunk/configs/openejb-deployer/LICENSE.txt
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-deployer/LICENSE.txt
    geronimo/trunk/configs/openejb-deployer/NOTICE.txt
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-deployer/NOTICE.txt
    geronimo/trunk/configs/openejb-deployer/maven.xml
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-deployer/maven.xml
    geronimo/trunk/configs/openejb-deployer/project.properties
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-deployer/project.properties
    geronimo/trunk/configs/openejb-deployer/project.xml
      - copied, changed from r366666, geronimo/trunk/configs/j2ee-deployer/project.xml
    geronimo/trunk/configs/openejb-deployer/src/
      - copied from r366666, geronimo/trunk/configs/j2ee-deployer/src/
    geronimo/trunk/configs/openejb/LICENSE.txt
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-server/LICENSE.txt
    geronimo/trunk/configs/openejb/NOTICE.txt
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-server/NOTICE.txt
    geronimo/trunk/configs/openejb/maven.xml
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-server/maven.xml
    geronimo/trunk/configs/openejb/project.properties
      - copied unchanged from r366666, geronimo/trunk/configs/j2ee-server/project.properties
    geronimo/trunk/configs/openejb/project.xml
      - copied, changed from r366666, geronimo/trunk/configs/j2ee-server/project.xml
    geronimo/trunk/configs/openejb/src/
      - copied from r366666, geronimo/trunk/configs/j2ee-server/src/
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
Modified:
    geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
    geronimo/trunk/configs/axis-deployer/src/plan/plan.xml
    geronimo/trunk/configs/axis/src/plan/plan.xml
    geronimo/trunk/configs/console-jetty/project.properties
    geronimo/trunk/configs/console-tomcat/project.properties
    geronimo/trunk/configs/daytrader-jetty/project.properties
    geronimo/trunk/configs/daytrader-tomcat/project.properties
    geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
    geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
    geronimo/trunk/configs/jmxdebug-jetty/project.properties
    geronimo/trunk/configs/jmxdebug-tomcat/project.properties
    geronimo/trunk/configs/jsp-examples-jetty/project.properties
    geronimo/trunk/configs/jsp-examples-tomcat/project.properties
    geronimo/trunk/configs/ldap-demo-jetty/project.properties
    geronimo/trunk/configs/ldap-demo-tomcat/project.properties
    geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
    geronimo/trunk/configs/openejb/src/plan/plan.xml
    geronimo/trunk/configs/remote-deploy-jetty/project.properties
    geronimo/trunk/configs/remote-deploy-tomcat/project.properties
    geronimo/trunk/configs/servlets-examples-jetty/project.properties
    geronimo/trunk/configs/servlets-examples-tomcat/project.properties
    geronimo/trunk/configs/system-database/project.properties
    geronimo/trunk/configs/system-database/project.xml
    geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
    geronimo/trunk/configs/welcome-jetty/project.properties
    geronimo/trunk/configs/welcome-tomcat/project.properties

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Fri Jan  6 21:37:04 2006
@@ -71,6 +71,24 @@
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
          <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-corba</artifactId>
@@ -194,6 +212,24 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Fri Jan  6 21:37:04 2006
@@ -16,12 +16,7 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
-        <gbean name="geronimo:name=EJB,type=NetworkService">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanOpenEJBPort}</attribute>
-        </gbean>
-    </configuration>
+    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
     <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -31,6 +26,13 @@
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
     </configuration>
+    <configuration name="geronimo/axis/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/openejb/${pom.currentVersion}/car">
+        <gbean name="geronimo:name=EJB,type=NetworkService">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanOpenEJBPort}</attribute>
+        </gbean>
+    </configuration>
     <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
@@ -79,11 +81,14 @@
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</attribute>
         </gbean>
+    </configuration>
+    <configuration name="geronimo/openejb-deployer/${pom.currentVersion}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/javamail/1.0/car" load="false">
+    <configuration name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
@@ -99,5 +104,5 @@
     <configuration name="geronimo/jmxdebug-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car"/>
     <configuration name="geronimo/remote-deploy-jetty/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
+    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car"/>
 </attributes>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Fri Jan  6 21:37:04 2006
@@ -73,6 +73,24 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>openejb</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>j2ee-corba</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
@@ -194,6 +212,24 @@
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <type>car</type>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>install</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
             <type>car</type>
             <version>${pom.currentVersion}</version>
             <properties>

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Fri Jan  6 21:37:04 2006
@@ -16,12 +16,7 @@
             <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car">
-        <gbean name="geronimo:name=EJB,type=NetworkService">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanOpenEJBPort}</attribute>
-        </gbean>
-    </configuration>
+    <configuration name="geronimo/j2ee-server/${pom.currentVersion}/car"/>
     <configuration name="geronimo/j2ee-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -31,6 +26,13 @@
             <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         </gbean>
     </configuration>
+    <configuration name="geronimo/axis/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/openejb/${pom.currentVersion}/car">
+        <gbean name="geronimo:name=EJB,type=NetworkService">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanOpenEJBPort}</attribute>
+        </gbean>
+    </configuration>
     <configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
         <gbean name="NameServer">
             <attribute name="dbDir">var/cosnaming.db</attribute>
@@ -85,11 +87,14 @@
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
         </gbean>
+    </configuration>
+    <configuration name="geronimo/openejb-deployer/${pom.currentVersion}/car">
         <gbean name="EJBBuilder">
             <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/tomcat/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
         </gbean>
     </configuration>
-    <configuration name="geronimo/javamail/1.0/car" load="false">
+    <configuration name="geronimo/axis-deployer/${pom.currentVersion}/car"/>
+    <configuration name="geronimo/javamail/${pom.currentVersion}/car" load="false">
         <gbean name="SMTPTransport">
             <attribute name="host">localhost</attribute>
             <attribute name="port">25</attribute>
@@ -105,5 +110,5 @@
     <configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car"/>
     <configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car"/>
     <configuration name="geronimo/remote-deploy-tomcat/${pom.currentVersion}/car"/>
-    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car" />
+    <configuration name="geronimo/hot-deployer/${pom.currentVersion}/car"/>
 </attributes>

Copied: geronimo/trunk/configs/axis-deployer/project.xml (from r366666, geronimo/trunk/configs/j2ee-deployer/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/axis-deployer/project.xml?p2=geronimo/trunk/configs/axis-deployer/project.xml&p1=geronimo/trunk/configs/j2ee-deployer/project.xml&r1=366666&r2=366676&rev=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/project.xml (original)
+++ geronimo/trunk/configs/axis-deployer/project.xml Fri Jan  6 21:37:04 2006
@@ -21,8 +21,8 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>j2ee-deployer</id>
-    <name>Configuration for performing J2EE deployments</name>
+    <id>axis-deployer</id>
+    <name>Axis Configuration for performing J2EE deployments</name>
 
     <dependencies>
         <!-- dependency on deployer -->
@@ -45,14 +45,22 @@
     <dependency>
         <groupId>geronimo</groupId>
         <type>car</type>
-        <artifactId>j2ee-server</artifactId>
+        <artifactId>j2ee-deployer</artifactId>
+        <version>${pom.currentVersion}</version>
+            <properties>
+                 <geronimo.import>true</geronimo.import>
+             </properties>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <type>car</type>
+        <artifactId>axis</artifactId>
         <version>${pom.currentVersion}</version>
             <properties>
                  <geronimo.import>true</geronimo.import>
              </properties>
     </dependency>
 
-        <!-- dependencies from gbean-deployer needed as maven adds service builder to the maven.root classloader -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -109,7 +117,7 @@
         <!-- dependencies from plan -->
 
         <!-- common libraries used by all builders -->
-        <dependency>
+<!--        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
@@ -157,11 +165,11 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-
+-->
 
         <!-- todo builder implementations - can we move these to sub-plans? -->
         <!-- EAR, application-clients and other J2EE artifacts -->
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${geronimo_version}</version>
@@ -209,7 +217,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-        <dependency>
+-->        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-axis-builder</artifactId>
             <version>${geronimo_version}</version>
@@ -304,7 +312,7 @@
         </dependency>
 
         <!-- RARs using Geronimo Connector implementation -->
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${geronimo_version}</version>
@@ -320,7 +328,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-
+-->
     </dependencies>
 </project>
 

Modified: geronimo/trunk/configs/axis-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/axis-deployer/src/plan/plan.xml?rev=366676&r1=366666&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/axis-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/axis-deployer/src/plan/plan.xml Fri Jan  6 21:37:04 2006
@@ -20,115 +20,6 @@
                configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
         >
 
-    <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <!--domain set to wildcard so datasources may be deployed independently on client. -->
-        <!--a better solution is to get the domain and server from the parent configuration -->
-        <attribute name="transactionContextManagerObjectName">*:name=TransactionContextManager,*</attribute>
-        <attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
-        <attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
-        <attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/server-corba/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-        <reference name="WebConfigBuilder">
-            <name>WebBuilder</name>
-        </reference>
-        <reference name="EJBConfigBuilder">
-            <name>EJBBuilder</name>
-        </reference>
-        <reference name="ConnectorConfigBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="AppClientConfigBuilder">
-            <name>AppClientBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
-        <reference name="EJBReferenceBuilder">
-            <name>ServerEJBReferenceBuilder</name>
-        </reference>
-    </gbean>
-
-    <!-- web switching builder -->
-    <gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
-        <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
-        <references name="ModuleBuilders">
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/jetty-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/tomcat-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name></pattern>
-        </references>
-     </gbean>
-
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
-        <reference name="WebServiceLinkTemplate">
-            <name>WebServiceEJBLinkTemplate</name>
-        </reference>
-        <reference name="WebServiceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-    </gbean>
-
-    <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="defaultMaxSize">10</attribute>
-        <attribute name="defaultMinSize">0</attribute>
-        <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
-        <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>
-    </gbean>
-
-    <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
-        <attribute name="defaultClientParentId">${pom.groupId}/client/${pom.currentVersion}/car</attribute>
-        <attribute name="defaultServerParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
-        <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=geronimo/client-corba/${pom.currentVersion}/car,J2EEServer=client,j2eeType=CORBABean,name=Server</attribute>
-        <reference name="EJBReferenceBuilder">
-            <name>ClientEJBReferenceBuilder</name>
-        </reference>
-        <reference name="ConnectorModuleBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
-        <references name="Store">
-            <!-- todo replace with a store the Client Builder can write to -->
-            <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
-        </references>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-    </gbean>
-
-    <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
-    <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
-    <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
-    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
-        <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
-    </gbean>
-    <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
-    <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEJBReferenceBuilder"/>
     <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
-    <gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
 
 </configuration>

Copied: geronimo/trunk/configs/axis/project.xml (from r366666, geronimo/trunk/configs/j2ee-server/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/axis/project.xml?p2=geronimo/trunk/configs/axis/project.xml&p1=geronimo/trunk/configs/j2ee-server/project.xml&r1=366666&r2=366676&rev=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/axis/project.xml Fri Jan  6 21:37:04 2006
@@ -21,8 +21,8 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>j2ee-server</id>
-    <name>Server Configuration for the J2EE Server</name>
+    <id>axis</id>
+    <name>Axis Configuration for the J2EE Server</name>
 
     <dependencies>
         <!-- dependency on deployer -->
@@ -41,14 +41,14 @@
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>rmi-naming</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
                  <geronimo.import>true</geronimo.import>
              </properties>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${geronimo_version}</version>
@@ -187,10 +187,10 @@
                  <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
-
+-->
 
         <!-- TODO why are these here rather than in system-database??? -->
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-derby</artifactId>
             <version>${pom.currentVersion}</version>
@@ -216,7 +216,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
-
+-->
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/configs/axis/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/axis/src/plan/plan.xml?rev=366676&r1=366666&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/axis/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/axis/src/plan/plan.xml Fri Jan  6 21:37:04 2006
@@ -31,94 +31,6 @@
                configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
-    <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
-        <attribute name="keepAliveTime">5000</attribute>
-        <attribute name="poolSize">300</attribute>
-        <attribute name="poolName">DefaultThreadPool</attribute>
-    </gbean>
-
-    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
-    </gbean>
-
-    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
-        <attribute name="syncMaximumPoolSize">10</attribute>
-        <attribute name="startMaximumPoolSize">10</attribute>
-        <attribute name="scheduledMaximumPoolSize">10</attribute>
-        <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
-    </gbean>
-
-    <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog">
-        <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
-        <attribute name="bufferSizeKBytes">32</attribute>
-        <attribute name="checksumEnabled">true</attribute>
-        <attribute name="flushSleepTimeMilliseconds">50</attribute>
-        <attribute name="logFileDir">var/txlog</attribute>
-        <attribute name="logFileExt">log</attribute>
-        <attribute name="logFileName">howl</attribute>
-        <attribute name="maxBlocksPerFile">-1</attribute>
-        <attribute name="maxBuffers">0</attribute>
-        <attribute name="maxLogFiles">2</attribute>
-        <attribute name="minBuffers">4</attribute>
-        <attribute name="threadsWaitingForceThreshold">-1</attribute>
-        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
-    </gbean>
-
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
-        <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
-        <reference name="TransactionLog"><name>HOWLTransactionLog</name></reference>
-        <references name="ResourceManagers">
-            <pattern><gbean-name>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=ActivationSpec,*</gbean-name></pattern>
-        </references>
-    </gbean>
-
-    <gbean name="TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="XidImporter"><name>TransactionManager</name></reference>
-    </gbean>
-
-    <!-- EJB Protocol -->
-    <gbean gbeanName="geronimo:type=NetworkService,name=EJB" class="org.activeio.xnet.StandardServiceStackGBean">
-        <attribute name="name">EJB</attribute>
-        <attribute name="port">${PlanOpenEJBPort}</attribute>
-        <attribute name="host">${PlanServerHostname}</attribute>
-        <attribute name="allowHosts">${PlanClientAddresses}</attribute>
-        <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
-        <attribute name="logOnFailure">HOST,NAME</attribute>
-        <reference name="Executor"><name>DefaultThreadPool</name></reference>
-        <reference name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
-    </gbean>
-    <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
-        <reference name="ContainerIndex">
-            <gbean-name>openejb:type=ContainerIndex</gbean-name>
-        </reference>
-        <reference name="ORBRefs">
-            <module>*</module>
-            <name>Server</name>
-        </reference>
-    </gbean>
-
-    <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
-    <gbean gbeanName="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
-        <references name="EJBContainers">
-            <pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=StatefulSessionBean,*</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
-        </references>
-    </gbean>
-
-    <!-- JSR77 Management Objects -->
-    <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
-    <gbean gbeanName="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
-    </gbean>
-
-    <gbean gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
-
-    <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
-
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
-
     <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
 
 </configuration>

Modified: geronimo/trunk/configs/console-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/project.properties (original)
+++ geronimo/trunk/configs/console-jetty/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/geronimo-console-${geronimo_version}.ear
 

Modified: geronimo/trunk/configs/console-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/project.properties (original)
+++ geronimo/trunk/configs/console-tomcat/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/geronimo-console-${geronimo_version}.ear
 

Modified: geronimo/trunk/configs/daytrader-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-jetty/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-jetty/project.properties (original)
+++ geronimo/trunk/configs/daytrader-jetty/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${pom.currentVersion}.ear
 

Modified: geronimo/trunk/configs/daytrader-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/daytrader-tomcat/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/daytrader-tomcat/project.properties (original)
+++ geronimo/trunk/configs/daytrader-tomcat/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/ears/daytrader-ear-${pom.currentVersion}.ear
 

Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Fri Jan  6 21:37:04 2006
@@ -36,6 +36,7 @@
             <name>WebBuilder</name>
         </reference>
         <reference name="EJBConfigBuilder">
+            <module>*</module>
             <name>EJBBuilder</name>
         </reference>
         <reference name="ConnectorConfigBuilder">
@@ -48,9 +49,11 @@
             <name>ConnectorBuilder</name>
         </reference>
         <reference name="ServiceReferenceBuilder">
+            <module>*</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="EJBReferenceBuilder">
+            <module>*</module>
             <name>ServerEJBReferenceBuilder</name>
         </reference>
     </gbean>
@@ -64,20 +67,6 @@
         </references>
      </gbean>
 
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
-        <reference name="WebServiceLinkTemplate">
-            <name>WebServiceEJBLinkTemplate</name>
-        </reference>
-        <reference name="WebServiceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-    </gbean>
-
     <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
         <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
         <attribute name="defaultMaxSize">10</attribute>
@@ -98,6 +87,7 @@
         <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
         <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=geronimo/client-corba/${pom.currentVersion}/car,J2EEServer=client,j2eeType=CORBABean,name=Server</attribute>
         <reference name="EJBReferenceBuilder">
+            <module>*</module>
             <name>ClientEJBReferenceBuilder</name>
         </reference>
         <reference name="ConnectorModuleBuilder">
@@ -107,6 +97,7 @@
             <name>ConnectorBuilder</name>
         </reference>
         <reference name="ServiceReferenceBuilder">
+            <module>*</module>
             <name>WebServiceBuilder</name>
         </reference>
         <references name="Store">
@@ -119,16 +110,10 @@
         </reference>
     </gbean>
 
-    <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
-    <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
     <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
         <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
-    <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
-    <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEJBReferenceBuilder"/>
-    <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
-    <gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
 
 </configuration>

Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Fri Jan  6 21:37:04 2006
@@ -77,35 +77,6 @@
         <reference name="XidImporter"><name>TransactionManager</name></reference>
     </gbean>
 
-    <!-- EJB Protocol -->
-    <gbean gbeanName="geronimo:type=NetworkService,name=EJB" class="org.activeio.xnet.StandardServiceStackGBean">
-        <attribute name="name">EJB</attribute>
-        <attribute name="port">${PlanOpenEJBPort}</attribute>
-        <attribute name="host">${PlanServerHostname}</attribute>
-        <attribute name="allowHosts">${PlanClientAddresses}</attribute>
-        <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
-        <attribute name="logOnFailure">HOST,NAME</attribute>
-        <reference name="Executor"><name>DefaultThreadPool</name></reference>
-        <reference name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
-    </gbean>
-    <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
-        <reference name="ContainerIndex">
-            <gbean-name>openejb:type=ContainerIndex</gbean-name>
-        </reference>
-        <reference name="ORBRefs">
-            <module>*</module>
-            <name>Server</name>
-        </reference>
-    </gbean>
-
-    <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR builder in the deployer plan -->
-    <gbean gbeanName="openejb:type=ContainerIndex" class="org.openejb.ContainerIndex">
-        <references name="EJBContainers">
-            <pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=StatefulSessionBean,*</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
-        </references>
-    </gbean>
 
     <!-- JSR77 Management Objects -->
     <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
@@ -116,9 +87,5 @@
     <gbean gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
 
     <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
-
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
-
-    <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
 
 </configuration>

Modified: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Fri Jan  6 21:37:04 2006
@@ -24,7 +24,7 @@
     >
 
     <gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car,${pom.groupId}/jetty/${pom.currentVersion}/car</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car,${pom.groupId}/jetty/${pom.currentVersion}/car,${pom.groupId}/axis/${pom.currentVersion}/car</attribute>
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
@@ -37,7 +37,7 @@
             <name>POJOTemplate</name>
         </reference>
         <reference name="WebServiceBuilder">
-            <module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>
+            <module>*</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Repository">

Modified: geronimo/trunk/configs/jmxdebug-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-jetty/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-jetty/project.properties (original)
+++ geronimo/trunk/configs/jmxdebug-jetty/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/jmxdebug-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jmxdebug-tomcat/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/jmxdebug-tomcat/project.properties (original)
+++ geronimo/trunk/configs/jmxdebug-tomcat/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/jsp-examples-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-jetty/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/project.properties (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-jsp-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/trunk/configs/jsp-examples-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jsp-examples-tomcat/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/project.properties (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-jsp-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/trunk/configs/ldap-demo-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-jetty/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/project.properties (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-ldap-demo-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/ldap-demo-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/ldap-demo-tomcat/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/project.properties (original)
+++ geronimo/trunk/configs/ldap-demo-tomcat/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-ldap-demo-${geronimo_version}.war
 

Copied: geronimo/trunk/configs/openejb-deployer/project.xml (from r366666, geronimo/trunk/configs/j2ee-deployer/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb-deployer/project.xml?p2=geronimo/trunk/configs/openejb-deployer/project.xml&p1=geronimo/trunk/configs/j2ee-deployer/project.xml&r1=366666&r2=366676&rev=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/project.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/project.xml Fri Jan  6 21:37:04 2006
@@ -21,8 +21,8 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>j2ee-deployer</id>
-    <name>Configuration for performing J2EE deployments</name>
+    <id>openejb-deployer</id>
+    <name>openejb Configuration for performing J2EE deployments</name>
 
     <dependencies>
         <!-- dependency on deployer -->
@@ -35,7 +35,7 @@
 
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
@@ -45,7 +45,7 @@
     <dependency>
         <groupId>geronimo</groupId>
         <type>car</type>
-        <artifactId>j2ee-server</artifactId>
+        <artifactId>openejb</artifactId>
         <version>${pom.currentVersion}</version>
             <properties>
                  <geronimo.import>true</geronimo.import>
@@ -53,7 +53,7 @@
     </dependency>
 
         <!-- dependencies from gbean-deployer needed as maven adds service builder to the maven.root classloader -->
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${geronimo_version}</version>
@@ -88,7 +88,7 @@
             <artifactId>stax-api</artifactId>
             <version>${stax_api_version}</version>
         </dependency>
-
+-->
 <!--        <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
@@ -109,7 +109,7 @@
         <!-- dependencies from plan -->
 
         <!-- common libraries used by all builders -->
-        <dependency>
+<!--        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
@@ -157,11 +157,11 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-
+-->
 
         <!-- todo builder implementations - can we move these to sub-plans? -->
         <!-- EAR, application-clients and other J2EE artifacts -->
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>
             <version>${geronimo_version}</version>
@@ -233,7 +233,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-        <dependency>
+-->        <dependency>
             <groupId>axis</groupId>
             <artifactId>axis</artifactId>
             <version>${axis_version}</version>
@@ -304,7 +304,7 @@
         </dependency>
 
         <!-- RARs using Geronimo Connector implementation -->
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${geronimo_version}</version>
@@ -320,7 +320,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
              </properties>
         </dependency>
-
+-->
     </dependencies>
 </project>
 

Modified: geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml?rev=366676&r1=366666&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/src/plan/plan.xml Fri Jan  6 21:37:04 2006
@@ -20,57 +20,15 @@
                configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
         >
 
-    <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <!--domain set to wildcard so datasources may be deployed independently on client. -->
-        <!--a better solution is to get the domain and server from the parent configuration -->
-        <attribute name="transactionContextManagerObjectName">*:name=TransactionContextManager,*</attribute>
-        <attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
-        <attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
-        <attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/server-corba/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-        <reference name="WebConfigBuilder">
-            <name>WebBuilder</name>
-        </reference>
-        <reference name="EJBConfigBuilder">
-            <name>EJBBuilder</name>
-        </reference>
-        <reference name="ConnectorConfigBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="AppClientConfigBuilder">
-            <name>AppClientBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
-        <reference name="EJBReferenceBuilder">
-            <name>ServerEJBReferenceBuilder</name>
-        </reference>
-    </gbean>
-
-    <!-- web switching builder -->
-    <gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
-        <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
-        <references name="ModuleBuilders">
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/jetty-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=JettyWebBuilder</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.maven:J2EEApplication=null,J2EEModule=${pom.groupId}/tomcat-deployer/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=ModuleBuilder,name=TomcatWebBuilder</gbean-name></pattern>
-        </references>
-     </gbean>
 
     <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/openejb/${pom.currentVersion}/car,${pom.groupId}/axis/${pom.currentVersion}/car</attribute>
         <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=${pom.groupId}/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
         <reference name="WebServiceLinkTemplate">
             <name>WebServiceEJBLinkTemplate</name>
         </reference>
         <reference name="WebServiceBuilder">
+            <module>*</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Repository">
@@ -78,57 +36,12 @@
         </reference>
     </gbean>
 
-    <gbean name="ConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="defaultMaxSize">10</attribute>
-        <attribute name="defaultMinSize">0</attribute>
-        <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
-        <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>
-    </gbean>
-
-    <gbean name="AppClientBuilder" class="org.apache.geronimo.client.builder.AppClientModuleBuilder">
-        <attribute name="defaultClientParentId">${pom.groupId}/client/${pom.currentVersion}/car</attribute>
-        <attribute name="defaultServerParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
-        <attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
-        <attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
-        <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=geronimo/client-corba/${pom.currentVersion}/car,J2EEServer=client,j2eeType=CORBABean,name=Server</attribute>
-        <reference name="EJBReferenceBuilder">
-            <name>ClientEJBReferenceBuilder</name>
-        </reference>
-        <reference name="ConnectorModuleBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
-        </reference>
-        <reference name="ServiceReferenceBuilder">
-            <name>WebServiceBuilder</name>
-        </reference>
-        <references name="Store">
-            <!-- todo replace with a store the Client Builder can write to -->
-            <pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
-        </references>
-        <reference name="Repository">
-            <gbean-name>*:name=Repository,*</gbean-name>
-        </reference>
-    </gbean>
 
     <gbean name="CSSAttributeBuilder" class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
     <gbean name="TSSAttributeBuilder" class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
-    <gbean name="LoginConfigurationBuilder" class="org.apache.geronimo.security.deployment.LoginConfigBuilder"/>
-    <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
-        <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
-    </gbean>
+
     <gbean name="ClientEJBReferenceBuilder" class="org.openejb.deployment.RemoteEJBReferenceBuilder"/>
     <gbean name="ServerEJBReferenceBuilder" class="org.openejb.deployment.OpenEJBReferenceBuilder"/>
-    <gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
     <gbean name="WebServiceEJBLinkTemplate" class="org.openejb.server.axis.WSContainerGBean"/>
 
 </configuration>

Copied: geronimo/trunk/configs/openejb/project.xml (from r366666, geronimo/trunk/configs/j2ee-server/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb/project.xml?p2=geronimo/trunk/configs/openejb/project.xml&p1=geronimo/trunk/configs/j2ee-server/project.xml&r1=366666&r2=366676&rev=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/openejb/project.xml Fri Jan  6 21:37:04 2006
@@ -21,8 +21,8 @@
 <project>
     <pomVersion>3</pomVersion>
     <extend>../../etc/project.xml</extend>
-    <id>j2ee-server</id>
-    <name>Server Configuration for the J2EE Server</name>
+    <id>openejb</id>
+    <name>openejb Configuration for the J2EE Server</name>
 
     <dependencies>
         <!-- dependency on deployer -->
@@ -41,14 +41,14 @@
         <!-- parent config -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>rmi-naming</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
                  <geronimo.import>true</geronimo.import>
              </properties>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${geronimo_version}</version>
@@ -187,10 +187,10 @@
                  <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
-
+-->
 
         <!-- TODO why are these here rather than in system-database??? -->
-        <dependency>
+<!--        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-derby</artifactId>
             <version>${pom.currentVersion}</version>
@@ -216,7 +216,7 @@
                  <geronimo.dependency>true</geronimo.dependency>
             </properties>
         </dependency>
-
+-->
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/trunk/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/openejb/src/plan/plan.xml?rev=366676&r1=366666&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/openejb/src/plan/plan.xml Fri Jan  6 21:37:04 2006
@@ -31,52 +31,6 @@
                configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
     >
 
-    <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
-        <attribute name="keepAliveTime">5000</attribute>
-        <attribute name="poolSize">300</attribute>
-        <attribute name="poolName">DefaultThreadPool</attribute>
-    </gbean>
-
-    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
-    </gbean>
-
-    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
-        <attribute name="syncMaximumPoolSize">10</attribute>
-        <attribute name="startMaximumPoolSize">10</attribute>
-        <attribute name="scheduledMaximumPoolSize">10</attribute>
-        <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
-    </gbean>
-
-    <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog">
-        <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
-        <attribute name="bufferSizeKBytes">32</attribute>
-        <attribute name="checksumEnabled">true</attribute>
-        <attribute name="flushSleepTimeMilliseconds">50</attribute>
-        <attribute name="logFileDir">var/txlog</attribute>
-        <attribute name="logFileExt">log</attribute>
-        <attribute name="logFileName">howl</attribute>
-        <attribute name="maxBlocksPerFile">-1</attribute>
-        <attribute name="maxBuffers">0</attribute>
-        <attribute name="maxLogFiles">2</attribute>
-        <attribute name="minBuffers">4</attribute>
-        <attribute name="threadsWaitingForceThreshold">-1</attribute>
-        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
-    </gbean>
-
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
-        <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
-        <reference name="TransactionLog"><name>HOWLTransactionLog</name></reference>
-        <references name="ResourceManagers">
-            <pattern><gbean-name>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
-            <pattern><gbean-name>geronimo.server:j2eeType=ActivationSpec,*</gbean-name></pattern>
-        </references>
-    </gbean>
-
-    <gbean name="TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="XidImporter"><name>TransactionManager</name></reference>
-    </gbean>
-
     <!-- EJB Protocol -->
     <gbean gbeanName="geronimo:type=NetworkService,name=EJB" class="org.activeio.xnet.StandardServiceStackGBean">
         <attribute name="name">EJB</attribute>
@@ -85,9 +39,13 @@
         <attribute name="allowHosts">${PlanClientAddresses}</attribute>
         <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
         <attribute name="logOnFailure">HOST,NAME</attribute>
-        <reference name="Executor"><name>DefaultThreadPool</name></reference>
+        <reference name="Executor">
+            <module>*</module>
+            <name>DefaultThreadPool</name>
+        </reference>
         <reference name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
     </gbean>
+
     <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
         <reference name="ContainerIndex">
             <gbean-name>openejb:type=ContainerIndex</gbean-name>
@@ -107,18 +65,7 @@
         </references>
     </gbean>
 
-    <!-- JSR77 Management Objects -->
-    <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
-    <gbean gbeanName="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
-    </gbean>
-
-    <gbean gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
-
-    <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
-
-    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=geronimo/j2ee-server/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
+    <gbean gbeanName="geronimo.server:J2EEApplication=null,EJBModule=geronimo/openejb/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=StatelessSessionBean,name=ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
 
-    <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
 
 </configuration>

Modified: geronimo/trunk/configs/remote-deploy-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-jetty/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/project.properties (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/remote-deploy-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/remote-deploy-tomcat/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/project.properties (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-remote-deploy-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/servlets-examples-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-jetty/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/project.properties (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-servlet-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/trunk/configs/servlets-examples-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/servlets-examples-tomcat/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/project.properties (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo-samples/wars/geronimo-servlet-examples-tomcat-${tomcat_examples_version}.war
 

Modified: geronimo/trunk/configs/system-database/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.properties (original)
+++ geronimo/trunk/configs/system-database/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
 

Modified: geronimo/trunk/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/project.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.xml (original)
+++ geronimo/trunk/configs/system-database/project.xml Fri Jan  6 21:37:04 2006
@@ -44,6 +44,18 @@
             <version>${geronimo_version}</version>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/src/plan/plan.xml Fri Jan  6 21:37:04 2006
@@ -24,11 +24,11 @@
     >
 
     <gbean name="TomcatWebBuilder" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
-        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car,${pom.groupId}/tomcat/${pom.currentVersion}/car</attribute>
+        <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car,${pom.groupId}/tomcat/${pom.currentVersion}/car,${pom.groupId}/axis/${pom.currentVersion}/car</attribute>
         <attribute name="defaultContextPriorityClassloader">false</attribute>
         <attribute name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
         <reference name="WebServiceBuilder">
-            <module>${pom.groupId}/j2ee-deployer/${pom.currentVersion}/car</module>
+            <module>*</module>
             <name>WebServiceBuilder</name>
         </reference>
         <reference name="Repository">

Modified: geronimo/trunk/configs/welcome-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.properties (original)
+++ geronimo/trunk/configs/welcome-jetty/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/welcome-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-tomcat/project.properties?rev=366676&r1=366675&r2=366676&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/project.properties (original)
+++ geronimo/trunk/configs/welcome-tomcat/project.properties Fri Jan  6 21:37:04 2006
@@ -21,7 +21,7 @@
 
 maven.multiproject.type=car
 
-geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
+geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car,geronimo/openejb-deployer/${geronimo_version}/car,geronimo/axis-deployer/${geronimo_version}/car
 
 geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-welcome-${geronimo_version}.war
 

Added: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java?rev=366676&view=auto
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java (added)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java Fri Jan  6 21:37:04 2006
@@ -0,0 +1,36 @@
+package org.apache.geronimo.j2ee.deployment;
+
+import org.apache.geronimo.common.DeploymentException;
+
+import java.io.File;
+import java.util.jar.JarFile;
+import java.net.URL;
+import java.net.URI;
+
+/**
+ */
+public class UnavailableModuleBuilder implements ModuleBuilder {
+    public Module createModule(File plan, JarFile moduleFile) throws DeploymentException {
+        throw new DeploymentException("Module type unavailable");
+    }
+
+    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, URI earConfigId, Object moduleContextInfo) throws DeploymentException {
+        throw new DeploymentException("Module type unavailable");
+    }
+
+    public void installModule(JarFile earFile, EARContext earContext, Module module) throws DeploymentException {
+        throw new DeploymentException("Module type unavailable");
+    }
+
+    public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
+        throw new DeploymentException("Module type unavailable");
+    }
+
+    public void addGBeans(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
+        throw new DeploymentException("Module type unavailable");
+    }
+
+    public String getSchemaNamespace() {
+        return null;
+    }
+}



Mime
View raw message