You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ch...@apache.org on 2003/09/06 16:31:31 UTC

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

chirino     2003/09/06 07:31:31

  Modified:    .        maven.xml
               modules/web/src/deploy/jetty jetty-service.xml
  Log:
  Fixes so that maven run:main start geronimo up without errors.
  
  Revision  Changes    Path
  1.36      +1 -3      incubator-geronimo/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/maven.xml,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- maven.xml	6 Sep 2003 11:04:52 -0000	1.35
  +++ maven.xml	6 Sep 2003 14:31:31 -0000	1.36
  @@ -522,7 +522,6 @@
             <pathelement path="${run.dir}/etc"/>
             <fileset dir="${run.dir}/lib">
               <include name="*.jar"/>
  -            <exclude name="xerces-2.4.0.jar"/>
             </fileset>
           </classpath>
   
  @@ -547,7 +546,6 @@
             <pathelement path="${run.dir}/etc"/>
             <fileset dir="${run.dir}/lib">
               <include name="*.jar"/>
  -            <exclude name="xerces-2.4.0.jar"/>
             </fileset>              
           </classpath>
   
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jetty-service.xml	5 Sep 2003 21:21:00 -0000	1.1
  +++ jetty-service.xml	6 Sep 2003 14:31:31 -0000	1.2
  @@ -8,7 +8,7 @@
   
       <mbean code="org.apache.geronimo.web.hack.Jetty" name="jetty:role=WebContainer">
           <constructor>
  -            <arg type="java.net.URL">${geronimo.home}/etc/jetty-config.xml</arg>
  +            <arg type="java.net.URL">./jetty-config.xml</arg>
           </constructor>
       </mbean>
  -</components>
  \ No newline at end of file
  +</components>