Author: markt
Date: Thu Nov 12 14:26:44 2015
New Revision: 1714053
URL: http://svn.apache.org/viewvc?rev=1714053&view=rev
Log:
Add EasyMock to 7.0.x for the unit tests
Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1714053&r1=1714052&r2=1714053&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Nov 12 14:26:44 2015
@@ -197,6 +197,24 @@ hamcrest.home=${base.path}/hamcrest-${ha
hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar
+# ----- EasyMock, version 3.2 or later -----
+easymock.version=3.2
+easymock.home=${base.path}/easymock-${easymock.version}
+easymock.loc=${base-sf.loc}/easymock/easymock-${easymock.version}.zip
+easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
+
+# ----- cglib, used by EasyMock, version 2.2 or later -----
+cglib.version=2.2.3
+cglib.home=${base.path}/cglib-${cglib.version}
+cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
+cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
+
+# ----- objenesis, used by EasyMock, version 1.2 or later -----
+objenesis.version=1.2
+objenesis.home=${base.path}/objenesis-${objenesis.version}
+objenesis.loc=https://objenesis.googlecode.com/files/objenesis-${objenesis.version}-bin.zip
+objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
+
# ----- Checkstyle, version 6.0 or later -----
checkstyle.version=6.1.1
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1714053&r1=1714052&r2=1714053&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Nov 12 14:26:44 2015
@@ -202,6 +202,9 @@
<pathelement location="${test.classes}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${hamcrest.jar}"/>
+ <pathelement location="${easymock.jar}"/>
+ <pathelement location="${cglib.jar}"/>
+ <pathelement location="${objenesis.jar}"/>
<path refid="compile.classpath" />
<path refid="tomcat.classpath" />
</path>
@@ -2713,6 +2716,24 @@ Apache Tomcat ${version} native binaries
<param name="destdir" value="${hamcrest.home}"/>
</antcall>
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${easymock.loc}"/>
+ <param name="destfile" value="${easymock.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${cglib.loc}"/>
+ <param name="destfile" value="${cglib.jar}"/>
+ <param name="destdir" value="${cglib.home}"/>
+ </antcall>
+
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${objenesis.loc}"/>
+ <param name="destfile" value="${objenesis.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+
</target>
<target name="download-cobertura"
Modified: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1714053&r1=1714052&r2=1714053&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Thu Nov 12
14:26:44 2015
@@ -26,5 +26,6 @@
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/wsdl4j-1.6.2/wsdl4j-1.6.2.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.4.2/ecj-4.4.2.jar"/>
+ <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
