geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cvs commit: incubator-geronimo/modules/web/src/deploy/jetty jetty-service.xml
Date Thu, 06 Nov 2003 13:13:12 GMT
janb        2003/11/06 05:13:11

  Modified:    modules/web project.xml
               modules/web/src/deploy/jetty jetty-service.xml
  Removed:     modules/web/src dev-jetty-service.xml
  Log:
  Removing the "hack" Jetty setup and changing to "official" integration.
  
  Revision  Changes    Path
  1.9       +2 -2      incubator-geronimo/modules/web/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	22 Oct 2003 02:27:45 -0000	1.8
  +++ project.xml	6 Nov 2003 13:13:11 -0000	1.9
  @@ -219,7 +219,7 @@
   
           <dependency>
               <id>jetty</id>
  -            <version>4.2.12</version>
  +            <version>SNAPSHOT</version>
               <properties>
                   <runtime>true</runtime>
                   <destinations>
  
  
  
  1.4       +27 -6     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jetty-service.xml	22 Oct 2003 02:27:45 -0000	1.3
  +++ jetty-service.xml	6 Nov 2003 13:13:11 -0000	1.4
  @@ -1,15 +1,36 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <components>
  -    <class-space name="geronimo.system:role=ClassSpace,name=Jetty"
  -        create="true" parent="geronimo.system:role=ClassSpace,name=System">
  +
  +
  +    <!-- ================================================================ -->
  +    <!-- Set up the Jetty-specific jars                                   -->
  +    <!-- ================================================================ -->
  +    <class-space name="geronimo.system:role=ClassSpace,name=Jetty">
           <codebase url="file:lib/">
               <archive name="*"/>
           </codebase>
  +	<codebase url="file:../../lib/">
  +	    <archive name="geronimo-core-DEV.jar"/>
  +	    <archive name="geronimo-common-DEV.jar"/>
  +	</codebase>
       </class-space>
   
  -    <mbean code="org.apache.geronimo.web.hack.Jetty" name="jetty:role=WebContainer">
  -        <constructor>
  -            <arg type="java.net.URL">./jetty-config.xml</arg>
  -        </constructor>
  +    <!-- ================================================================ -->
  +    <!-- 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>
  +    </mbean>
  +
  +
  +    <!-- ================================================================ -->
  +    <!-- Set up a connector to listen for http requests                   -->
  +    <!-- ================================================================ -->
  +    <mbean code="org.apache.geronimo.web.jetty.JettyWebConnector" 
  +           name="jetty:role=WebConnector, port=8080">
  +        <attribute name="Port">8088</attribute>
  +	<attribute name="Contexts">/abc, /def, /geh</attribute>
  +        <depends name="jetty:role=WebContainer"/>
       </mbean>
   </components>
  
  
  

Mime
View raw message