geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r416483 - in /geronimo/branches/dain/openejb-2.2-merge: configs/activemq/ configs/client-corba/ configs/console-jetty/ configs/j2ee-deployer/src/plan/ configs/openejb-deployer/ configs/openejb/src/plan/ configs/system-database/ modules/j2ee...
Date Thu, 22 Jun 2006 22:05:26 GMT
Author: dain
Date: Thu Jun 22 15:05:26 2006
New Revision: 416483

URL: http://svn.apache.org/viewvc?rev=416483&view=rev
Log:
Server now builds but doesn't start

Modified:
    geronimo/branches/dain/openejb-2.2-merge/configs/activemq/project.xml
    geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/project.xml
    geronimo/branches/dain/openejb-2.2-merge/configs/console-jetty/project.xml
    geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/project.xml
    geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml
    geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml
    geronimo/branches/dain/openejb-2.2-merge/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java

Modified: geronimo/branches/dain/openejb-2.2-merge/configs/activemq/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/activemq/project.xml?rev=416483&r1=416482&r2=416483&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/activemq/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/activemq/project.xml Thu Jun 22 15:05:26
2006
@@ -34,47 +34,11 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>1</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <packaging.config.order>2</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>3</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>axis-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>4</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>5</packaging.config.order>
+                <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
 

Modified: geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/project.xml?rev=416483&r1=416482&r2=416483&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/client-corba/project.xml Thu Jun 22 15:05:26
2006
@@ -41,33 +41,6 @@
                 <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>2</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>3</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>axis-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>4</packaging.config.order>
-            </properties>
-        </dependency>
 
         <!-- parent config -->
         <dependency>

Modified: geronimo/branches/dain/openejb-2.2-merge/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/console-jetty/project.xml?rev=416483&r1=416482&r2=416483&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/console-jetty/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/console-jetty/project.xml Thu Jun 22
15:05:26 2006
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>openejb-deployer</artifactId>
+            <artifactId>axis-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
@@ -70,7 +70,7 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>axis-deployer</artifactId>
+            <artifactId>openejb-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>

Modified: geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/src/plan/plan.xml?rev=416483&r1=416482&r2=416483&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/j2ee-deployer/src/plan/plan.xml Thu Jun
22 15:05:26 2006
@@ -22,6 +22,7 @@
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
         <!--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 module -->
+        <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
         <attribute name="transactionContextManagerAbstractName">?name=TransactionContextManager</attribute>
         <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
         <attribute name="transactionalTimerAbstractName">?name=TransactionalThreadPooledTimer</attribute>

Modified: geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/project.xml?rev=416483&r1=416482&r2=416483&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/openejb-deployer/project.xml Thu Jun
22 15:05:26 2006
@@ -39,7 +39,7 @@
                 <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
-        
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml?rev=416483&r1=416482&r2=416483&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/openejb/src/plan/plan.xml Thu Jun 22
15:05:26 2006
@@ -135,7 +135,7 @@
 
   <!-- pattern domain name must match the domain of the j2eeServer attribute of the EAR
builder in the deployer plan -->
   <gbean name="DeploymentIndex" class="org.openejb.DeploymentIndexGBean">
-      <references name="EJBContainers">
+      <references name="EjbDeployments">
           <pattern>
               <type>StatelessSessionBean</type>
           </pattern>
@@ -148,7 +148,7 @@
       </references>
   </gbean>
 
-  <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB">
+  <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJBGBean">
       <reference name="MBeanServerReference">
           <name>MBeanServerReference</name>
       </reference>

Modified: geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml?rev=416483&r1=416482&r2=416483&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml (original)
+++ geronimo/branches/dain/openejb-2.2-merge/configs/system-database/project.xml Thu Jun 22
15:05:26 2006
@@ -34,29 +34,11 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>1</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
             <properties>
