ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hawk...@apache.org
Subject cvs commit: ws-axis/c build.AIX.properties build.Linux.properties build.Win32.properties test.xml
Date Tue, 07 Sep 2004 13:42:00 GMT
hawkeye     2004/09/07 06:42:00

  Modified:    c        build.AIX.properties build.Linux.properties
                        build.Win32.properties test.xml
  Log:
  Allow monitor port to be configurable within ANT test scripts
  (also updating property files, to more closely match the existing makefile behaviour)
  
  Submitted by: Adrian Dick
  
  Revision  Changes    Path
  1.2       +16 -16    ws-axis/c/build.AIX.properties
  
  Index: build.AIX.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.AIX.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.AIX.properties	6 Sep 2004 16:31:11 -0000	1.1
  +++ build.AIX.properties	7 Sep 2004 13:42:00 -0000	1.2
  @@ -14,47 +14,46 @@
   #		xmlParserLibrary = expat
   
   # Parser to be used
  -xmlParser = xerces
  +xmlParser = expat
   
   # Name of parser library to link against
  -xmlParserLibrary = xml4c
  +xmlParserLibrary = expat
   
   # Location of parser
  -dir.xmlParser = ${basedir}/../../PreReqs/xml4c/AIX
  -
  +dir.xmlParser = /home/axisdev/expat-1.95.7
   
   #######################################
   # Properties for compiling C/C++ code #
   #######################################
   
   # Directory in which to place compiled libraries
  -dir.bin = ${basedir}/../../../obj/bin
  +dir.bin = ${basedir}/deploy/lib
   
   # Directory in which to place object files
  -dir.objects = ${basedir}/../../../obj/objects
  +dir.objects = ${basedir}/lib/axis
   
   # Names for compiled libraries - excluding any prefix or suffix
   # eg: For Windows :   libaxis_client will produce libaxis_client.dll
   #     For Unix    :   axis_client will produce libaxis_client.so
  -clientLibraryName = axis_client
  +clientLibraryName = axiscpp_client
   transportLibraryName = axis_transport
  -xmlParserLibraryName = axis_xmlParser
  +xmlParserLibraryName = axis_xmlparser
   
   ####################################
   # Properties for compiling WSDL2Ws #
   ####################################
   
   # Location of Axis JARs
  -dir.axisJARs = ${basedir}/../../PreReqs
  +dir.axisJARs = /home/axisdev/java/axis-1_2beta/lib
   
   # Directory in which to place compiled Java classes
  -dir.classes = ${basedir}/../../../obj/classes
  +dir.classes = ${basedir}/lib/axis
   
   ############################
   # Properties for packaging #
   ############################
   # Base directory for packaging - not used directly within build.xml, just used to simplify
