Skip to content

Commit 7adf23d

Browse files
author
Sasha Ovsankin
committed
maven tasks were giving too much trouble, so for now:
1. got rid of maven tasks 2. checked in all the dependencies
1 parent 18384d8 commit 7adf23d

10 files changed

+19
-33
lines changed

build.properties

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ lib-ext=./lib-ext/
1919
#Note this may not be necessary in tomcat-6 in which case this should be left blank
2020
#lib-ext=
2121

22+
# Test dependencies not present in runtime
23+
lib-test=./lib-test/
24+
2225
# The location of the webapp folder.
2326
webapp=webapps/jsonrpc
2427

@@ -56,6 +59,6 @@ app-jar=${build}/${app-prefix}.jar
5659
app-war=${app-prefix}.war
5760

5861
# Location where the test war is to be installed
59-
#installpath=/Tomcat/Tomcat4.1.31/webapps
62+
installpath=C:/Program Files/Apache Software Foundation/Tomcat 5.5
6063
#installpath=/var/lib/tomcat-6/webapps
6164
#installpath=/opt/apache-tomcat-6.0.14/webapps

build.xml

+15-32
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<mkdir dir="${build}" />
5353
</target>
5454

55-
<target name="compile" depends="init,init-build, copy-dependencies" description="Compiles the source into the build directory">
55+
<target name="compile" depends="init,init-build" description="Compiles the source into the build directory">
5656
<mkdir dir="${build.classes}"/>
5757
<javac debug="true" source="1.4" srcdir="${src}" destdir="${build.classes}">
5858
<classpath refid="default-classpath" />
@@ -66,39 +66,21 @@
6666
<target name="test.init" depends="init" description="Makes directories needed for the test jsps">
6767
<tstamp />
6868
<mkdir dir="${test.lib}" />
69-
<mkdir dir="${test.classes}" />
69+
<mkdir dir="${test.classes}" />
70+
<path id="test-classpath">
71+
<fileset dir="${lib-test}">
72+
<include name="*.jar"/>
73+
</fileset>
74+
</path>
7075
</target>
7176

72-
<target name="setup-dependencies">
73-
<path id="maven-ant-tasks.classpath" path="lib-ant/maven-ant-tasks-2.0.7.jar" />
74-
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
75-
uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
76-
<artifact:pom id="maven.project" file="pom.xml" />
77-
</target>
78-
79-
<target name="check-dependencies" depends="init"
80-
description="Check if the dependencies present in ${lib-ext}">
81-
<!-- In order to re-generate the ${lib-ext} directory, delete the {lib-ext}/dependencies file -->
82-
<available file="${lib-ext}/dependencies" type="file" property="dependencies.present"/>
83-
</target>
84-
85-
<target name="copy-dependencies" depends="init,setup-dependencies,check-dependencies"
86-
unless="dependencies.present"
87-
description="Download and copy test dependencies to the ${lib-ext} directory (only once)">
88-
<artifact:dependencies filesetId="dependencies.fileset" pathId="dependencies.path">
89-
<pom refid="maven.project"/>
90-
</artifact:dependencies>
91-
<!-- <delete dir="${lib-ext}" includes="*"/> -->
92-
<copy todir="${lib-ext}" flatten="true">
93-
<fileset refid="dependencies.fileset"/>
94-
</copy>
95-
<pathconvert refid="dependencies.path" property="dependencies.string"/>
96-
<echo file="${lib-ext}/dependencies"> ${dependencies.string} </echo>
97-
</target>
98-
99-
<target name="compile.test" depends="test.init, dist, init, copy-dependencies" description="Compiles the testing classes">
77+
78+
<target name="compile.test" depends="test.init, dist, init" description="Compiles the testing classes">
10079
<javac debug="true" source="1.4" srcdir="${test.src}" destdir="${test.classes}">
101-
<classpath refid="jarClasspath" />
80+
<classpath>
81+
<path refid="jarClasspath" />
82+
<path refid="test-classpath" />
83+
</classpath>
10284
</javac>
10385
</target>
10486

@@ -110,7 +92,8 @@
11092
<path refid="default-classpath"/>
11193
<pathelement location="${build.classes}"/>
11294
<pathelement location="${test.classes}"/>
113-
</classpath>
95+
<path refid="test-classpath" />
96+
</classpath>
11497
<formatter type="plain"/>
11598
<batchtest fork="yes" todir="${test.reports}">
11699
<fileset dir="${test.classes}">

lib-ext/commons-codec-1.2.jar

29.4 KB
Binary file not shown.

lib-ext/commons-httpclient-3.1.jar

298 KB
Binary file not shown.

lib-ext/servlet-api.jar

76.2 KB
Binary file not shown.

lib-test/jcl104-over-slf4j-1.4.2.jar

15.1 KB
Binary file not shown.

lib-test/jetty-6.1.6.jar

482 KB
Binary file not shown.

lib-test/jetty-util-6.1.6.jar

140 KB
Binary file not shown.

lib-test/junit-3.8.2.jar

118 KB
Binary file not shown.

lib-test/servlet-api-2.5-6.1.6.jar

129 KB
Binary file not shown.

0 commit comments

Comments
 (0)