geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r219794 - in /geronimo/trunk/modules/assembly/src/plan: jetty-deployer-config.xml jetty-runtime-deployer-config.xml
Date Tue, 19 Jul 2005 22:47:15 GMT
Author: djencks
Date: Tue Jul 19 15:47:14 2005
New Revision: 219794

URL: http://svn.apache.org/viewcvs?rev=219794&view=rev
Log:
add back missing pojo ws deployment

Modified:
    geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml
    geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml

Modified: geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml?rev=219794&r1=219793&r2=219794&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-deployer-config.xml Tue Jul 19 15:47:14
2005
@@ -17,51 +17,67 @@
 
 <!-- $Rev: 216115 $ $Date: 2005-07-12 23:22:18 -0600 (Tue, 12 Jul 2005) $ -->
 
-    <dependency>
-        <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
-    </dependency>
-    <dependency>
-        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
-    </dependency>
-
-    <gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
-        <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
-        <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
-        <attribute name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
-        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
-
-    <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
-        <attribute name="servletName">default</attribute>
-        <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
-        <attribute name="loadOnStartup">0</attribute>
-        <attribute name="initParams">
+<dependency>
+    <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
+</dependency>
+<dependency>
+    <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
+</dependency>
+
+<dependency>
+     <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
+</dependency>
+
+
+<gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+    <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+    <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
+    <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
+    <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
+    <attribute name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
+    <attribute name="pojoWebServiceTemplate">geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=deployer,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</attribute>
+    <reference name="WebServiceBuilder">
+        <name>WebServiceBuilder</name>
+    </reference>
+    <reference name="Repository">
+        <gbean-name>*:name=Repository,*</gbean-name>
+    </reference>
+</gbean>
+
+<gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
+    <attribute name="servletName">default</attribute>
+    <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
+    <attribute name="loadOnStartup">0</attribute>
+    <attribute name="initParams">
  acceptRanges=true
  dirAllowed=true
  putAllowed=false
  delAllowed=false
  redirectWelcome=false
  minGzipLength=8192</attribute>
-        <attribute name="servletMappings">/</attribute>
-    </gbean>
+    <attribute name="servletMappings">/</attribute>
+</gbean>
 
-    <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
-        <attribute name="servletName">jsp</attribute>
-        <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
-        <attribute name="loadOnStartup">0</attribute>
-        <attribute name="initParams">
+<gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
+    <attribute name="servletName">jsp</attribute>
+    <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
+    <attribute name="loadOnStartup">0</attribute>
+    <attribute name="initParams">
  logVerbosityLevel=DEBUG
  fork=false
  xpoweredBy=false</attribute>
-        <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
-    </gbean>
+    <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
+</gbean>
+
+<gbean name="POJOTemplate" class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder">
+    <attribute name="servletName">dummy</attribute>
+</gbean>
 
-    <gbean name="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="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
+<gbean name="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="Repository">
+        <gbean-name>*:name=Repository,*</gbean-name>
+    </reference>
+</gbean>
 

Modified: geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml?rev=219794&r1=219793&r2=219794&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/jetty-runtime-deployer-config.xml Tue Jul 19
15:47:14 2005
@@ -24,15 +24,16 @@
         <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
     </dependency>
 
-    <gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
-        <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
-        <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
-        <attribute name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
-        <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>
+<gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
+    <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
+    <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
+    <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
+    <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
+    <attribute name="defaultServlets">geronimo.server:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</attribute>
+    <attribute name="pojoWebServiceTemplate">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/RuntimeDeployer,J2EEServer=geronimo,j2eeType=ServletWebServiceTemplate,name=POJOTemplate</attribute>
+    <reference name="WebServiceBuilder"><name>WebServiceBuilder</name></reference>
+    <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+</gbean>
 
     <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
         <attribute name="servletName">default</attribute>



Mime
View raw message