You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2003/10/22 04:27:45 UTC

cvs commit: incubator-geronimo/modules/web/src/deploy/jetty jetty-service.xml

dain        2003/10/21 19:27:45

  Modified:    modules/common project.xml
               modules/core project.xml
               modules/core/src/conf boot-service.xml
               modules/kernel project.xml
               modules/twiddle project.xml
               modules/web project.xml
               modules/web/src/deploy/jetty jetty-service.xml
  Log:
  Cleaned up deployment for new class space implementation
  
  Revision  Changes    Path
  1.14      +6 -6      incubator-geronimo/modules/common/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/common/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml	8 Sep 2003 04:12:39 -0000	1.13
  +++ project.xml	22 Oct 2003 02:27:44 -0000	1.14
  @@ -79,7 +79,7 @@
               <version>1.0.3</version>
               <url>http://jakarta.apache.org/commons/logging</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -88,7 +88,7 @@
               <version>SNAPSHOT</version>
               <url>http://jakarta.apache.org/commons/lang</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -97,7 +97,7 @@
               <version>SNAPSHOT</version>
               <url>http://jakarta.apache.org/commons/collections</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -115,7 +115,7 @@
               <version>1.2.8</version>
               <url>http://jakarta.apache.org/log4j</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -125,7 +125,7 @@
               <version>SNAPSHOT</version>
               <url>http://mx4j.sourceforge.net</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  
  
  
  1.25      +10 -10    incubator-geronimo/modules/core/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- project.xml	29 Sep 2003 19:34:10 -0000	1.24
  +++ project.xml	22 Oct 2003 02:27:44 -0000	1.25
  @@ -149,7 +149,7 @@
               <version>1.0</version>
               <url>http://cglib.sf.net/</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -158,7 +158,7 @@
               <version>1.5</version>
               <url>http://jakarta.apache.org/commons/digester/</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -167,7 +167,7 @@
               <version>1.0.3</version>
               <url>http://jakarta.apache.org/commons/logging/</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -185,7 +185,7 @@
               <version>1.2.8</version>
               <url>http://jakarta.apache.org/log4j</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -194,7 +194,7 @@
               <version>2.0-beta1</version>
               <url>http://jakarta.apache.org/commons/httpclient/</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -218,7 +218,7 @@
               <id>mx4j</id>
               <version>SNAPSHOT</version>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -244,7 +244,7 @@
               <version>2.4.0</version>
               <url>http://xml.apache.org</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -252,7 +252,7 @@
               <id>xml-apis</id>
               <version>1.0.b2</version>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -278,7 +278,7 @@
               <version>SNAPSHOT</version>
               <url>http://jakarta.apache.org/commons/lang</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  
  
  
  1.16      +6 -6      incubator-geronimo/modules/core/src/conf/boot-service.xml
  
  Index: boot-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/conf/boot-service.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- boot-service.xml	1 Oct 2003 04:46:41 -0000	1.15
  +++ boot-service.xml	22 Oct 2003 02:27:45 -0000	1.16
  @@ -13,11 +13,11 @@
       <!-- Log4j Logging Service -->
       <!--
       <mbean code="org.apache.geronimo.core.logging.log4j.Log4jService" name="geronimo.core:role=Logging">
  -      <constructor>
  -        <arg type="java.net.URL">
  -          ${geronimo.home}/etc/log4j.xml
  -        </arg>
  -      </constructor>
  +        <constructor>
  +            <arg type="java.net.URL">
  +                ${geronimo.home}/etc/log4j.xml
  +            </arg>
  +        </constructor>
       </mbean>
       -->
   
  
  
  
  1.4       +21 -11    incubator-geronimo/modules/kernel/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	8 Sep 2003 04:54:12 -0000	1.3
  +++ project.xml	22 Oct 2003 02:27:45 -0000	1.4
  @@ -79,7 +79,8 @@
               <version>1.0</version>
               <url>http://cglib.sf.net/</url>
               <properties>
  -                <bootstrap>true</bootstrap>
  +                <runtime>true</runtime>
  +                <destinations>bootlib</destinations>
               </properties>
           </dependency>
   
  @@ -88,7 +89,8 @@
               <version>SNAPSHOT</version>
               <url>http://jakarta.apache.org/commons/collections</url>
               <properties>
  -                <bootstrap>true</bootstrap>
  +                <runtime>true</runtime>
  +                <destinations>bootlib</destinations>
               </properties>
           </dependency>
   
  @@ -97,7 +99,8 @@
               <version>1.0.3</version>
               <url>http://jakarta.apache.org/commons/logging/</url>
               <properties>
  -                <bootstrap>true</bootstrap>
  +                <runtime>true</runtime>
  +                <destinations>bootlib</destinations>
               </properties>
           </dependency>
   
  @@ -106,7 +109,8 @@
               <version>1.2.8</version>
               <url>http://jakarta.apache.org/log4j</url>
               <properties>
  -                <bootstrap>true</bootstrap>
  +                <runtime>true</runtime>
  +                <destinations>bootlib</destinations>
               </properties>
           </dependency>
   
  @@ -115,7 +119,8 @@
             <version>1.5</version>
             <url>http://jakarta.apache.org/commons/digester/</url>
             <properties>
  -              <bootstrap>true</bootstrap>
  +              <runtime>true</runtime>
  +              <destinations>bootlib</destinations>
             </properties>
           </dependency>
   
  @@ -124,7 +129,8 @@
               <version>2.0-beta1</version>
               <url>http://jakarta.apache.org/commons/httpclient/</url>
               <properties>
  -                <bootstrap>true</bootstrap>
  +                <runtime>true</runtime>
  +                <destinations>bootlib</destinations>
               </properties>
           </dependency>
   
  @@ -132,7 +138,8 @@
             <id>mx4j</id>
             <version>SNAPSHOT</version>
             <properties>
  -              <bootstrap>true</bootstrap>
  +              <runtime>true</runtime>
  +              <destinations>bootlib</destinations>
             </properties>
           </dependency>
   
  @@ -141,7 +148,8 @@
             <version>2.4.0</version>
             <url>http://xml.apache.org</url>
             <properties>
  -              <bootstrap>true</bootstrap>
  +              <runtime>true</runtime>
  +              <destinations>bootlib</destinations>
             </properties>
           </dependency>
   
  @@ -149,7 +157,8 @@
             <id>xml-apis</id>
             <version>1.0.b2</version>
             <properties>
  -              <bootstrap>true</bootstrap>
  +              <runtime>true</runtime>
  +              <destinations>bootlib</destinations>
             </properties>
           </dependency>
   
  @@ -158,7 +167,8 @@
             <version>SNAPSHOT</version>
             <url>http://jakarta.apache.org/commons/lang</url>
             <properties>
  -              <bootstrap>true</bootstrap>
  +              <runtime>true</runtime>
  +              <destinations>bootlib</destinations>
             </properties>
           </dependency>
   
  
  
  
  1.13      +6 -6      incubator-geronimo/modules/twiddle/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/twiddle/project.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- project.xml	3 Sep 2003 13:53:04 -0000	1.12
  +++ project.xml	22 Oct 2003 02:27:45 -0000	1.13
  @@ -74,7 +74,7 @@
         <version>2.4.0</version>
         <url>http://xml.apache.org</url>
         <properties>
  -        <runtime>true</runtime>
  +        <runtime>false</runtime>
         </properties>
       </dependency>
       
  @@ -91,7 +91,7 @@
         <version>1.2.8</version>
         <url>http://jakarta.apache.org/log4j</url>
         <properties>
  -        <runtime>true</runtime>
  +        <runtime>false</runtime>
         </properties>
       </dependency>
       
  @@ -109,7 +109,7 @@
         <version>SNAPSHOT</version>
         <url>http://jakarta.apache.org/commons/collections</url>
         <properties>
  -        <runtime>true</runtime>
  +        <runtime>false</runtime>
         </properties>
       </dependency>
       
  @@ -118,7 +118,7 @@
         <version>SNAPSHOT</version>
         <url>http://jakarta.apache.org/commons/lang</url>
         <properties>
  -        <runtime>true</runtime>
  +        <runtime>false</runtime>
         </properties>
       </dependency>
       
  @@ -127,7 +127,7 @@
         <version>1.0.3</version>
         <url>http://jakarta.apache.org/commons/logging</url>
         <properties>
  -        <runtime>true</runtime>
  +        <runtime>false</runtime>
         </properties>
       </dependency>
       
  
  
  
  1.8       +6 -6      incubator-geronimo/modules/web/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	14 Sep 2003 12:29:44 -0000	1.7
  +++ project.xml	22 Oct 2003 02:27:45 -0000	1.8
  @@ -131,7 +131,7 @@
               <version>1.0.3</version>
               <url>http://jakarta.apache.org/commons/logging/</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -140,7 +140,7 @@
               <version>2.0-beta1</version>
               <url>http://jakarta.apache.org/commons/httpclient/</url>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -148,7 +148,7 @@
               <id>log4j</id>
               <version>1.2.8</version>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -156,7 +156,7 @@
               <id>concurrent</id>
               <version>1.3.2</version>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  @@ -205,7 +205,7 @@
               <id>mx4j</id>
               <version>SNAPSHOT</version>
               <properties>
  -                <runtime>true</runtime>
  +                <runtime>false</runtime>
               </properties>
           </dependency>
   
  
  
  
  1.3       +2 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jetty-service.xml	6 Sep 2003 14:31:31 -0000	1.2
  +++ jetty-service.xml	22 Oct 2003 02:27:45 -0000	1.3
  @@ -1,6 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <components>
  -    <class-space name="geronimo.system:role=ClassSpace,name=Jetty">
  +    <class-space name="geronimo.system:role=ClassSpace,name=Jetty"
  +        create="true" parent="geronimo.system:role=ClassSpace,name=System">
           <codebase url="file:lib/">
               <archive name="*"/>
           </codebase>