dims 2002/06/04 08:44:19
Modified: java axis.properties build.xml
java/test build_functional_tests.xml
Log:
Support for proxy settings when running functional tests.
Revision Changes Path
1.6 +9 -0 xml-axis/java/axis.properties
Index: axis.properties
===================================================================
RCS file: /home/cvs/xml-axis/java/axis.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- axis.properties 19 Mar 2002 15:42:01 -0000 1.5
+++ axis.properties 4 Jun 2002 15:44:19 -0000 1.6
@@ -37,3 +37,12 @@
dist.dir=axis-1_0
test.functional.usefile=true
+
+# To enable the use of proxy settings Replace XXXXX
+# with your environment information and remove the '#'
+# at the beginning of each line below.
+#http.proxyHost=XXXXX
+#http.proxyPort=XXXXX
+#http.nonProxyHosts=localhost
+#http.proxyUser=XXXXX
+#http.proxyPassword=XXXX
1.141 +8 -1 xml-axis/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/build.xml,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- build.xml 3 Jun 2002 17:57:00 -0000 1.140
+++ build.xml 4 Jun 2002 15:44:19 -0000 1.141
@@ -108,7 +108,14 @@
<property name="tools.jar" location="${java.home}/../lib/tools.jar"/>
<property name="axis.lib.dir" location="lib"/>
-
+
+ <!-- Place Holder for proxy settings -->
+ <property name="http.proxyHost" value=""/>
+ <property name="http.proxyPort" value=""/>
+ <property name="http.nonProxyHosts" value=""/>
+ <property name="http.proxyUser" value=""/>
+ <property name="http.proxyPassword" value=""/>
+
<!-- =================================================================== -->
<!-- Determine what dependencies are present -->
<!-- =================================================================== -->
1.43 +0 -2 xml-axis/java/test/build_functional_tests.xml
Index: build_functional_tests.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/test/build_functional_tests.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build_functional_tests.xml 4 Jun 2002 12:46:56 -0000 1.42
+++ build_functional_tests.xml 4 Jun 2002 15:44:19 -0000 1.43
@@ -93,13 +93,11 @@
<!-- now, run the actual test -->
<junit dir="." printsummary="yes" haltonfailure="${test.functional.fail}"
fork="yes">
<!-- Pass through the proxy parameters -->
- <!--
<jvmarg value="-Dhttp.proxyHost=${http.proxyHost}"/>
<jvmarg value="-Dhttp.proxyPort=${http.proxyPort}"/>
<jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}"/>
<jvmarg value="-Dhttp.proxyUser=${http.proxyUser}"/>
<jvmarg value="-Dhttp.proxyPassword=${http.proxyPassword}"/>
- -->
<classpath refid="test-classpath" />
<formatter type="xml" usefile="${test.functional.usefile}"/>
<batchtest todir="${test.functional.reportdir}">