-                <packaging.config.order>2</packaging.config.order>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${geronimo_version}</version>
-            <type>car</type>
-            <properties>
-                <packaging.config.order>3</packaging.config.order>
+                <packaging.config.order>1</packaging.config.order>
             </properties>
         </dependency>
 

Modified: geronimo/branches/dain/openejb-2.2-merge/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/openejb-2.2-merge/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=416483&r1=416482&r2=416483&view=diff
==============================================================================
--- geronimo/branches/dain/openejb-2.2-merge/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/branches/dain/openejb-2.2-merge/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Thu Jun 22 15:05:26 2006
@@ -121,7 +121,7 @@
     private final Naming naming;
 
     public EARConfigBuilder(Environment defaultEnvironment,
-            AbstractNameQuery transactionManagerObjectName,
+            AbstractNameQuery transactionManagerAbstractName,
             AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
@@ -138,7 +138,7 @@
             Collection serviceReferenceBuilder,
             Kernel kernel) {
         this(defaultEnvironment,
-                transactionManagerObjectName,
+                transactionManagerAbstractName,
                 transactionContextManagerAbstractName,
                 connectionTrackerAbstractName,
                 transactionalTimerAbstractName,
@@ -157,7 +157,7 @@
                 kernel.getNaming());
     }
     public EARConfigBuilder(Environment defaultEnvironment,
-            AbstractNameQuery transactionManagerObjectName,
+            AbstractNameQuery transactionManagerAbstractName,
             AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
@@ -174,7 +174,7 @@
             ServiceReferenceBuilder serviceReferenceBuilder,
             Naming naming) {
         this(defaultEnvironment,
-                transactionManagerObjectName,
+                transactionManagerAbstractName,
                 transactionContextManagerAbstractName,
                 connectionTrackerAbstractName,
                 transactionalTimerAbstractName,
@@ -194,7 +194,7 @@
     }
 
     private EARConfigBuilder(Environment defaultEnvironment,
-            AbstractNameQuery transactionManagerObjectName,
+            AbstractNameQuery transactionManagerAbstractName,
             AbstractNameQuery transactionContextManagerAbstractName,
             AbstractNameQuery connectionTrackerAbstractName,
             AbstractNameQuery transactionalTimerAbstractName,
@@ -222,7 +222,7 @@
         this.connectorConfigBuilder = connectorConfigBuilder;
         this.appClientConfigBuilder = appClientConfigBuilder;
         this.serviceReferenceBuilder = serviceReferenceBuilder;
-        this.transactionManagerObjectName = transactionManagerObjectName;
+        this.transactionManagerObjectName = transactionManagerAbstractName;
         this.transactionContextManagerObjectName = transactionContextManagerAbstractName;
         this.connectionTrackerObjectName = connectionTrackerAbstractName;
         this.transactionalTimerObjectName = transactionalTimerAbstractName;
@@ -920,7 +920,7 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(EARConfigBuilder.class,
NameFactory.CONFIG_BUILDER);
         infoFactory.addAttribute("defaultEnvironment", Environment.class, true, true);
-        infoFactory.addAttribute("transactionManagerObjectName", AbstractNameQuery.class,
true);
+        infoFactory.addAttribute("transactionManagerAbstractName", AbstractNameQuery.class,
true);
         infoFactory.addAttribute("transactionContextManagerAbstractName", AbstractNameQuery.class,
true);
         infoFactory.addAttribute("connectionTrackerAbstractName", AbstractNameQuery.class,
true);
         infoFactory.addAttribute("transactionalTimerAbstractName", AbstractNameQuery.class,
true);
@@ -943,7 +943,7 @@
 
         infoFactory.setConstructor(new String[]{
                 "defaultEnvironment",
-                "transactionManagerObjectName",
+                "transactionManagerAbstractName",
                 "transactionContextManagerAbstractName",
                 "connectionTrackerAbstractName",
                 "transactionalTimerAbstractName",



Mime
View raw message