brett       2004/07/01 07:23:38

  Modified:    .        Tag: MAVEN-1_0-BRANCH build-bootstrap.xml
  Log:
  fix download locations
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.212.2.14 +11 -9     maven/build-bootstrap.xml
  
  Index: build-bootstrap.xml
  ===================================================================
  RCS file: /home/cvs/maven/build-bootstrap.xml,v
  retrieving revision 1.212.2.13
  retrieving revision 1.212.2.14
  diff -u -r1.212.2.13 -r1.212.2.14
  --- build-bootstrap.xml       1 Jul 2004 13:59:00 -0000       1.212.2.13
  +++ build-bootstrap.xml       1 Jul 2004 14:23:38 -0000       1.212.2.14
  @@ -74,6 +74,7 @@
         classname="org.apache.maven.BootstrapTask">
         <classpath>
           <path location="${maven.bootstrap.classes}"/>
  +        <path refid="bootstrap.libs"/>
         </classpath>
       </taskdef>
   
  @@ -345,9 +346,6 @@
       <mkdir dir="${maven.repo.local}/commons-lang/jars"/>
       <mkdir dir="${maven.repo.local}/commons-logging/jars"/>
       <mkdir dir="${maven.repo.local}/commons-httpclient/jars"/>
  -    <property name="cla-jar" value="commons-lang/jars/commons-lang-2.0.jar" />
  -    <property name="clo-jar" value="commons-logging/jars/commons-logging-1.0.3.jar" 
/>
  -    <property name="chc-jar" 
value="commons-httpclient/jars/commons-httpclient-2.0.jar" />
       <get ignoreerrors="true" usetimestamp="true" 
dest="${maven.repo.local}/${cla-jar}" src="${maven.get.jars.baseUrl}/${cla-jar}" />
       <get ignoreerrors="true" usetimestamp="true" 
dest="${maven.repo.local}/${clo-jar}" src="${maven.get.jars.baseUrl}/${clo-jar}" />
       <get ignoreerrors="true" usetimestamp="true" 
dest="${maven.repo.local}/${chc-jar}" src="${maven.get.jars.baseUrl}/${chc-jar}" />
  @@ -356,16 +354,11 @@
         destdir="${maven.bootstrap.classes}"
         debug="on"
         deprecation="off"
  -      optimize="off">
  +      optimize="off" classpathref="bootstrap.libs">
         <src path="src"/>
         <include name="bootstrap/**"/>
         <include name="java/**/HttpUtils*"/>
         <include name="java/**/Base64*"/>
  -      <classpath>
  -        <pathelement location="${maven.repo.local}/${cla-jar}" />
  -        <pathelement location="${maven.repo.local}/${clo-jar}" />
  -        <pathelement location="${maven.repo.local}/${chc-jar}" />
  -      </classpath>
       </javac>
   
     </target>
  @@ -406,6 +399,15 @@
       <!-- we default the local repo to write in the local home -->
       <!-- if we don't then -->
       <property name="maven.repo.local" location="${maven.home.local}/repository"/>
  +    <property name="cla-jar" value="commons-lang/jars/commons-lang-2.0.jar" />
  +    <property name="clo-jar" value="commons-logging/jars/commons-logging-1.0.3.jar" 
/>
  +    <property name="chc-jar" 
value="commons-httpclient/jars/commons-httpclient-2.0.jar" />
  +    <path id="bootstrap.libs">
  +      <pathelement location="${maven.repo.local}/${cla-jar}" />
  +      <pathelement location="${maven.repo.local}/${clo-jar}" />
  +      <pathelement location="${maven.repo.local}/${chc-jar}" />
  +    </path>
  +
     </target>
   
     <!-- doesn't mimic actual maven cause the properties files are loaded before -->
  
  
  

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

Reply via email to