this property file
  -dir.package = ${basedir}/../../../obj/package
  +dir.package = ${basedir}/deploy
   
   # Directory in which to place DLLs - Only used for Windows platform
   dir.package.bin = ${dir.package}/bin
  @@ -66,7 +65,7 @@
   dir.package.include = ${dir.package}/include
   
   # Directory in which to place WSDL2Ws JAR files
  -dir.package.WSDL2Ws = ${dir.package}/WSDL2Ws
  +dir.package.WSDL2Ws = ${dir.classes}
   
   # Directory in which to place Documentation
   dir.package.docs = ${dir.package}/docs
  @@ -77,14 +76,14 @@
   
   # Directory in which to place all generated test artifacts
   # This is also the directory in which code is built and run
  -dir.test.generated = ${basedir}/../../../obj/test/generated
  +dir.test.generated = ${basedir}/tests/auto_build/testcases/Output
   
   # Log files for test results
   results.log = ${dir.test.generated}/results.log
   
   # Prefix and suffix used for executables and libraries
   # Typical values are:
  -#   For windows:
  +#	For windows:
   #		executableSuffix = .exe
   #		librarySuffix = .dll
   #		libraryPrefix = 
  @@ -101,11 +100,12 @@
   # Directory containing Axis C libraries
   # For Windows this should be ${dir.package.bin}
   # For Unix this should be ${dir.package.lib}
  -dir.libraries = ${dir.package.lib}
  +dir.libraries = ${dir.package.bin}
   
   # AXISCPP_DEPLOY directory
   axiscpp_deploy = ${dir.test.generated}
   
   # Details of server to be used for testing clients
   testHost = localhost
  -testPort = 9080
  \ No newline at end of file
  +testPort = 9080
  +monitorPort = 13260
  
  
  
  1.2       +15 -15    ws-axis/c/build.Linux.properties
  
  Index: build.Linux.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.Linux.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.Linux.properties	6 Sep 2004 16:31:12 -0000	1.1
  +++ build.Linux.properties	7 Sep 2004 13:42:00 -0000	1.2
  @@ -14,29 +14,28 @@
   #		xmlParserLibrary = expat
   
   # Parser to be used
  -xmlParser = xerces
  +xmlParser = expat
   
   # Name of parser library to link against
  -xmlParserLibrary = xml4c
  +xmlParserLibrary = expat
   
   # Location of parser
  -dir.xmlParser = ${basedir}/../../PreReqs/xml4c/Linux
  -
  +dir.xmlParser = /home/axisdev/expat-1.95.7
   
   #######################################
   # Properties for compiling C/C++ code #
   #######################################
   
   # Directory in which to place compiled libraries
  -dir.bin = ${basedir}/../../../obj/bin
  +dir.bin = ${basedir}/deploy/lib
   
   # Directory in which to place object files
  -dir.objects = ${basedir}/../../../obj/objects
  +dir.objects = ${basedir}/lib/axis
   
   # Names for compiled libraries - excluding any prefix or suffix
   # eg: For Windows :   libaxis_client will produce libaxis_client.dll
   #     For Unix    :   axis_client will produce libaxis_client.so
  -clientLibraryName = axis_client
  +clientLibraryName = axiscpp_client
   transportLibraryName = axis_transport
   xmlParserLibraryName = axis_xmlparser
   
  @@ -45,16 +44,16 @@
   ####################################
   
   # Location of Axis JARs
  -dir.axisJARs = ${basedir}/../../PreReqs
  +dir.axisJARs = /home/axisdev/java/axis-1_2beta/lib
   
   # Directory in which to place compiled Java classes
  -dir.classes = ${basedir}/../../../obj/classes
  +dir.classes = ${basedir}/lib/axis
   
   ############################
   # Properties for packaging #
   ############################
   # Base directory for packaging - not used directly within build.xml, just used to simplify
