forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject cvs commit: xml-forrest/src/core forrest.build.xml forrest.antproxy.xml
Date Thu, 29 Jan 2004 15:23:39 GMT
cheche      2004/01/29 07:23:39

  Modified:    .        build.xml
               src/core forrest.build.xml forrest.antproxy.xml
  Log:
  Move ant & Jetty under tools on the build target
  
  Revision  Changes    Path
  1.101     +9 -16     xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- build.xml	25 Jan 2004 23:07:26 -0000	1.100
  +++ build.xml	29 Jan 2004 15:23:39 -0000	1.101
  @@ -55,7 +55,7 @@
           
       <path id="classpath">
         <fileset dir="lib" includes="**/*.jar"/>
  -      <fileset dir="tools/jetty" includes="servlet*.jar"/>
  +      <fileset dir="${tools.dir}/jetty" includes="servlet*.jar"/>
         <pathelement location="${tools.jar}"/>
       </path>
   
  @@ -203,7 +203,7 @@
       <echo message="validating stylesheets **/*.xsl ..."/>
       <jing rngfile="./src/core/context/resources/schema/relaxng/xslt.rng">
         <fileset dir="./src/core" includes="**/*.xsl"/>
  -      <fileset dir="./tools" includes="**/*.xsl"/>
  +      <fileset dir="${tools.dir}" includes="**/*.xsl"/>
       </jing>
       <!-- sitemap.xmap -->
       <echo message="validating **/sitemap.xmap ..."/>
  @@ -252,20 +252,13 @@
         <fileset dir="./lib" includes="*/*.*"/>
       </copy>
       
  -    <!-- Copy Ant jars, so the shbat distribution is self-contained -->
  -    <mkdir dir="${dist-shbat.dir}/ant" />
  -    <copy todir="${dist-shbat.dir}/ant">
  -      <fileset dir="tools/ant" />
  +    <!-- Copy all tools, so the shbat distribution is self-contained -->
  +    <copy todir="${dist-shbat.dir}/tools">
  +      <fileset dir="${tools.dir}" />
       </copy>
  -    <copy todir="${dist-shbat.dir}/ant/lib">
  +    <copy todir="${dist-shbat.dir}/tools/ant/lib">
         <fileset dir="lib/core" includes="xml-commons-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"/>
  @@ -273,9 +266,9 @@
       <chmod dir="${dist-shbat.dir}/bin" perm="ugo+rx" excludes="*.bat"/> 
   
       <!-- Fix ant/bin/ permissions -->
  -    <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/ant/bin" includes="*.bat"/>
  -    <fixcrlf eol="lf" srcdir="${dist-shbat.dir}/ant/bin" excludes="*.bat"/>
  -    <chmod dir="${dist-shbat.dir}/ant/bin" perm="ugo+rx" excludes="*.bat"/> 
  +    <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/tools/ant/bin" includes="*.bat"/>
  +    <fixcrlf eol="lf" srcdir="${dist-shbat.dir}/tools/ant/bin" excludes="*.bat"/>
  +    <chmod dir="${dist-shbat.dir}/tools/ant/bin" perm="ugo+rx" excludes="*.bat"/>

   
       <echo>
     *-----------------------------------------------------------------
  
  
  
  1.24      +2 -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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- forrest.build.xml	27 Jan 2004 11:57:41 -0000	1.23
  +++ forrest.build.xml	29 Jan 2004 15:23:39 -0000	1.24
  @@ -259,7 +259,7 @@
       <path id="forrest.cp">
            <pathelement path="${env.CLASSPATH}" />
            <pathelement location="${forrest.home}/context/WEB-INF/classes"/>
  -         <fileset dir="${forrest.home}/jetty">
  +         <fileset dir="${forrest.home}/tools/jetty">
              <include name="*.jar"/>
              <include name="*.JAR"/>
              <include name="*.zip"/>
  
  
  
  1.2       +1 -1      xml-forrest/src/core/forrest.antproxy.xml
  
  Index: forrest.antproxy.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/forrest.antproxy.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrest.antproxy.xml	20 Oct 2003 15:37:49 -0000	1.1
  +++ forrest.antproxy.xml	29 Jan 2004 15:23:39 -0000	1.2
  @@ -34,7 +34,7 @@
   
     <path id="forrest-classpath">
       <fileset dir="${forrest.home}">
  -      <include name="ant/lib/*.jar"/>
  +      <include name="tools/ant/lib/*.jar"/>
         <include name="lib/endorsed/*.jar"/>
       </fileset>
       <pathelement location="${java.home}/../lib/tools.jar"/>
  
  
  

Mime
View raw message