axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject cvs commit: ws-axis/c test.xml
Date Fri, 22 Oct 2004 14:52:58 GMT
perryan     2004/10/22 07:52:58

  Modified:    c        test.xml
  test.xml updated to use the specified endpoint if it is present in the test.endpoints properties
file, otherwise it will use the default test endpoint. If the endpoint specified in the test.endpoints
file is the string useSpecifiedServerPort, then the string -p ${testPort} -s ${testHost} will
be passed to the client, with the values having been substituted of course.
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  Revision  Changes    Path
  1.16      +22 -6     ws-axis/c/test.xml
  Index: test.xml
  RCS file: /home/cvs/ws-axis/c/test.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- test.xml	20 Oct 2004 15:19:00 -0000	1.15
  +++ test.xml	22 Oct 2004 14:52:58 -0000	1.16
  @@ -660,25 +660,41 @@
   		<property file="${test.endpoints}"/>
  -	<target name="setTestProperties" depends="setEPName,setURI,setEP"/>
  +	<target name="setTestProperties" depends="setEPName,useDefaultEndpoint,setURI,setEP"/>
   	<target name="setEPName">
   		<property name="EPName" value="${testName}EP"/>
  -	<target name="setURI" if="${EPName}">
  +	<!-- If there is no entry in the test.endpoints file do not set any program args -->
  +	<target name="useDefaultEndpoint" unless="${EPName}">
  +		<property name="clientArgs" value=""/>
  +	</target>
  +	<!-- Check to see if the entry in test.endpoints is UseSpecifiedServerPort.
  +	     If so then pass -p ${monitorPort} -s localhost args, otherwise read
  +		  the endpoint from the file -->
  +	<target name="setURI" unless="clientArgs">
   		<propertycopy property="EP" from="${EPName}"/>
  +		<condition property="emptyEP">
  +			<equals arg1="${EP}" arg2="UseSpecifiedServerPort" trim="true"/>
  +		</condition>
  +	<!-- Check to see if the entry in test.endpoints is UseSpecifiedServerPort.
  +	     If so then pass -p ${testPort} -s ${testHost} args, otherwise read
  +		  the endpoint from the file -->
   	<target name="setEP">
   		<condition property="clientArgs" value="-p ${monitorPort} -s localhost">
  -			<not>
  -				<isset property="EP"/>
  -			</not>
  +			<isset property="emptyEP"/>
   		<condition property="endpoint" value="http://localhost:${monitorPort}/${EP}">
  -			<isset property="EP"/>
  +			<not>
  +				<isset property="emptyEP"/>
  +			</not>
   		<condition property="clientArgs" value="${endpoint}">
   			<isset property="endpoint"/>

View raw message