this property file
  -dir.package = ${basedir}/../../../obj/package
  +dir.package = ${basedir}/deploy
   
   # Directory in which to place DLLs - Only used for Windows platform
   dir.package.bin = ${dir.package}/bin
  @@ -66,7 +65,7 @@
   dir.package.include = ${dir.package}/include
   
   # Directory in which to place WSDL2Ws JAR files
  -dir.package.WSDL2Ws = ${dir.package}/WSDL2Ws
  +dir.package.WSDL2Ws = ${dir.classes}
   
   # Directory in which to place Documentation
   dir.package.docs = ${dir.package}/docs
  @@ -77,14 +76,14 @@
   
   # Directory in which to place all generated test artifacts
   # This is also the directory in which code is built and run
  -dir.test.generated = ${basedir}/../../../obj/test/generated
  +dir.test.generated = ${basedir}/tests/auto_build/testcases/Output
   
   # Log files for test results
   results.log = ${dir.test.generated}/results.log
   
   # Prefix and suffix used for executables and libraries
   # Typical values are:
  -#   For windows:
  +#	For windows:
   #		executableSuffix = .exe
   #		librarySuffix = .dll
   #		libraryPrefix = 
  @@ -101,11 +100,12 @@
   # Directory containing Axis C libraries
   # For Windows this should be ${dir.package.bin}
   # For Unix this should be ${dir.package.lib}
  -dir.libraries = ${dir.package.lib}
  +dir.libraries = ${dir.package.bin}
   
   # AXISCPP_DEPLOY directory
   axiscpp_deploy = ${dir.test.generated}
   
   # Details of server to be used for testing clients
   testHost = localhost
  -testPort = 9080
  \ No newline at end of file
  +testPort = 9080
  +monitorPort = 13260
  
  
  
  1.2       +13 -12    ws-axis/c/build.Win32.properties
  
  Index: build.Win32.properties
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build.Win32.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.Win32.properties	6 Sep 2004 16:31:12 -0000	1.1
  +++ build.Win32.properties	7 Sep 2004 13:42:00 -0000	1.2
  @@ -17,10 +17,10 @@
   xmlParser = xerces
   
   # Name of parser library to link against
  -xmlParserLibrary = xml4c_5
  +xmlParserLibrary = xerces-c_2
   
   # Location of parser
  -dir.xmlParser = ${basedir}/../../PreReqs/xml4c/Win32
  +dir.xmlParser = C:/axisdev/${xmlParser}
   
   
   #######################################
  @@ -28,33 +28,33 @@
   #######################################
   
   # Directory in which to place compiled libraries
  -dir.bin = ${basedir}/../../../obj/bin
  +dir.bin = ${basedir}/deploy/lib
   
   # Directory in which to place object files
  -dir.objects = ${basedir}/../../../obj/objects
  +dir.objects = ${basedir}/lib/axis
   
   # Names for compiled libraries - excluding any prefix or suffix
   # eg: For Windows :   libaxis_client will produce libaxis_client.dll
   #     For Unix    :   axis_client will produce libaxis_client.so
  -clientLibraryName = libaxis_client
  -transportLibraryName = libaxis_transport
  -xmlParserLibraryName = libaxis_xmlParser
  +clientLibraryName = AxisClient
  +transportLibraryName = AxisTransport
  +xmlParserLibraryName = AxisXMLParser
   
   ####################################
   # Properties for compiling WSDL2Ws #
   ####################################
   
   # Location of Axis JARs
  -dir.axisJARs = ${basedir}/../../PreReqs
  +dir.axisJARs = C:/axisdev/java/axis-1_2beta/lib
   
   # Directory in which to place compiled Java classes
  -dir.classes = ${basedir}/../../../obj/classes
  +dir.classes = ${basedir}/lib/axis
   
   ############################
   # Properties for packaging #
   ############################
   # Base directory for packaging - not used directly within build.xml, just used to simplify
