You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/06/14 16:44:34 UTC
cvs commit: ws-axis/c/build build.Linux.properties build.OS400.properties build.SunOS.properties build.Win32.properties executeTest.xml testInitialize.xml
dicka 2005/06/14 07:44:34
Modified: c/build build.Linux.properties build.OS400.properties
build.SunOS.properties build.Win32.properties
executeTest.xml testInitialize.xml
Log:
Resolve issues in the framework currently causing problems with SSL tests.
PR: AXISCPP-692
Submitted by: Adrian Dick
Revision Changes Path
1.27 +1 -1 ws-axis/c/build/build.Linux.properties
Index: build.Linux.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.Linux.properties,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.Linux.properties 10 Jun 2005 12:44:54 -0000 1.26
+++ build.Linux.properties 14 Jun 2005 14:44:34 -0000 1.27
@@ -268,7 +268,7 @@
# Details of server to be used for testing clients
testHost = localhost
-test.port = 8080
+testPort = 8080
monitorPort = 13260
# details of HTTP proxy for any proxy tests
1.22 +1 -1 ws-axis/c/build/build.OS400.properties
Index: build.OS400.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.OS400.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.OS400.properties 10 Jun 2005 12:44:54 -0000 1.21
+++ build.OS400.properties 14 Jun 2005 14:44:34 -0000 1.22
@@ -267,7 +267,7 @@
# Details of server to be used for testing clients
testHost = localhost
-test.port = 9080
+testPort = 9080
monitorPort = 13260
# details of HTTP proxy for any proxy tests
1.22 +1 -1 ws-axis/c/build/build.SunOS.properties
Index: build.SunOS.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.SunOS.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.SunOS.properties 10 Jun 2005 12:44:54 -0000 1.21
+++ build.SunOS.properties 14 Jun 2005 14:44:34 -0000 1.22
@@ -268,7 +268,7 @@
# Details of server to be used for testing clients
testHost = localhost
-test.port = 9080
+testPort = 9080
monitorPort = 13260
# details of HTTP proxy for any proxy tests
1.23 +1 -1 ws-axis/c/build/build.Win32.properties
Index: build.Win32.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.Win32.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.Win32.properties 14 Jun 2005 04:02:19 -0000 1.22
+++ build.Win32.properties 14 Jun 2005 14:44:34 -0000 1.23
@@ -267,7 +267,7 @@
# Details of server to be used for testing clients
testHost = localhost
-test.port = 9080
+testPort = 9080
monitorPort = 13260
1.31 +7 -7 ws-axis/c/build/executeTest.xml
Index: executeTest.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/executeTest.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- executeTest.xml 13 Jun 2005 09:32:25 -0000 1.30
+++ executeTest.xml 14 Jun 2005 14:44:34 -0000 1.31
@@ -91,7 +91,7 @@
regexp="/(.*)" select="\1" />
<property name="clientArgs"
- value="${protocol}://${testHost}:${test.port}/${context}" />
+ value="${protocol}://${testHost}:${testPort}/${context}" />
</target>
<target name="setProxyArgs">
<if>
@@ -104,7 +104,7 @@
<target name="setVerbatim" if="test.verbatim">
<property name="clientArgs"
- value="${testHost} ${test.port} ${test.endpoint}" />
+ value="${testHost} ${testPort} ${test.endpoint}" />
</target>
<target name="checkIfEndpointSet" depends="setVerbatim">
@@ -128,12 +128,12 @@
</if>
<echo
- message="Starting monitor forwarding to ${actualTestHost}:${test.port}" />
+ message="Starting monitor forwarding to ${actualTestHost}:${testPort}" />
<!-- Run Monitor utility to allow validation of message across the wire -->
<java classname="org.apache.test.TCPMonitor"
outputproperty="mon.out">
<arg line="-l ${monitorPort}" />
- <arg line="-p ${test.port}" />
+ <arg line="-p ${testPort}" />
<arg line="-h ${actualTestHost}" />
<arg line="-o "${test.directory}/tcpm.req"" />
<arg line="-r "${test.directory}/tcpm.res"" />
@@ -147,10 +147,10 @@
<target name="startMockServer">
<echo message="Starting mockserver" />
- <echo message = "testport = ${test.port}"/>
+ <echo message = "testport = ${testPort}"/>
<java classname="org.apache.test.MockServer"
outputproperty="mockServer.out">
- <arg line="-p ${test.port}" />
+ <arg line="-p ${testPort}" />
<arg line="-r "${response_expected.file}"" />
<classpath>
<pathelement
@@ -174,7 +174,7 @@
<target name="stopMockServer">
<java classname="org.apache.test.StopMockServer" outputproperty="stopMockServer.out">
-<!-- <arg line="-p ${test.port}" /> -->
+<!-- <arg line="-p ${testPort}" /> -->
<arg line="-p 9081" />
<classpath>
<pathelement
1.8 +2 -3 ws-axis/c/build/testInitialize.xml
Index: testInitialize.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/testInitialize.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testInitialize.xml 8 Jun 2005 15:52:07 -0000 1.7
+++ testInitialize.xml 14 Jun 2005 14:44:34 -0000 1.8
@@ -30,7 +30,7 @@
<!--
Load the xml properties file for test and derive required properties
-->
- <target name="setPropertiesForTest" depends="loadXMLProperties,setHandlersPresent"/>
+ <target name="setPropertiesForTest" depends="loadXMLProperties,setHandlersPresent, setTestPort"/>
<!--,setTestName,setTestDesc,setTestCode,setClientLang,setTestWsdl,setTestEndpoint,setTestExpected,setTestExpectedRequest,setHandlerDirectory,setHandlerService,setTestPort,setTestExpectedServerResponse"/> -->
<target name="loadXMLProperties">
@@ -70,11 +70,10 @@
</target>
<target name="setHandlerService" if="test.handler.service">
<propertycopy property="serviceName" from="test.handler.service"/>
- </target>
+ </target> -->
<target name="setTestPort" if="test.port">
<propertycopy property="testPort" from="test.port" override="true"/>
</target>
- -->
<!--
Only set HandlersPresent if all info available
-->