geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r395765 - in /geronimo/branches/1.1: assemblies/j2ee-jetty-server/project.xml assemblies/j2ee-jetty-server/src/var/config/config.xml configs/j2ee-server/src/plan/plan.xml configs/openejb/src/plan/plan.xml configs/rmi-naming/src/plan/plan.xml
Date Fri, 21 Apr 2006 03:11:28 GMT
Author: djencks
Date: Thu Apr 20 20:11:26 2006
New Revision: 395765

URL: http://svn.apache.org/viewcvs?rev=395765&view=rev
Log:
re-enable openejb, use openejb config

Modified:
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
    geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
    geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/1.1/configs/openejb/src/plan/plan.xml
    geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml?rev=395765&r1=395764&r2=395765&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/project.xml Thu Apr 20 20:11:26 2006
@@ -89,6 +89,15 @@
                 <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>
@@ -196,6 +205,15 @@
         <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>

Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=395765&r1=395764&r2=395765&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Thu Apr 20
20:11:26 2006
@@ -17,10 +17,6 @@
         </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-security/${pom.currentVersion}/car">
         <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
@@ -34,6 +30,12 @@
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </configuration>
+    <configuration name="geronimo/openejb/${pom.currentVersion}/car">
+        <gbean name="EJBNetworkService">
+            <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>
@@ -88,6 +90,8 @@
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1</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>

Modified: geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml?rev=395765&r1=395764&r2=395765&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml Thu Apr 20 20:11:26 2006
@@ -109,46 +109,6 @@
         </reference>
     </gbean>
 
-    <!-- EJB Protocol -->
-    <gbean name="EJBNetworkService" 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">
-            <name>EJBServer</name>
-        </reference>
-    </gbean>
-
-    <gbean name="EJBServer" class="org.openejb.server.ejbd.EjbServerGBean">
-        <reference name="ContainerIndex">
-            <name>ContainerIndex</name>
-        </reference>
-        <reference name="ORBRefs">
-            <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 name="ContainerIndex" class="org.openejb.ContainerIndex">
-        <references name="EJBContainers">
-            <pattern>
-                <type>StatelessSessionBean</type>
-            </pattern>
-            <pattern>
-                <type>StatefulSessionBean</type>
-            </pattern>
-            <pattern>
-                <type>EntityBean</type>
-            </pattern>
-        </references>
-    </gbean>
-
     <!-- JSR77 Management Objects -->
     <gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
     <gbean name="geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
@@ -160,12 +120,6 @@
     <gbean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
 
     <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
-
-    <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB">
-        <reference name="MBeanServerReference">
-            <name>MBeanServerReference</name>
-        </reference>
-    </gbean>
 
     <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
 

Modified: geronimo/branches/1.1/configs/openejb/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb/src/plan/plan.xml?rev=395765&r1=395764&r2=395765&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/openejb/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/openejb/src/plan/plan.xml Thu Apr 20 20:11:26 2006
@@ -67,6 +67,10 @@
       </references>
   </gbean>
 
-  <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB"/>
+  <gbean name="ejb/mgmt/MEJB" class="org.openejb.mejb.MEJB">
+      <reference name="MBeanServerReference">
+          <name>MBeanServerReference</name>
+      </reference>
+  </gbean>
 
 </configuration>

Modified: geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml?rev=395765&r1=395764&r2=395765&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml Thu Apr 20 20:11:26 2006
@@ -25,9 +25,9 @@
 
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+        xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
 
-    >
+        >
 
     <gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
         <attribute name="port">${PlanNamingPort}</attribute>
@@ -61,9 +61,9 @@
 
     <!-- MBean server service -->
     <gbean name="MBeanServerKernelBridge" class="org.apache.geronimo.system.jmx.MBeanServerKernelBridge">
-      <reference name="MBeanServerReference">
-        <name>MBeanServerReference</name>
-      </reference>
+        <reference name="MBeanServerReference">
+            <name>MBeanServerReference</name>
+        </reference>
     </gbean>
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">



Mime
View raw message