olegk       2004/09/06 11:02:38

  Modified:    httpclient Tag: HTTPCLIENT_2_0_BRANCH maven.xml
  Log:
  Fixed compatibility problem with Maven 1.0
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.3   +22 -22    jakarta-commons/httpclient/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/httpclient/maven.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- maven.xml 24 Apr 2004 14:31:06 -0000      1.1.2.2
  +++ maven.xml 6 Sep 2004 18:02:38 -0000       1.1.2.3
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   <!-- Author: Jeff Dever -->
   
  -<project>
  +<project xmlns:ant="jelly:ant">
   
     <!-- 
       Builds the HttpClient distribution.  Ensures that the site docs are included 
  @@ -13,7 +13,7 @@
   
       <echo>[HttpClient] dist:prepare-bin-filesystem postGoal</echo>
   
  -    <copy todir="${maven.dist.bin.assembly.dir}/docs">
  +    <ant:copy todir="${maven.dist.bin.assembly.dir}/docs">
         <fileset dir="./docs">
           <include name="*.txt"/>
           <include name="*.html"/>
  @@ -21,21 +21,21 @@
         <fileset dir="target/docs">
           <include name="**/*"/>
         </fileset>
  -    </copy>
  +    </ant:copy>
   
  -   <copy file="release_notes.txt" 
tofile="${maven.dist.bin.assembly.dir}/RELEASE_NOTES.txt" />
  +   <ant:copy file="release_notes.txt" 
tofile="${maven.dist.bin.assembly.dir}/RELEASE_NOTES.txt" />
       
  -   <fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" encoding="ISO-8859-1"
  +   <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" 
encoding="ISO-8859-1"
          includes="**/*.xml **/*.properties **/*.html **/*.css" />
   
  -   <fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="crlf" encoding="ISO-8859-1"
  +   <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="crlf" 
encoding="ISO-8859-1"
          includes="**/*.txt" />
   
  -   <copy file="LICENSE.txt" tofile="${maven.dist.bin.assembly.dir}/LICENSE" />
  -   <copy file="README.txt" tofile="${maven.dist.bin.assembly.dir}/README" />
  -   <copy file="release_notes.txt" 
tofile="${maven.dist.bin.assembly.dir}/RELEASE_NOTES" />
  +   <ant:copy file="LICENSE.txt" tofile="${maven.dist.bin.assembly.dir}/LICENSE" />
  +   <ant:copy file="README.txt" tofile="${maven.dist.bin.assembly.dir}/README" />
  +   <ant:copy file="release_notes.txt" 
tofile="${maven.dist.bin.assembly.dir}/RELEASE_NOTES" />
   
  -   <fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" encoding="ISO-8859-1"
  +   <ant:fixcrlf srcdir="${maven.dist.bin.assembly.dir}" eol="lf" 
encoding="ISO-8859-1"
          includes="LICENSE README RELEASE_NOTES" />
   
     </postGoal>
  @@ -44,13 +44,13 @@
   
       <echo>[HttpClient] dist:prepare-src-filesystem postGoal</echo>
   
  -    <copy todir="${maven.dist.src.assembly.dir}">
  +    <ant:copy todir="${maven.dist.src.assembly.dir}">
         <fileset dir=".">
           <include name="build.properties.sample"/>
         </fileset>
  -    </copy>
  +    </ant:copy>
   
  -    <copy todir="${maven.dist.src.assembly.dir}/docs">
  +    <ant:copy todir="${maven.dist.src.assembly.dir}/docs">
         <fileset dir="./docs">
           <include name="*.txt"/>
           <include name="*.html"/>
  @@ -58,25 +58,25 @@
         <fileset dir="target/docs">
           <include name="**/*"/>
         </fileset>
  -    </copy>
  +    </ant:copy>
   
  -   <copy file="release_notes.txt" 
tofile="${maven.dist.src.assembly.dir}/RELEASE_NOTES.txt" />
  +   <ant:copy file="release_notes.txt" 
tofile="${maven.dist.src.assembly.dir}/RELEASE_NOTES.txt" />
   
  -   <fixcrlf srcdir="${maven.dist.src.assembly.dir}" javafiles="true" 
  +   <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" javafiles="true" 
          eol="lf" tab="remove" tablength="4" encoding="ISO-8859-1"
          includes="**/*.java" />
     
  -   <fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" encoding="ISO-8859-1"
  +   <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" 
encoding="ISO-8859-1"
          includes="**/*.xml **/*.properties **/*.html **/*.css" />
   
  -   <fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="crlf" encoding="ISO-8859-1"
  +   <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="crlf" 
encoding="ISO-8859-1"
          includes="**/*.txt" />
   
  -   <copy file="LICENSE.txt" tofile="${maven.dist.src.assembly.dir}/LICENSE" />
  -   <copy file="README.txt" tofile="${maven.dist.src.assembly.dir}/README" />
  -   <copy file="release_notes.txt" 
tofile="${maven.dist.src.assembly.dir}/RELEASE_NOTES" />
  +   <ant:copy file="LICENSE.txt" tofile="${maven.dist.src.assembly.dir}/LICENSE" />
  +   <ant:copy file="README.txt" tofile="${maven.dist.src.assembly.dir}/README" />
  +   <ant:copy file="release_notes.txt" 
tofile="${maven.dist.src.assembly.dir}/RELEASE_NOTES" />
   
  -   <fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" encoding="ISO-8859-1"
  +   <ant:fixcrlf srcdir="${maven.dist.src.assembly.dir}" eol="lf" 
encoding="ISO-8859-1"
          includes="LICENSE README RELEASE_NOTES" />
   
     </postGoal>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to