From 813085c72e9906a53bec5954bcce7305a7c320d1 Mon Sep 17 00:00:00 2001

From: Stanislav Ochotnicky <sochotnicky@redhat.com>

Date: Mon, 21 Feb 2011 17:58:39 +0100

Subject: [PATCH 3/3] Use system jars

---

 build/build.xml     |   56 +++++++++++----------------------------------------

 build/testcases.xml |    6 -----

 2 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/build/build.xml b/build/build.xml

index c667553..479ef2d 100644

--- a/build/build.xml

+++ b/build/build.xml

@@ -140,28 +140,6 @@

-  <target name="build-prepare">

-    <ant antfile="${velocity.build.dir}/download.xml" target="build-download" />

-

-    

-    <path id="velocity.build.classpath">

-      <fileset dir="${build.lib}">

-        <include name="**/*.jar"/>

-      </fileset>

-    </path>

-

-    

-    <path id="velocity.test.classpath">

-      <fileset dir="${build.test.lib}">

-        <include name="**/*.jar"/>

-      </fileset>

-    </path>

-

-    <path id="velocity.run.classpath">

-      <path refid="velocity.build.classpath"/>

-      <pathelement location="${build.dir}/${final.name}.jar"/>

-    </path>

-  </target>

@@ -174,12 +152,11 @@

   <target name="prepare-jdbc" depends="check-jdbc,check-jdbc-true,check-jdbc-false"/>

   <target name="prepare-jdk14" depends="check-jdk14,check-jdk14-true,check-jdk14-false"/>

-  <target name="check-jdbc" depends="build-prepare">

+  <target name="check-jdbc">

                property="jdbc.present">

-      <classpath refid="velocity.build.classpath"/>

     </available>

   </target>

@@ -210,10 +187,9 @@

     </echo>

   </target>

-  <target name="check-jdk14" depends="build-prepare">

+  <target name="check-jdk14">

                property="jdk14.present">

-      <classpath refid="velocity.build.classpath"/>

     </available>

   </target>

@@ -248,7 +224,7 @@

   <target name="compile" depends="compile-src,compile-test"/>

-  

+  

           description="Compiles the Velocity source">

       destdir="${build.dest}"

@@ -257,8 +233,7 @@

       target="${javac.target}"

       source="${javac.source}"

       deprecation="${deprecation}"

-      optimize="${optimize}"

-      classpathref="velocity.build.classpath"/>

+      optimize="${optimize}"/>

     <copy todir="${build.dest}" filtering="yes">

       <fileset dir="${src.java.dir}">

@@ -268,7 +243,7 @@

   </target>

-  

+  

           description="Compiles the Velocity test classes">

       destdir="${build.test.dest}"

@@ -279,8 +254,6 @@

       <classpath>

-        <path refid="velocity.build.classpath"/>

-        <path refid="velocity.test.classpath" />

         <pathelement location="${build.dest}"/>

       </classpath>

     </javac>

@@ -561,7 +534,7 @@

-  

+  

           description="Compiles the Velocity Example code">

     <echo>

@@ -585,8 +558,7 @@

       encoding="UTF-8"

       debug="${debug}"

       deprecation="${deprecation}"

-      optimize="${optimize}"

-      classpathref="velocity.run.classpath"/>

+      optimize="${optimize}"/>

   </target>

   <target name="examples-clean" depends="examples-clean-anakia">

@@ -604,7 +576,7 @@

-  

+  

           description="Creates the Javadoc API documentation">

     <mkdir dir="${build.javadoc}"/>

@@ -620,8 +592,7 @@

              doctitle="${name} ${version} API"

              encoding="UTF-8"

              docencoding="UTF-8"

-             bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved."

-             classpathref="velocity.build.classpath">

+             bottom="Copyright © 2000-${build.year} <a href="http://www.apache.org/">Apache Software Foundation</a>. All Rights Reserved.">

       <link href="${javadocs.ref.jsdk}"/>

       <link href="http://www.jdom.org/docs/apidocs"/>

@@ -1024,12 +995,11 @@

-  

+  

           description="Generates the Velocity HTML documentation">

-             classname="org.apache.velocity.anakia.AnakiaTask"

-             classpathref="velocity.run.classpath"/>

+             classname="org.apache.velocity.anakia.AnakiaTask"/>

     <echo>

   #######################################################

@@ -1231,7 +1201,7 @@

-  

+  

           description="Run the Velocity testcases">

@@ -1264,8 +1234,6 @@

       <classpath>

-        <path refid="velocity.build.classpath" />

-        <path refid="velocity.test.classpath" />

         <pathelement path="${build.dest}"/>

         <pathelement path="${build.test.dest}"/>

       </classpath>

diff --git a/build/testcases.xml b/build/testcases.xml

index 06bb36e..f3749bc 100644

--- a/build/testcases.xml

+++ b/build/testcases.xml

@@ -36,12 +36,6 @@

   <path id="velocity.test.classpath">

-    <fileset dir="${build.lib}">

-      <include name="**/*.jar"/>

-    </fileset>

-    <fileset dir="${build.test.lib}">

-      <include name="**/*.jar"/>

-    </fileset>

     <pathelement location="${build.dest}"/>

     <pathelement location="${build.test.dest}"/>

   </path>

-- 

1.7.4