geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r155042 - geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
Date Wed, 23 Feb 2005 18:14:51 GMT
Author: djencks
Date: Wed Feb 23 10:14:50 2005
New Revision: 155042

URL: http://svn.apache.org/viewcvs?view=rev&rev=155042
Log:
use jetty for invoking ws

Modified:
    geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?view=diff&r1=155041&r2=155042
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Wed Feb 23 10:14:50 2005
@@ -216,6 +216,7 @@
 
     <gbean namePart="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
 <!--        <reference name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>-->
         <reference name="Repository">*:name=Repository,*</reference>
     </gbean>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?view=diff&r1=155041&r2=155042
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Wed Feb 23 10:14:50
2005
@@ -156,11 +156,11 @@
 
     <gbean namePart="AxisPOJOTemplate" class="org.apache.geronimo.jetty.JettyAxisPOJOWebService">
         <attribute name="servletName">dummy</attribute>
-
     </gbean>
 
     <gbean namePart="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
         <!--        <reference name="SkeletonGenerator">openejb.CORBA:type=SkeletonGenerator,vendor=OpenORB</reference>-->
         <reference name="Repository">*:name=Repository,*</reference>
     </gbean>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?view=diff&r1=155041&r2=155042
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Wed Feb 23 10:14:50 2005
@@ -210,7 +210,8 @@
 
 
     <!-- default WAR container using Jetty -->
-    <gbean namePart="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl"/>
+    <gbean namePart="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
+    </gbean>
 
     <gbean namePart="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
         <reference name="JettyContainer">geronimo.server:name=JettyWebContainer,*</reference>
@@ -252,27 +253,7 @@
     </gbean>
 
 
-    <!-- HTTP/SOAP Protocol -->
-    <gbean name="openejb:type=NetworkService,name=HTTPSOAP" class="org.openejb.server.StandardServiceStackGBean">
-        <attribute name="name">HTTPSOAP</attribute>
-        <attribute name="port">8000</attribute>
-        <attribute name="address">127.0.0.1</attribute>
-        <attribute name="allowHosts">127.0.0.1</attribute>
-        <attribute name="priority">5</attribute>
-        <attribute name="threads">5</attribute>
-        <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
-        <attribute name="logOnFailure">HOST,NAME</attribute>
-        <reference name="Server">openejb:type=Server,name=HTTPSOAP</reference>
-    </gbean>
-    <gbean name="openejb:type=Server,name=HTTPSOAP" class="org.openejb.server.httpd.HttpServerGBean">
-        <reference name="Listener">openejb:type=SoapHttpListener</reference>
-    </gbean>
-    <gbean name="openejb:type=SoapHttpListener" class="org.openejb.server.xfire.SoapHttpListenerGBean">
-        <reference name="WSContainerIndex">openejb:type=WSContainerIndex</reference>
-    </gbean>
-    <gbean name="openejb:type=WSContainerIndex" class="org.openejb.server.xfire.WSContainerIndexGBean">
-        <reference name="WSContainers">openejb:type=WSContainer,*</reference>
-    </gbean>
+    <!-- HTTP/SOAP Protocol is now run through jetty-->
 
     <!-- JSR77 Management Objects -->
     <gbean name="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>



Mime
View raw message