this property file
  -dir.package = ${basedir}/../../../obj/package
  +dir.package = ${basedir}/deploy
   
   # Directory in which to place DLLs - Only used for Windows platform
   dir.package.bin = ${dir.package}/bin
  @@ -77,7 +77,7 @@
   
   # Directory in which to place all generated test artifacts
   # This is also the directory in which code is built and run
  -dir.test.generated = ${basedir}/../../../obj/test/generated
  +dir.test.generated = ${basedir}/tests/auto_build/testcases/Output
   
   # Log files for test results
   results.log = ${dir.test.generated}/results.log
  @@ -108,4 +108,5 @@
   
   # Details of server to be used for testing clients
   testHost = localhost
  -testPort = 9080
  \ No newline at end of file
  +testPort = 9080
  +monitorPort = 13260
  
  
  
  1.2       +40 -32    ws-axis/c/test.xml
  
  Index: test.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/test.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- test.xml	6 Sep 2004 16:31:12 -0000	1.1
  +++ test.xml	7 Sep 2004 13:42:00 -0000	1.2
  @@ -1,14 +1,17 @@
   <project name="AxisCTests" default="testSuite" basedir=".">
   <description >
  -This ANT script generates, compiles and runs the client stub tests for Apache.
  +This ANT script generates, compiles, runs and validates the client stub tests
  +for Apache.
   
   This script is intended for use with Java 1.4+ and Apache ANT 1.6+.
   Ant is available from: http://ant.apache.org/
   
  -To compile C/C++ code you will require the cpptasks extension to ANT, within:
  +To allow the automated finding of all available tests, use has been made of the
  +ant-contrib project offering.  Also, to compile C/C++ code you will require the
  +cpptasks extension to ANT. You will need to place the JAR files within:
   	[ant install dir]/lib
  -This is available from: http://ant-contrib.sourceforge.net/
  -{Note: you will require the cpptasks download, not ant-contrib}
  +These are available from: http://ant-contrib.sourceforge.net/
  +{Note: The cpptasks are a seperate download from ant-contrib}
   
   It is intended that the default target be used, which compiles and links all code,
   generates documentation and packages ready for distribution.
  @@ -404,34 +407,39 @@
   		<property name="expected.file" value="${dir.src}/output/${testName}.out"/>
   		<property name="r_expected.file" value="${dir.src}/output/${testName}Request.out"/>
   
  -		<parallel>
  -			<!-- Run Monitor utility to allow validation of message across the wire -->
  -			<java classname="org.apache.test.TCPMonitor">
  -				<arg line="-l 13260"/>
  -				<arg line="-p ${testPort}"/>
  -				<arg line="-h ${testHost}"/>
  -				<arg line="-o ${dir.test.generated}/${testName}/tcpm.out"/>
  -				<classpath>
  -					<pathelement location="${basedir}/tests/utils/monitor/monitor.jar"/>
  -				</classpath>
  -			</java>
  -
  -			<sequential>
  -				<!-- Wait for jvm to start monitor program -->
  -				<sleep seconds="5"/>
  -				<!-- Run the client test -->
  -				<exec executable="${dir.test.generated}/${testName}/${testName}"
  -				 dir="${dir.test.generated}/${testName}" output="${results.file}"
  -				 error="${dir.test.generated}/${testName}/${testName}.err"
  -				 failifexecutionfails="false" vmlauncher="false">
  -					<arg line="-p 13260"/>
  -					<arg line="-s localhost"/>
  -					<env key="PATH" value="${java.library.path}${path.separator}${dir.libraries}${path.separator}${dir.xmlParser}/bin"/>
  -					<env key="LD_LIBRARY_PATH" value="${dir.libraries}${path.separator}${dir.xmlParser}/lib"/>
  -					<env key="AXISCPP_DEPLOY" value="${axiscpp_deploy}"/>
  -				</exec>
  -			</sequential>
  -		</parallel>
  +		<trycatch>
  +			<try>
  +				<parallel timeout="120000">
  +					<!-- Run Monitor utility to allow validation of message across the wire -->
  +					<java classname="org.apache.test.TCPMonitor">
  +						<arg line="-l ${monitorPort}"/>
  +						<arg line="-p ${testPort}"/>
  +						<arg line="-h ${testHost}"/>
  +						<arg line="-o ${dir.test.generated}/${testName}/tcpm.out"/>
  +						<classpath>
  +							<pathelement location="${basedir}/tests/utils/monitor/monitor.jar"/>
  +						</classpath>
  +					</java>
  +		
  +					<sequential>
  +						<!-- Wait for jvm to start monitor program -->
  +						<sleep seconds="5"/>
  +						<!-- Run the client test -->
  +						<exec executable="${dir.test.generated}/${testName}/${testName}"
  +						 dir="${dir.test.generated}/${testName}" output="${results.file}"
  +						 error="${dir.test.generated}/${testName}/${testName}.err"
  +						 failifexecutionfails="false" vmlauncher="false">
  +							<arg line="-p ${monitorPort}"/>
  +							<arg line="-s localhost"/>
  +							<env key="PATH" value="${java.library.path}${path.separator}${dir.libraries}${path.separator}${dir.xmlParser}/bin"/>
  +							<env key="LD_LIBRARY_PATH" value="${dir.libraries}${path.separator}${dir.xmlParser}/lib"/>
  +							<env key="AXISCPP_DEPLOY" value="${axiscpp_deploy}"/>
  +						</exec>
  +					</sequential>
  +				</parallel>
  +			</try>
  +			<catch/>
  +		</trycatch>
   	</target>
   	
   	<!--
  
  
  

Mime
View raw message