Author: henning
Date: Sun Sep 17 04:30:50 2006
New Revision: 447047
URL: http://svn.apache.org/viewvc?view=rev&rev=447047
Log:
separate out test and build dependencies. Pack test dependencies into lib/test
for the distribution.
Add hsqldb as a test dependency for the DataSourceLoaderTestCase
Modified:
jakarta/velocity/engine/trunk/build/build.properties
jakarta/velocity/engine/trunk/build/build.xml
jakarta/velocity/engine/trunk/build/download.xml
Modified: jakarta/velocity/engine/trunk/build/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/build.properties?view=diff&rev=447047&r1=447046&r2=447047
==============================================================================
--- jakarta/velocity/engine/trunk/build/build.properties (original)
+++ jakarta/velocity/engine/trunk/build/build.properties Sun Sep 17 04:30:50
2006
@@ -40,6 +40,7 @@
build.src= ${build.dir}/src
build.lib= ${build.dir}/lib
build.test.src= ${build.dir}/test-src
+build.test.lib= ${build.dir}/test-lib
build.dest= ${build.dir}/classes
build.deps= ${build.dir}/deps
build.test.dest= ${build.dir}/test-classes
@@ -99,8 +100,10 @@
jar.commons-collections.version= 3.1
jar.commons-lang.version= 2.1
jar.jdom.version= 1.0
-jar.junit.version= 3.8.1
jar.log4j.version= 1.2.12
jar.oro.version= 2.0.8
jar.servletapi.version= 2.3
jar.werken-xpath.version= 0.9.4
+
+jar.hsqldb.version= 1.7.1
+jar.junit.version= 3.8.1
Modified: jakarta/velocity/engine/trunk/build/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/build.xml?view=diff&rev=447047&r1=447046&r2=447047
==============================================================================
--- jakarta/velocity/engine/trunk/build/build.xml (original)
+++ jakarta/velocity/engine/trunk/build/build.xml Sun Sep 17 04:30:50 2006
@@ -127,6 +127,7 @@
<fileset dir="${test.java.dir}">
<include name="**/*.java"/>
<exclude name="**/WrappedExceptionTestCase.java"/>
+ <exclude name="**/sql/*.java"/>
</fileset>
</copy>
</target>
@@ -144,6 +145,13 @@
</fileset>
</path>
+ <!-- Test classpath, contains dependencies needed only for Testing -->
+ <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"/>
@@ -176,6 +184,11 @@
<include name="**/DataSourceResourceLoader.java"/>
</fileset>
</copy>
+ <copy todir="${build.test.src}" filtering="yes">
+ <fileset dir="${test.java.dir}">
+ <include name="**/sql/*.java"/>
+ </fileset>
+ </copy>
</target>
<target name="check-jdbc-false" unless="jdbc.present">
@@ -260,6 +273,7 @@
<!-- Don't use the run classpath, build using the exploded class tree -->
<classpath>
<path refid="velocity.build.classpath"/>
+ <path refid="velocity.test.classpath" />
<pathelement location="${build.dest}"/>
</classpath>
</javac>
@@ -563,6 +577,10 @@
<fileset dir="${build.lib}" />
</copy>
+ <copy todir="${dist.dir}/lib/test">
+ <fileset dir="${build.test.lib}" />
+ </copy>
+
<copy todir="${dist.dir}/build">
<fileset dir="${velocity.dir}/build">
<include name="**"/>
@@ -774,6 +792,7 @@
<!-- Don't use the run classpath, test using the exploded class tree -->
<classpath>
<path refid="velocity.build.classpath" />
+ <path refid="velocity.test.classpath" />
<pathelement path="${build.dest}"/>
<pathelement path="${build.test.dest}"/>
</classpath>
Modified: jakarta/velocity/engine/trunk/build/download.xml
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/build/download.xml?view=diff&rev=447047&r1=447046&r2=447047
==============================================================================
--- jakarta/velocity/engine/trunk/build/download.xml (original)
+++ jakarta/velocity/engine/trunk/build/download.xml Sun Sep 17 04:30:50 2006
@@ -32,11 +32,14 @@
<antcall target="commons-collections-download" />
<antcall target="commons-lang-download" />
<antcall target="jdom-download" />
- <antcall target="junit-download" />
<antcall target="log4j-download" />
<antcall target="oro-download" />
<antcall target="servletapi-download" />
<antcall target="werken-xpath-download" />
+
+ <mkdir dir="${build.test.lib}" />
+ <antcall target="hsqldb-download" />
+ <antcall target="junit-download" />
</target>
<target name="http-download" unless="skip.jar.loading">
@@ -48,6 +51,15 @@
ignoreerrors="false" />
</target>
+ <target name="http-test-download" unless="skip.jar.loading">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+ <get
src="${repo.url}/${download.jarname}/jars/${download.jarname}-${download.jarversion}.jar"
+
dest="${build.test.lib}/${download.jarname}-${download.jarversion}.jar"
+ usetimestamp="true"
+ verbose="false"
+ ignoreerrors="false" />
+ </target>
+
<target name="antlr-download">
<property name="download.jarname" value="antlr" />
<property name="download.jarversion" value="${jar.antlr.version}" />
@@ -78,12 +90,6 @@
<antcall target="http-download"/>
</target>
- <target name="junit-download">
- <property name="download.jarname" value="junit" />
- <property name="download.jarversion" value="${jar.junit.version}" />
- <antcall target="http-download"/>
- </target>
-
<target name="log4j-download">
<property name="download.jarname" value="log4j" />
<property name="download.jarversion" value="${jar.log4j.version}" />
@@ -107,5 +113,20 @@
<property name="download.jarversion" value="${jar.werken-xpath.version}" />
<antcall target="http-download"/>
</target>
+
+<!-- Test Dependencies -->
+
+ <target name="junit-download">
+ <property name="download.jarname" value="junit" />
+ <property name="download.jarversion" value="${jar.junit.version}" />
+ <antcall target="http-test-download"/>
+ </target>
+
+ <target name="hsqldb-download">
+ <property name="download.jarname" value="hsqldb" />
+ <property name="download.jarversion" value="${jar.hsqldb.version}" />
+ <antcall target="http-test-download"/>
+ </target>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
