forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/lib/core servlet-2.3.jar
Date Tue, 21 Oct 2003 11:39:13 GMT
nicolaken    2003/10/21 04:39:13

  Modified:    .        build.xml
               src/core forrest.build.xml
  Added:       lib/optional README.txt
               tools/jetty jetty-4.2.8.jar org.apache.jasper.jar
               lib/core servlet-2.3.jar
  Removed:     lib/optional jetty-4.2.8.jar org.apache.jasper.jar
                        servlet-2.3.jar
  Log:
  Move Jetty to tools/jetty.
  In the shbat distro they are copied in /jetty
  
  Revision  Changes    Path
  1.90      +6 -0      xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- build.xml	21 Oct 2003 10:02:03 -0000	1.89
  +++ build.xml	21 Oct 2003 11:39:11 -0000	1.90
  @@ -259,6 +259,12 @@
         <fileset dir="lib/core" includes="resolver*.jar"/>
       </copy>
   
  +    <!-- Copy Jetty jars, so the shbat distribution is self-contained -->
  +    <mkdir dir="${dist-shbat.dir}/jetty" />
  +    <copy todir="${dist-shbat.dir}/jetty">
  +      <fileset dir="tools/jetty" />
  +    </copy>
  +    
       <!-- Fix bin/ permissions -->
       <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/bin" includes="*.bat"/>
       <fixcrlf eol="lf" srcdir="${dist-shbat.dir}/bin" excludes="*.bat"/>
  
  
  
  1.3       +8 -2      xml-forrest/src/core/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forrest.build.xml	20 Oct 2003 17:04:25 -0000	1.2
  +++ forrest.build.xml	21 Oct 2003 11:39:11 -0000	1.3
  @@ -301,7 +301,7 @@
         <pathelement location="${project.ctxt-dir}/WEB-INF/classes"/>
         <fileset dir="${project.ctxt-dir}/WEB-INF/lib" includes="*.jar"/>
         <pathelement location="${forrest.home}/context/WEB-INF/classes"/>
  -      <fileset dir="${forrest.home}/lib/optional" includes="servlet-2.3.jar"/>
  +      <fileset dir="${forrest.home}/jetty" includes="servlet-2.3.jar"/>
         <fileset dir="${forrest.home}/lib/endorsed" includes="*.jar"/>
         <fileset dir="${forrest.home}/context/WEB-INF/lib" includes="*.jar" />
         <pathelement location="${tools.jar}"/>
  @@ -1017,6 +1017,12 @@
             failonerror="yes">
          <classpath>
            <pathelement path="${env.CLASSPATH}" />
  +         <fileset dir="${forrest.home}/jetty">
  +           <include name="*.jar"/>
  +           <include name="*.JAR"/>
  +           <include name="*.zip"/>
  +           <include name="*.ZIP"/>
  +         </fileset>
            <fileset dir="${forrest.home}/lib/endorsed">
              <include name="*.jar"/>
              <include name="*.JAR"/>
  
  
  
  1.1                  xml-forrest/lib/optional/README.txt
  
  Index: README.txt
  ===================================================================
  Place jars that you want included in Forrest here.
  An example is that of the Jimi jar, to have images rendered in PDFs.
  
  
  
  1.1                  xml-forrest/tools/jetty/jetty-4.2.8.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/tools/jetty/org.apache.jasper.jar
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/lib/core/servlet-2.3.jar
  
  	<<Binary file>>
  
  

Mime
View raw message