rwaldhoff 01/08/02 09:27:21 Modified: httpclient build.properties.sample build.xml Log: refactored logging so that log4j is no longer a runtime depedency updates to documentation to come Revision Changes Path 1.4 +4 -1 jakarta-commons/httpclient/build.properties.sample Index: build.properties.sample =================================================================== RCS file: /home/cvs/jakarta-commons/httpclient/build.properties.sample,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.properties.sample 2001/07/27 22:54:08 1.3 +++ build.properties.sample 2001/08/02 16:27:21 1.4 @@ -7,4 +7,7 @@ # jsse.jar - JSSE classes (see http://java.sun.com/products/jsse) jnet.jar=/java/jsse/lib/jnet.jar # log4j.jar - log4j classes (see http://jakarta.apache.org/log4j) -log4j.jar=/java/log4j/log4j.jar \ No newline at end of file +log4j.jar=/java/log4j/log4j.jar + +# httpclient.log - log writer to use +httpclient.log=org.apache.commons.httpclient.log.SimpleLog \ No newline at end of file 1.6 +15 -35 jakarta-commons/httpclient/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons/httpclient/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.xml 2001/07/27 22:54:08 1.5 +++ build.xml 2001/08/02 16:27:21 1.6 @@ -3,7 +3,7 @@ <!-- "HTTP Client" component of the Jakarta Commons Subproject - $Id: build.xml,v 1.5 2001/07/27 22:54:08 rwaldhoff Exp $ + $Id: build.xml,v 1.6 2001/08/02 16:27:21 rwaldhoff Exp $ --> @@ -103,9 +103,12 @@ <property name="test-external.entry" value="org.apache.commons.httpclient.TestAllExternal"/> <!-- HTTPS protocol handler, needed for HTTPS unit tests --> - <property name="java.protocol.handler.pkgs" value="-Djava.protocol.handler.pkgs=com.sun.net.ssl.internal.www.protocol"/> + <property name="java.protocol.handler.pkgs" value="com.sun.net.ssl.internal.www.protocol"/> + <!-- log type to use --> + <property name="httpclient.log" value="org.apache.commons.httpclient.log.NoOpLog"/> + <!-- ========== Executable Targets ======================================== --> @@ -133,6 +136,7 @@ <tstamp/> <copy todir="${build.home}/conf" filtering="on"> <fileset dir="${conf.home}" includes="*.MF"/> + <fileset dir="${conf.home}" includes="*.properties"/> </copy> </target> @@ -218,17 +222,9 @@ <target name="test" depends="compile.tests" if="test.entry" description="Run all unit test cases"> - <!-- - <junit printsummary="yes" fork="on" haltonfailure="yes"> - <formatter type="plain" usefile="false"/> - <test name="${test.entry}"/> - <classpath refid="test.classpath"/> - </junit> - --> - - <java classname="${test.runner}" fork="yes" - failonerror="${test.failonerror}"> - <jvmarg value="${java.protocol.handler.pkgs}"/> + <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}"> + <jvmarg value="-Djava.protocol.handler.pkgs=${java.protocol.handler.pkgs}"/> + <jvmarg value="-Dhttpclient.log=${httpclient.log}"/> <arg value="${test.entry}"/> <classpath refid="test.classpath"/> </java> @@ -236,17 +232,9 @@ <target name="test-local" depends="compile.tests" if="test-local.entry" description="Run all local unit test cases"> - <!-- - <junit printsummary="yes" fork="on" haltonfailure="yes"> - <formatter type="plain" usefile="false"/> - <test name="${test-local.entry}"/> - <classpath refid="test.classpath"/> - </junit> - --> - - <java classname="${test.runner}" fork="yes" - failonerror="${test.failonerror}"> - <jvmarg value="${java.protocol.handler.pkgs}"/> + <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}"> + <jvmarg value="-Djava.protocol.handler.pkgs=${java.protocol.handler.pkgs}"/> + <jvmarg value="-Dhttpclient.log=${httpclient.log}"/> <arg value="${test-local.entry}"/> <classpath refid="test.classpath"/> </java> @@ -254,17 +242,9 @@ <target name="test-external" depends="compile.tests" if="test-external.entry" description="Run all external unit test cases"> - <!-- - <junit printsummary="yes" fork="on" haltonfailure="yes"> - <formatter type="plain" usefile="false"/> - <test name="${test-external.entry}"/> - <classpath refid="test.classpath"/> - </junit> - --> - - <java classname="${test.runner}" fork="yes" - failonerror="${test.failonerror}"> - <jvmarg value="${java.protocol.handler.pkgs}"/> + <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}"> + <jvmarg value="-Djava.protocol.handler.pkgs=${java.protocol.handler.pkgs}"/> + <jvmarg value="-Dhttpclient.log=${httpclient.log}"/> <arg value="${test-external.entry}"/> <classpath refid="test.classpath"/> </java>
