geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/web/src/deploy/jetty jetty-config.xml jetty-service.xml
Date Mon, 17 Nov 2003 00:04:58 GMT
dain        2003/11/16 16:04:57

  Modified:    modules/web/src/deploy/jetty jetty-config.xml
                        jetty-service.xml
  Log:
  Fixed formatting and set parrent class space
  
  Revision  Changes    Path
  1.7       +11 -0     incubator-geronimo/modules/web/src/deploy/jetty/jetty-config.xml
  
  Index: jetty-config.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/deploy/jetty/jetty-config.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jetty-config.xml	24 Oct 2003 22:54:52 -0000	1.6
  +++ jetty-config.xml	17 Nov 2003 00:04:57 -0000	1.7
  @@ -91,4 +91,15 @@
             <Arg type="boolean">true</Arg>
           </Call>
       </Call>
  +    <Call name="addWebApplication">
  +        <Arg></Arg>
  +        <Arg>elba</Arg>
  +        <Arg><SystemProperty name="jetty.home.dir"/>/elba-web-console.war</Arg>
  +        <Call name="setDefaultsDescriptor">
  +          <Arg><SystemProperty name="jetty.home.dir"/>/webdefault.xml</Arg>
  +        </Call>
  +        <Call name="setExtractWAR">
  +          <Arg type="boolean">true</Arg>
  +        </Call>
  +    </Call>
   </Configure>
  
  
  
  1.7       +12 -11    incubator-geronimo/modules/web/src/deploy/jetty/jetty-service.xml
  
  Index: jetty-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/deploy/jetty/jetty-service.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- jetty-service.xml	14 Nov 2003 16:27:34 -0000	1.6
  +++ jetty-service.xml	17 Nov 2003 00:04:57 -0000	1.7
  @@ -5,26 +5,27 @@
       <!-- ================================================================ -->
       <!-- Set up the Jetty-specific jars                                   -->
       <!-- ================================================================ -->
  -    <class-space name="geronimo.system:role=ClassSpace,name=Jetty">
  +    <class-space name="geronimo.system:role=ClassSpace,name=Jetty"
  +        parent="geronimo.system:role=ClassSpace,name=System">
           <codebase url="file:lib/">
               <archive name="*"/>
           </codebase>
  -	<codebase url="file:../../lib/">
  -	    <archive name="geronimo-core-DEV.jar"/>
  -	    <archive name="geronimo-common-DEV.jar"/>
  -	</codebase>
  +        <codebase url="file:../../lib/">
  +            <archive name="geronimo-core-DEV.jar"/>
  +            <archive name="geronimo-common-DEV.jar"/>
  +        </codebase>
       </class-space>
   
       <!-- ================================================================ -->
       <!-- Set up a Jetty container                                         -->
       <!-- ================================================================ -->
       <mbean code="org.apache.geronimo.web.jetty.JettyWebContainer"
  -           name="jetty:role=WebContainer">
  -       <attribute type="java.net.URI" name="DefaultWebXmlURI">webdefault.xml</attribute>
  +        name="jetty:role=WebContainer">
  +        <attribute type="java.net.URI" name="DefaultWebXmlURI">webdefault.xml</attribute>
       </mbean>
  -<!-- planner that delegates to the mbean above -->
  +    <!-- planner that delegates to the mbean above -->
       <mbean descriptor="org.apache.geronimo.web.WebDeploymentPlanner"
  -           name="geronimo.deployment:role=DeploymentPlanner,type=Jetty">
  +        name="geronimo.deployment:role=DeploymentPlanner,type=Jetty">
       </mbean>
   
   
  @@ -32,9 +33,9 @@
       <!-- Set up a connector to listen for http requests                   -->
       <!-- ================================================================ -->
       <mbean code="org.apache.geronimo.web.jetty.JettyWebConnector"
  -           name="jetty:role=WebConnector, port=8080">
  +        name="jetty:role=WebConnector, port=8080">
           <attribute name="Port">8080</attribute>
  -	<attribute name="Contexts">/abc, /def, /geh</attribute>
  +        <attribute name="Contexts">/abc, /def, /geh</attribute>
           <depends name="jetty:role=WebContainer"/>
       </mbean>
   </components>
  
  
  

Mime
View raw message