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/27 15:51:53 UTC
cvs commit: ws-axis/c/vc AxisClientDLL.dsp
dicka 2005/06/27 06:51:53
Modified: c/build Initialize.xml build.AIX.properties
build.Linux.properties build.OS400.properties
build.SunOS.properties build.Win32.properties
buildInitialize.xml executeTest.xml
c/src/common AxisConfig.cpp AxisTrace.cpp
c/src/soap SoapAttachment.cpp
c/src/soap/xsd DateTime.cpp IAnySimpleType.cpp
c/src/soap/xsd/constraints WhiteSpace.cpp
c/src/transport/axis3 HTTPTransport.cpp
c/vc AxisClientDLL.dsp
Added: c/build build.AIX64.properties build.common.properties
Log:
Consolidate platform independent build properties into a single common property file.
Also initial work to support AIX 64bit, which highlighted this need for a common property file.
PR: AXISCPP-708 and initial work for supporting AIX 64bit
Submitted by: Adrian Dick
Revision Changes Path
1.3 +12 -1 ws-axis/c/build/Initialize.xml
Index: Initialize.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/Initialize.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Initialize.xml 9 Jun 2005 01:07:58 -0000 1.2
+++ Initialize.xml 27 Jun 2005 13:51:52 -0000 1.3
@@ -32,7 +32,18 @@
<isset property="linux"/>
</condition>
<condition property="platform" value="AIX">
- <isset property="aix"/>
+ <and>
+ <isset property="aix"/>
+ <not>
+ <isset property="64bit"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="platform" value="AIX64">
+ <and>
+ <isset property="aix"/>
+ <isset property="64bit"/>
+ </and>
</condition>
<condition property="platform" value="OS400">
<isset property="os400"/>
1.21 +1 -235 ws-axis/c/build/build.AIX.properties
Index: build.AIX.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.AIX.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.AIX.properties 4 May 2005 07:40:45 -0000 1.20
+++ build.AIX.properties 27 Jun 2005 13:51:52 -0000 1.21
@@ -1,12 +1,4 @@
-#####################################
-# Parser that the client should use #
-#####################################
-#only one parse can be used at a given time
-
-testconf.client.parser.xml4c = false
-testconf.client.parser.xerces = true
-
-############################
+#############################
# Server to deploy Services #
#############################
#Only one server can be used at a given time
@@ -21,211 +13,15 @@
# Items to be built #
#####################
-# Set the following to true if you wish the client library be built
-client = true
-
-# Set the following to true if you wish the server libraries be built
-# See options below for Apache modules and Stand-alone server
-server = true
-
# Set the following to true if you wish the API documentation be generated
documentation = false
-#####################
-# Parser Properties #
-#####################
-
-# Typical values are:
-# For Xerces, on Windows:
-# xmlParser = xerces
-# xmlParserLibrary = xerces-c_2
-# For Xerces, on Unix:
-# xmlParser = xerces
-# xmlParserLibrary = xerces-c
-
-# Parsers to be used
-xmlParser.xml4c = false
-xmlParser.xerces = true
-
-## Values used for XML4C
-xml4c.xmlParserLibrary = xml4c
-xml4c.dir.xmlParser = ${env.XML4C_HOME}
-xml4c.xmlParserLibraryName = axis_xml4c
-
-## Values used for Xerces
-xerces.xmlParserLibrary = xerces-c
-xerces.dir.xmlParser = ${env.XERCES_HOME}
-xerces.xmlParserLibraryName = axis_xerces
-
-
-# Name for compiled XML Parser library - excluding any prefix or suffix
-# eg: For Windows : axis_xmlparser will produce axis_xmlparser.dll
-# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
-xmlParserLibraryName = axis_xmlparser
-
-########################
-# Transport Properties #
-########################
-
-# Transports to be used
-transport.axis2 = false
-transport.axis2.ipv6 = false
-transport.HTTP = true
-transport.HTTP.ipv6 = true
-
-## Values used for axis2
-axis2.transportLibraryName = axis2_transport
-
-## Values used for axis2
-axis2.ipv6.transportLibraryName = axis2ipv6_transport
-
-## Values used for HTTP
-HTTP.transportLibraryName = http_transport
-
-# Name for compiled transport library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-#
-transportLibraryName = http_transport
-
-######################
-# Channel Properties #
-######################
-
-HTTP.Channel = true
-
-# Name for compiled channel library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-#
-HTTP.ChannelLibraryName = http_channel
-
-#############################
-# Secure Channel Properties #
-#############################
-
-HTTP.SSLChannel = true
-
-HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
-HTTP.SSLChannel.eay.dir = ${HTTP.SSLChannel.dir}/bin
-
-# Name for compiled secure channel library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-#
-HTTP.SecureChannelLibraryName = http_channelssl
-
-#####################
-# Client Properties #
-#####################
-
-# Name for compiled client - excluding any prefix or suffix
-# eg: For Windows : axis_client will produce axis_client.dll
-# For Unix : axis_client will produce libaxis_client.so
-clientLibraryName = axis_client
-cClientLibraryName = ${clientLibraryName}C
-
-############################
-# Server Engine Properties #
-############################
-
-# Name for compiled server engine - excluding any prefix or suffix
-# eg: For Windows : axis_server will produce axis_server.dll
-# For Unix : axis_server will produce libaxis_server.so
-serverEngineLibraryName = axis_server
-
-#################################
-# Simple Axis Server Properties #
-#################################
-
-# Is Simple Axis Server to be used?
-server.simpleAxisServer = true
-
-# Name for compiled server engine - excluding any prefix or suffix
-# eg: For Windows : simple_axis_server will produce simple_axis_server.exe
-# For Unix : simple_axis_server will produce simple_axis_server
-simpleAxisServerExecutableName = simple_axis_server
-
-#####################
-# Apache Properties #
-#####################
-
-# Apache versions to be used
-server.apache13 = true
-server.apache20 = true
-
-## Values used for Apache 1.3
-apache13.dir.server = ${env.APACHE_HOME}
-apache13.serverLibraryName = axiscpp_mod
-
-## Values used for Apache 2.0
-apache20.dir.server = ${env.APACHE2_HOME}
-apache20.serverLibraryName = axiscpp_mod2
-
-# Name for compiled Apache plugin library - excluding any prefix or suffix
-# eg: For Windows : axis_apache will produce axis_apache.dll
-# For Unix : axis_apache will produce libaxis_apache.so
-serverLibraryName = mod_axis
-
-###########################
-# Location of output tree #
-###########################
-dir.obj = ${basedir}/../../../obj
-
-####################
-# Trace Properties #
-####################
-
-# Instrument the Axis C++ source code with entry/exit trace
-dir.src.instrumented = ${dir.obj}/src
-
-#######################################
-# Properties for compiling C/C++ code #
-#######################################
-
-# Directory in which to place compiled libraries
-dir.bin = ${dir.obj}/bin
-
-# Directory in which to place object files
-dir.objects = ${dir.obj}/objects
-
-####################################
-# Properties for compiling WSDL2Ws #
-####################################
-
-# Location of Axis JARs
-dir.axisJARs = ${env.AXISJAVA_LIB}
-
-# Directory in which to place compiled Java classes
-dir.classes = ${dir.obj}/classes
-
-###########################################
-# Properties for packaging Binary release #
-###########################################
-release = axis-c-${version}-${platform}
-dir.release = ${dir.obj}/package/${release}
-
-###############################
-# Properties for Deliverables #
-###############################
-dir.zips = ${basedir}/../../../zips
########################################
# Location of wsdl2ws for Deliverables #
########################################
dir.wsdl2ws = ${dir.release}/lib/axis
-############################################
-# Properties for building and running test #
-############################################
-
-# Directory in which to place all generated test artifacts
-# This is also the directory in which code is built and run
-dir.test.generated = ${dir.obj}/test/generated
-
-# 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:
@@ -241,33 +37,3 @@
executableSuffix =
librarySuffix = .a
libraryPrefix = lib
-
-# Directory containing Axis C libraries
-# For Windows the packaged product has the .DLLs in the PACKAGE\bin
-# directory and the .LIBs in the PACKAGE\lib\axis directory
-# but at build time they are all in dir.bin
-# For Unix .so files are used for compiling and running so only
-# 1 directory is needed
-# dir.libraries the location of the libraries needed for running the client
-# i.e. the DLLs
-# dir.lib the location of the libraries needed for compiling the client
-# Use these properties so they can easily be overridden when testing the
-# packaged product
-dir.libraries = ${dir.bin}
-dir.lib = ${dir.bin}
-
-# May want to uncomment for testing so the build output is used
-#dir.include = ${dir.package.include}
-
-# If only a single language is required then set it here.
-# Valid values are cpp or c. Default if unset is both.
-target.lang = cpp
-
-# AXISCPP_DEPLOY directory
-axiscpp_deploy = ${dir.test.generated}
-
-# Details of server to be used for testing clients
-testHost = localhost
-testPort = 9080
-monitorPort = 13260
-
1.28 +1 -246 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.Linux.properties 14 Jun 2005 14:44:34 -0000 1.27
+++ build.Linux.properties 27 Jun 2005 13:51:52 -0000 1.28
@@ -1,12 +1,4 @@
-#####################################
-# Parser that the client should use #
-#####################################
-#only one parse can be used at a given time
-
-testconf.client.parser.xml4c = false
-testconf.client.parser.xerces = true
-
-##############################
+#############################
# Server to deploy Services #
#############################
#Only one server can be used at a given time
@@ -17,215 +9,12 @@
server.apache2=true
server.simpleaxisserver=true
-####################
-# Items to be built #
-#####################
-
-# Set the following to true if you wish the client library be built
-client = true
-
-# Set the following to true if you wish the server libraries be built
-# See options below for Apache modules and Stand-alone server
-server = true
-
-# Set the following to true if you wish the API documentation be generated
-documentation = true
-
-#####################
-# Parser Properties #
-#####################
-
-# Typical values are:
-# For Xerces, on Windows:
-# xmlParser = xerces
-# xmlParserLibrary = xerces-c_2
-# For Xerces, on Unix:
-# xmlParser = xerces
-# xmlParserLibrary = xerces-c
-
-# Parsers to be used
-xmlParser.xml4c = false
-xmlParser.xerces = true
-
-## Values used for XML4C
-xml4c.xmlParserLibrary = xml4c
-xml4c.dir.xmlParser = ${env.XML4C_HOME}
-xml4c.xmlParserLibraryName = axis_xml4c
-
-## Values used for Xerces
-xerces.xmlParserLibrary = xerces-c
-xerces.dir.xmlParser = ${env.XERCES_HOME}
-xerces.xmlParserLibraryName = axis_xerces
-
-
-# Name for compiled XML Parser library - excluding any prefix or suffix
-# eg: For Windows : axis_xmlparser will produce axis_xmlparser.dll
-# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
-xmlParserLibraryName = ${xerces.xmlParserLibraryName}
-
-########################
-# Transport Properties #
-########################
-
-# Transports to be used
-transport.axis2 = false
-transport.axis2.ipv6 = false
-transport.HTTP = true
-transport.HTTP.ipv6 = true
-
-## Values used for axis2
-axis2.transportLibraryName = axis2_transport
-
-## Values used for axis2
-axis2.ipv6.transportLibraryName = axis2ipv6_transport
-
-## Values used for HTTP
-HTTP.transportLibraryName = http_transport
-
-# Name for compiled transport library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-#
-transportLibraryName = http_transport
-
-######################
-# Channel Properties #
-######################
-
-HTTP.Channel = true
-
-# Name for compiled channel library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-#
-HTTP.ChannelLibraryName = http_channel
-
#############################
# Secure Channel Properties #
#############################
HTTP.SSLChannel = false
-HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
-HTTP.SSLChannel.eay.dir = ${HTTP.SSLChannel.dir}/bin
-
-# Name for compiled secure channel library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-#
-HTTP.SecureChannelLibraryName = http_channelssl
-
-#####################
-# Client Properties #
-#####################
-
-# Name for compiled client - excluding any prefix or suffix
-# eg: For Windows : axis_client will produce axis_client.dll
-# For Unix : axis_client will produce libaxis_client.so
-clientLibraryName = axis_client
-cClientLibraryName = ${clientLibraryName}C
-
-############################
-# Server Engine Properties #
-############################
-
-# Name for compiled server engine - excluding any prefix or suffix
-# eg: For Windows : axis_server will produce axis_server.dll
-# For Unix : axis_server will produce libaxis_server.so
-serverEngineLibraryName = axis_server
-
-#################################
-# Simple Axis Server Properties #
-#################################
-
-# Is Simple Axis Server to be used?
-server.simpleAxisServer = true
-
-# Name for compiled server engine - excluding any prefix or suffix
-# eg: For Windows : simple_axis_server will produce simple_axis_server.exe
-# For Unix : simple_axis_server will produce simple_axis_server
-simpleAxisServerExecutableName = simple_axis_server
-
-#####################
-# Apache Properties #
-#####################
-
-# Apache versions to be used
-server.apache13 = true
-server.apache20 = true
-
-## Values used for Apache 1.3
-apache13.dir.server = ${env.APACHE_HOME}
-apache13.serverLibraryName = axiscpp_mod
-
-## Values used for Apache 2.0
-apache20.dir.server = ${env.APACHE2_HOME}
-apache20.serverLibraryName = axiscpp_mod2
-
-# Name for compiled Apache plugin library - excluding any prefix or suffix
-# eg: For Windows : axis_apache will produce axis_apache.dll
-# For Unix : axis_apache will produce libaxis_apache.so
-serverLibraryName = mod_axis
-
-###########################
-# Location of output tree #
-###########################
-dir.obj = ${basedir}/../../../obj
-
-####################
-# Trace Properties #
-####################
-
-# Instrument the Axis C++ source code with entry/exit trace
-dir.src.instrumented = ${dir.obj}/src
-
-#######################################
-# Properties for compiling C/C++ code #
-#######################################
-
-# Directory in which to place compiled libraries
-dir.bin = ${dir.obj}/bin
-
-# Directory in which to place object files
-dir.objects = ${dir.obj}/objects
-
-####################################
-# Properties for compiling WSDL2Ws #
-####################################
-
-# Location of Axis JARs
-dir.axisJARs = ${env.AXISJAVA_LIB}
-
-# Directory in which to place compiled Java classes
-dir.classes = ${dir.obj}/classes
-
-###########################################
-# Properties for packaging Binary release #
-###########################################
-release = axis-c-${version}-${platform}
-dir.release = ${dir.obj}/package/${release}
-
-###############################
-# Properties for Deliverables #
-###############################
-dir.zips = ${basedir}/../../../zips
-
-########################################
-# Location of wsdl2ws for Deliverables #
-########################################
-dir.wsdl2ws = ${dir.release}-bin/lib/axis
-
-############################################
-# Properties for building and running test #
-############################################
-
-# Directory in which to place all generated test artifacts
-# This is also the directory in which code is built and run
-dir.test.generated = ${dir.obj}/test/generated
-
-# 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:
@@ -241,37 +30,3 @@
executableSuffix =
librarySuffix = .so
libraryPrefix = lib
-
-# Directory containing Axis C libraries
-# For Windows the packaged product has the .DLLs in the PACKAGE\bin
-# directory and the .LIBs in the PACKAGE\lib\axis directory
-# but at build time they are all in dir.bin
-# For Unix .so files are used for compiling and running so only
-# 1 directory is needed
-# dir.libraries the location of the libraries needed for running the client
-# i.e. the DLLs
-# dir.lib the location of the libraries needed for compiling the client
-# Use these properties so they can easily be overridden when testing the
-# packaged product
-dir.libraries = ${dir.bin}
-dir.lib = ${dir.bin}
-
-# May want to uncomment for testing so the build output is used
-#dir.include = ${dir.package.include}
-
-# If only a single language is required then set it here.
-# Valid values are cpp or c. Default if unset is both.
-target.lang = cpp
-
-# AXISCPP_DEPLOY directory
-axiscpp_deploy = ${dir.test.generated}
-
-# Details of server to be used for testing clients
-testHost = localhost
-testPort = 8080
-monitorPort = 13260
-
-# details of HTTP proxy for any proxy tests
-proxy.host=myProxy
-proxy.port=8080
-
1.23 +0 -192 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.OS400.properties 14 Jun 2005 14:44:34 -0000 1.22
+++ build.OS400.properties 27 Jun 2005 13:51:52 -0000 1.23
@@ -5,7 +5,6 @@
testconf.client.parser.xml4c = true
testconf.client.parser.xerces = false
-
#############################
# Server to deploy Services #
#############################
@@ -21,9 +20,6 @@
# Items to be built #
#####################
-# Set the following to true if you wish the client library be built
-client = true
-
# Set the following to true if you wish the server libraries be built
# See options below for Apache modules and Stand-alone server
server = false
@@ -49,13 +45,9 @@
## Values used for XML4C
xml4c.xmlParserLibrary = libxml4c
-xml4c.dir.xmlParser = ${env.XML4C_HOME}
-xml4c.xmlParserLibraryName = axis_xml4c
## Values used for Xerces
xerces.xmlParserLibrary = libxerces-c
-xerces.dir.xmlParser = ${env.XERCES_HOME}
-xerces.xmlParserLibraryName = axis_xerces
# Name for compiled XML Parser library - excluding any prefix or suffix
@@ -63,169 +55,17 @@
# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
xmlParserLibraryName = axis_xmlparser
-########################
-# Transport Properties #
-########################
-
-# Transports to be used
-transport.axis2 = false
-transport.axis2.ipv6 = false
-transport.HTTP = true
-transport.HTTP.ipv6 = false
-
-## Values used for axis2
-axis2.transportLibraryName = axis2_transport
-
-## Values used for axis2
-axis2.ipv6.transportLibraryName = axis2ipv6_transport
-
-## Values used for HTTP
-HTTP.transportLibraryName = http_transport
-
-# Name for compiled transport library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce HTTPtransport.dll
-# For Unix : axis_transport will produce libHTTPtransport.so
-#
-transportLibraryName = http_transport
-
-######################
-# Channel Properties #
-######################
-
-HTTP.Channel = true
-
-# Name for compiled channel library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce HTTPChannel.dll
-# For Unix : axis_transport will produce libhttp_channel.so
-#
-HTTP.ChannelLibraryName = http_channel
-
#############################
# Secure Channel Properties #
#############################
HTTP.SSLChannel = false
-HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
-HTTP.SSLChannel.eay.dir = ${HTTP.SSLChannel.dir}/bin
-
-# Name for compiled secure channel library - excluding any prefix or suffix
-# eg: For Windows : HTTPSSLChannel will produce HTTPSSLChannel.dll
-# For Unix : HTTPSSLChannel will produce libhttp_channelssl.so
-
-HTTP.SecureChannelLibraryName = http_channelssl
-
-#####################
-# Client Properties #
-#####################
-
-# Name for compiled client - excluding any prefix or suffix
-# eg: For Windows : axis_client will produce axis_client.dll
-# For Unix : axis_client will produce libaxis_client.so
-clientLibraryName = axis_client
-cClientLibraryName = ${clientLibraryName}C
-
-############################
-# Server Engine Properties #
-############################
-
-# Name for compiled server engine - excluding any prefix or suffix
-# eg: For Windows : axis_server will produce axis_server.dll
-# For Unix : axis_server will produce libaxis_server.so
-serverEngineLibraryName = axis_server
-
-#################################
-# Simple Axis Server Properties #
-#################################
-
-# Is Simple Axis Server to be used?
-server.simpleAxisServer = false
-
-# Name for compiled server engine - excluding any prefix or suffix
-# eg: For Windows : simple_axis_server will produce simple_axis_server.exe
-# For Unix : simple_axis_server will produce simple_axis_server
-simpleAxisServerExecutableName = simple_axis_server
-
-#####################
-# Apache Properties #
-#####################
-
-# Apache versions to be used
-server.apache13 = false
-server.apache20 = false
-
-## Values used for Apache 1.3
-apache13.dir.server = ${env.APACHE_HOME}
-apache13.serverLibraryName = axiscpp_mod
-
-## Values used for Apache 2.0
-apache20.dir.server = ${env.APACHE2_HOME}
-apache20.serverLibraryName = axiscpp_mod2
-
-# Name for compiled Apache plugin library - excluding any prefix or suffix
-# eg: For Windows : axis_apache will produce axis_apache.dll
-# For Unix : axis_apache will produce libaxis_apache.so
-serverLibraryName = mod_axis
-
-###########################
-# Location of output tree #
-###########################
-dir.obj = ${basedir}/../../../obj
-
-####################
-# Trace Properties #
-####################
-
-# Instrument the Axis C++ source code with entry/exit trace
-dir.src.instrumented = ${dir.obj}/src
-
-#######################################
-# Properties for compiling C/C++ code #
-#######################################
-
-# Directory in which to place compiled libraries
-dir.bin = ${dir.obj}/bin
-
-# Directory in which to place object files
-dir.objects = ${dir.obj}/objects
-
-####################################
-# Properties for compiling WSDL2Ws #
-####################################
-
-# Location of Axis JARs
-dir.axisJARs = ${env.AXISJAVA_LIB}
-
-# Directory in which to place compiled Java classes
-dir.classes = ${dir.obj}/classes
-
-###########################################
-# Properties for packaging Binary release #
-###########################################
-release = axis-c-${version}-${platform}
-dir.release = ${dir.obj}/package/${release}
-
-###############################
-# Properties for Deliverables #
-###############################
-dir.zips = ${basedir}/../../../zips
-
########################################
# Location of wsdl2ws for Deliverables #
########################################
dir.wsdl2ws = ${dir.release}/lib/axis
-############################################
-# Properties for building and running test #
-############################################
-
-# Directory in which to place all generated test artifacts
-# This is also the directory in which code is built and run
-dir.test.generated = ${dir.obj}/test/generated
-
-# 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:
@@ -241,35 +81,3 @@
executableSuffix =
librarySuffix = .so
libraryPrefix = lib
-
-# Directory containing Axis C libraries
-# For Windows the packaged product has the .DLLs in the PACKAGE\bin
-# directory and the .LIBs in the PACKAGE\lib\axis directory
-# but at build time they are all in dir.bin
-# For Unix .so files are used for compiling and running so only
-# 1 directory is needed
-# dir.libraries the location of the runtime libraries i.e. the DLLs
-# dir.lib the location of the compile time libraries Only different for windows
-# Use these properties so they can easily be overridden when testing the
-# packaged product
-dir.libraries = ${dir.bin}
-dir.lib = ${dir.bin}
-
-# May want to uncomment for testing so the build output is used
-#dir.include = ${dir.package.include}
-
-# If only a single language is required then set it here.
-# Valid values are cpp or c. Default if unset is both.
-target.lang = cpp
-
-# AXISCPP_DEPLOY directory
-axiscpp_deploy = ${dir.test.generated}
-
-# Details of server to be used for testing clients
-testHost = localhost
-testPort = 9080
-monitorPort = 13260
-
-# details of HTTP proxy for any proxy tests
-proxy.host=myProxy
-proxy.port=8080
\ No newline at end of file
1.23 +1 -240 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.SunOS.properties 14 Jun 2005 14:44:34 -0000 1.22
+++ build.SunOS.properties 27 Jun 2005 13:51:52 -0000 1.23
@@ -1,12 +1,4 @@
-#####################################
-# Parser that the client should use #
-#####################################
-#only one parse can be used at a given time
-
-testconf.client.parser.xml4c = false
-testconf.client.parser.xerces = true
-
-############################
+#############################
# Server to deploy Services #
#############################
#Only one server can be used at a given time
@@ -21,211 +13,14 @@
# Items to be built #
#####################
-# Set the following to true if you wish the client library be built
-client = true
-
-# Set the following to true if you wish the server libraries be built
-# See options below for Apache modules and Stand-alone server
-server = true
-
# Set the following to true if you wish the API documentation be generated
documentation = false
-#####################
-# Parser Properties #
-#####################
-
-# Typical values are:
-# For Xerces, on Windows:
-# xmlParser = xerces
-# xmlParserLibrary = xerces-c_2
-# For Xerces, on Unix:
-# xmlParser = xerces
-# xmlParserLibrary = xerces-c
-
-# Parsers to be used
-xmlParser.xml4c = false
-xmlParser.xerces = true
-
-## Values used for XML4C
-xml4c.xmlParserLibrary = xml4c
-xml4c.dir.xmlParser = ${env.XML4C_HOME}
-xml4c.xmlParserLibraryName = axis_xml4c
-
-## Values used for Xerces
-xerces.xmlParserLibrary = xerces-c
-xerces.dir.xmlParser = ${env.XERCES_HOME}
-xerces.xmlParserLibraryName = axis_xerces
-
-
-# Name for compiled XML Parser library - excluding any prefix or suffix
-# eg: For Windows : axis_xmlparser will produce axis_xmlparser.dll
-# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
-xmlParserLibraryName = axis_xmlparser
-
-########################
-# Transport Properties #
-########################
-
-# Transports to be used
-transport.axis2 = false
-transport.axis2.ipv6 = false
-transport.HTTP = true
-transport.HTTP.ipv6 = true
-
-## Values used for axis2
-axis2.transportLibraryName = axis2_transport
-
-## Values used for axis2
-axis2.ipv6.transportLibraryName = axis2ipv6_transport
-
-## Values used for HTTP
-HTTP.transportLibraryName = http_transport
-
-# Name for compiled transport library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-#
-transportLibraryName = http_transport
-
-######################
-# Channel Properties #
-######################
-
-HTTP.Channel = true
-
-# Name for compiled channel library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-#
-HTTP.ChannelLibraryName = http_channel
-
-#############################
-# Secure Channel Properties #
-#############################
-
-HTTP.SSLChannel = true
-
-HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
-HTTP.SSLChannel.eay.dir = ${HTTP.SSLChannel.dir}/bin
-
-# Name for compiled secure channel library - excluding any prefix or suffix
-# eg: For Windows : axis_transport will produce axis_transport.dll
-# For Unix : axis_transport will produce libaxis_transport.so
-
-HTTP.SecureChannelLibraryName = http_channelssl
-
-#####################
-# Client Properties #
-#####################
-
-# Name for compiled client - excluding any prefix or suffix
-# eg: For Windows : axis_client will produce axis_client.dll
-# For Unix : axis_client will produce libaxis_client.so
-clientLibraryName = axis_client
-cClientLibraryName = ${clientLibraryName}C
-
-############################
-# Server Engine Properties #
-############################
-
-# Name for compiled server engine - excluding any prefix or suffix
-# eg: For Windows : axis_server will produce axis_server.dll
-# For Unix : axis_server will produce libaxis_server.so
-serverEngineLibraryName = axis_server
-
-#################################
-# Simple Axis Server Properties #
-#################################
-
-# Is Simple Axis Server to be used?
-server.simpleAxisServer = true
-
-# Name for compiled server engine - excluding any prefix or suffix
-# eg: For Windows : simple_axis_server will produce simple_axis_server.exe
-# For Unix : simple_axis_server will produce simple_axis_server
-simpleAxisServerExecutableName = simple_axis_server
-
-#####################
-# Apache Properties #
-#####################
-
-# Apache versions to be used
-server.apache13 = true
-server.apache20 = true
-
-## Values used for Apache 1.3
-apache13.dir.server = ${env.APACHE_HOME}
-apache13.serverLibraryName = axiscpp_mod
-
-## Values used for Apache 2.0
-apache20.dir.server = ${env.APACHE2_HOME}
-apache20.serverLibraryName = axiscpp_mod2
-
-# Name for compiled Apache plugin library - excluding any prefix or suffix
-# eg: For Windows : axis_apache will produce axis_apache.dll
-# For Unix : axis_apache will produce libaxis_apache.so
-serverLibraryName = mod_axis
-
-###########################
-# Location of output tree #
-###########################
-dir.obj = ${basedir}/../../../obj
-
-####################
-# Trace Properties #
-####################
-
-# Instrument the Axis C++ source code with entry/exit trace
-dir.src.instrumented = ${dir.obj}/src
-
-#######################################
-# Properties for compiling C/C++ code #
-#######################################
-
-# Directory in which to place compiled libraries
-dir.bin = ${dir.obj}/bin
-
-# Directory in which to place object files
-dir.objects = ${dir.obj}/objects
-
-####################################
-# Properties for compiling WSDL2Ws #
-####################################
-
-# Location of Axis JARs
-dir.axisJARs = ${env.AXISJAVA_LIB}
-
-# Directory in which to place compiled Java classes
-dir.classes = ${dir.obj}/classes
-
-###########################################
-# Properties for packaging Binary release #
-###########################################
-release = axis-c-${version}-${platform}
-dir.release = ${dir.obj}/package/${release}
-
-###############################
-# Properties for Deliverables #
-###############################
-dir.zips = ${basedir}/../../../zips
-
########################################
# Location of wsdl2ws for Deliverables #
########################################
dir.wsdl2ws = ${dir.release}/lib/axis
-############################################
-# Properties for building and running test #
-############################################
-
-# Directory in which to place all generated test artifacts
-# This is also the directory in which code is built and run
-dir.test.generated = ${dir.obj}/test/generated
-
-# 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:
@@ -241,37 +36,3 @@
executableSuffix =
librarySuffix = .so
libraryPrefix = lib
-
-# Directory containing Axis C libraries
-# For Windows the packaged product has the .DLLs in the PACKAGE\bin
-# directory and the .LIBs in the PACKAGE\lib\axis directory
-# but at build time they are all in dir.bin
-# For Unix .so files are used for compiling and running so only
-# 1 directory is needed
-# dir.libraries the location of the libraries needed for running the client
-# i.e. the DLLs
-# dir.lib the location of the libraries needed for compiling the client
-# Use these properties so they can easily be overridden when testing the
-# packaged product
-dir.libraries = ${dir.bin}
-dir.lib = ${dir.bin}
-
-# May want to uncomment for testing so the build output is used
-#dir.include = ${dir.package.include}
-
-# If only a single language is required then set it here.
-# Valid values are cpp or c. Default if unset is both.
-target.lang = cpp
-
-# AXISCPP_DEPLOY directory
-axiscpp_deploy = ${dir.test.generated}
-
-# Details of server to be used for testing clients
-testHost = localhost
-testPort = 9080
-monitorPort = 13260
-
-# details of HTTP proxy for any proxy tests
-proxy.host=myProxy
-proxy.port=8080
-
1.24 +1 -142 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.Win32.properties 14 Jun 2005 14:44:34 -0000 1.23
+++ build.Win32.properties 27 Jun 2005 13:51:52 -0000 1.24
@@ -1,12 +1,4 @@
-#####################################
-# Parser that the client should use #
-#####################################
-#only one parse can be used at a given time
-
-testconf.client.parser.xml4c = false
-testconf.client.parser.xerces = true
-
-############################
+#############################
# Server to deploy Services #
#############################
#Only one server can be used at a given time
@@ -17,20 +9,6 @@
server.apache2=false
server.simpleaxisserver=false
-####################
-# Items to be built #
-#####################
-
-# Set the following to true if you wish the client library be built
-client = true
-
-# Set the following to true if you wish the server libraries be built
-# See options below for Apache modules and Stand-alone server
-server = true
-
-# Set the following to true if you wish the API documentation be generated
-documentation = true
-
#####################
# Parser Properties #
#####################
@@ -43,18 +21,12 @@
# xmlParser = xerces
# xmlParserLibrary = xerces-c
-# Parsers to be used
-xmlParser.xml4c = false
-xmlParser.xerces = true
-
## Values used for XML4C
xml4c.xmlParserLibrary = xml4c_5
-xml4c.dir.xmlParser = ${env.XML4C_HOME}
xml4c.xmlParserLibraryName = AxisXMLParserXML4C
## Values used for Xerces
xerces.xmlParserLibrary = xerces-c_2
-xerces.dir.xmlParser = ${env.XERCES_HOME}
xerces.xmlParserLibraryName = AxisXMLParserXerces
@@ -67,14 +39,8 @@
# Transport Properties #
########################
-# Transports to be used
-
-transport.HTTP = true
-transport.HTTP.ipv6 = true
-
HTTP.transport.IPV6.dir = ${env.IPV6_HOME}
-
## Values used for HTTP
HTTP.transportLibraryName = HTTPTransport
@@ -100,14 +66,6 @@
# Secure Channel Properties #
#############################
-HTTP.SSLChannel = true
-
-HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
-
-# Location of all the required SSL libraries. Separate multiple
-# directories with ${path.separator}
-HTTP.SSLChannel.eay.dir = ${HTTP.SSLChannel.dir}/bin
-
# Name for compiled secure channel library - excluding any prefix or suffix
# eg: For Windows : axis_transport will produce axis_transport.dll
# For Unix : axis_transport will produce libaxis_transport.so
@@ -122,7 +80,6 @@
# eg: For Windows : axis_client will produce axis_client.dll
# For Unix : axis_client will produce libaxis_client.so
clientLibraryName = AxisClient
-cClientLibraryName = ${clientLibraryName}C
############################
# Server Engine Properties #
@@ -149,82 +106,18 @@
# Apache Properties #
#####################
-# Apache Versions to be used
-server.apache13 = true
-server.apache20 = true
-
## Values used for Apache 1.3
-apache13.dir.server = ${env.APACHE_HOME}
apache13.serverLibraryName = mod_axis
## Values used for Apache 2.0
-apache20.dir.server = ${env.APACHE2_HOME}
apache20.serverLibraryName = mod_axis2
-# Name for compiled Apache plugin library - excluding any prefix or suffix
-# eg: For Windows : axis_apache will produce axis_apache.dll
-# For Unix : axis_apache will produce libaxis_apache.so
-serverLibraryName = mod_axis
-
-###########################
-# Location of output tree #
-###########################
-dir.obj = ${basedir}/../../../obj
-
-####################
-# Trace Properties #
-####################
-
-# Instrument the Axis C++ source code with entry/exit trace
-dir.src.instrumented = ${dir.obj}/src
-
-#######################################
-# Properties for compiling C/C++ code #
-#######################################
-
-# Directory in which to place compiled libraries
-dir.bin = ${dir.obj}/bin
-
-# Directory in which to place object files
-dir.objects = ${dir.obj}/objects
-
-####################################
-# Properties for compiling WSDL2Ws #
-####################################
-
-# Location of Axis JARs
-dir.axisJARs = ${env.AXISJAVA_LIB}
-
-# Directory in which to place compiled Java classes
-dir.classes = ${dir.obj}/classes
-
-###########################################
-# Properties for packaging Binary release #
-###########################################
-release = axis-c-${version}-${platform}
-dir.release = ${dir.obj}/package/${release}
-
-###############################
-# Properties for Deliverables #
-###############################
-dir.zips = ${basedir}/../../../zips
########################################
# Location of wsdl2ws for Deliverables #
########################################
dir.wsdl2ws = ${dir.release}/lib/axis
-############################################
-# Properties for building and running test #
-############################################
-
-# Directory in which to place all generated test artifacts
-# This is also the directory in which code is built and run
-dir.test.generated = ${dir.obj}/test/generated
-
-# 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:
@@ -240,37 +133,3 @@
executableSuffix = .exe
librarySuffix = .dll
libraryPrefix =
-
-# Directory containing Axis C libraries
-# For Windows the packaged product has the .DLLs in the PACKAGE\bin
-# directory and the .LIBs in the PACKAGE\lib\axis directory
-# but at build time they are all in dir.bin
-# For Unix .so files are used for compiling and running so only
-# 1 directory is needed
-# dir.libraries the location of the libraries needed for running the client
-# i.e. the DLLs
-# dir.lib the location of the libraries needed for compiling the client
-# Use these properties so they can easily be overridden when testing the
-# packaged product
-dir.libraries = ${dir.bin}
-dir.lib = ${dir.bin}
-
-# May want to uncomment for testing so the build output is used
-#dir.include = ${dir.package.include}
-
-# If only a single language is required then set it here.
-# Valid values are cpp or c. Default if unset is both.
-target.lang = cpp
-
-# AXISCPP_DEPLOY directory
-axiscpp_deploy = ${dir.test.generated}
-
-# Details of server to be used for testing clients
-testHost = localhost
-testPort = 9080
-monitorPort = 13260
-
-
-# details of HTTP proxy for any proxy tests
-proxy.host=myProxy
-proxy.port=8080
\ No newline at end of file
1.14 +8 -1 ws-axis/c/build/buildInitialize.xml
Index: buildInitialize.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildInitialize.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- buildInitialize.xml 24 May 2005 10:07:24 -0000 1.13
+++ buildInitialize.xml 27 Jun 2005 13:51:52 -0000 1.14
@@ -92,6 +92,8 @@
<compiler id="AIXxlc" name="xlC" if="aix">
<compilerarg value="-g" if="debug"/>
<compilerarg value="-V"/>
+ <compilerarg value="-q32" unless="64bit"/>
+ <compilerarg value="-q64" if="64bit"/>
<compilerarg value="-qthreaded"/>
<compilerarg value="-qstaticinline"/>
<defineset>
@@ -163,11 +165,15 @@
-->
<linker id="AIXExecutableLinker" name="xlC" libtool="false" if="aix">
<linkerarg value="-g" if="debug"/>
- <syslibset libs="pthread"/>
+ <linkerarg value="-q64" if="64bit"/>
+ <linkerarg value="-q32" unless="64bit"/>
+ <syslibset libs="pthread"/>
</linker>
<linker id="AIXLinker" extends="AIXExecutableLinker" name="xlC" libtool="false" if="aix">
<linkerarg value="-qmkshrobj"/>
+ <linkerarg value="-q64" if="64bit"/>
+ <linkerarg value="-q32" unless="64bit"/>
<linkerarg value="-L/usr/lib/threads"/>
<linkerarg value="-lpthreads"/>
<linkerarg value="-lm"/>
@@ -199,6 +205,7 @@
<!-- Load properties from file -->
<property file="${dir.properties}/build.${platform}.properties"/>
+ <property file="${dir.properties}/build.common.properties"/>
</target>
<!--
1.37 +1 -1 ws-axis/c/build/executeTest.xml
Index: executeTest.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/executeTest.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- executeTest.xml 24 Jun 2005 13:19:37 -0000 1.36
+++ executeTest.xml 27 Jun 2005 13:51:52 -0000 1.37
@@ -221,7 +221,7 @@
<env key="LD_LIBRARY_PATH"
path="${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${HTTP.SSLChannel.dir}/lib${path.separator}${test.directory}" />
<env key="LIBPATH"
- path="${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${HTTP.SSLChannel.dir}/lib${path.separator}${test.directory}" />
+ path="${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${HTTP.SSLChannel.dir}/lib${path.separator}${HTTP.SSLChannel.dir}/lib64${path.separator}${test.directory}" />
<env key="AXISCPP_DEPLOY" value="${axiscpp_deploy}" />
</exec>
1.1 ws-axis/c/build/build.AIX64.properties
Index: build.AIX64.properties
===================================================================
#############################
# Server to deploy Services #
#############################
#Only one server can be used at a given time
#Also APACHE_HOME, APACHE2_HOME (simple axis server needs no environment settings) environment
#variables should be set accordingly
server.apache1=true
server.apache2=false
server.simpleaxisserver=false
####################
# Items to be built #
#####################
# Set the following to true if you wish the API documentation be generated
documentation = false
########################################
# Location of wsdl2ws for Deliverables #
########################################
dir.wsdl2ws = ${dir.release}/lib/axis
# Prefix and suffix used for executables and libraries
# Typical values are:
# For windows:
# executableSuffix = .exe
# librarySuffix = .dll
# libraryPrefix =
# For unix:
# executableSuffix =
# librarySuffix = .so
# libraryPrefix = lib
# For AIX (as Unix, except):
# librarySuffix = .a
executableSuffix =
librarySuffix = .a
libraryPrefix = lib
1.1 ws-axis/c/build/build.common.properties
Index: build.common.properties
===================================================================
#####################################
# Parser that the client should use #
#####################################
#only one parse can be used at a given time
testconf.client.parser.xml4c = false
testconf.client.parser.xerces = true
#############################
# Server to deploy Services #
#############################
#Only one server can be used at a given time
#Also APACHE_HOME, APACHE2_HOME (simple axis server needs no environment settings) environment
#variables should be set accordingly
server.apache1=false
server.apache2=true
server.simpleaxisserver=true
#####################
# Items to be built #
#####################
# Set the following to true if you wish the client library be built
client = true
# Set the following to true if you wish the server libraries be built
# See options below for Apache modules and Stand-alone server
server = true
# Set the following to true if you wish the API documentation be generated
documentation = true
#####################
# Parser Properties #
#####################
# Typical values are:
# For Xerces, on Windows:
# xmlParser = xerces
# xmlParserLibrary = xerces-c_2
# For Xerces, on Unix:
# xmlParser = xerces
# xmlParserLibrary = xerces-c
# Parsers to be used
xmlParser.xml4c = false
xmlParser.xerces = true
## Values used for XML4C
xml4c.xmlParserLibrary = xml4c
xml4c.dir.xmlParser = ${env.XML4C_HOME}
xml4c.xmlParserLibraryName = axis_xml4c
## Values used for Xerces
xerces.xmlParserLibrary = xerces-c
xerces.dir.xmlParser = ${env.XERCES_HOME}
xerces.xmlParserLibraryName = axis_xerces
# Name for compiled XML Parser library - excluding any prefix or suffix
# eg: For Windows : axis_xmlparser will produce axis_xmlparser.dll
# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
xmlParserLibraryName = ${xerces.xmlParserLibraryName}
########################
# Transport Properties #
########################
# Transports to be used
transport.HTTP = true
transport.HTTP.ipv6 = true
## Values used for HTTP
HTTP.transportLibraryName = http_transport
# Name for compiled transport library - excluding any prefix or suffix
# eg: For Windows : axis_transport will produce axis_transport.dll
# For Unix : axis_transport will produce libaxis_transport.so
#
transportLibraryName = http_transport
######################
# Channel Properties #
######################
HTTP.Channel = true
# Name for compiled channel library - excluding any prefix or suffix
# eg: For Windows : axis_transport will produce axis_transport.dll
# For Unix : axis_transport will produce libaxis_transport.so
#
HTTP.ChannelLibraryName = http_channel
#############################
# Secure Channel Properties #
#############################
HTTP.SSLChannel = true
HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
# Location of all the required SSL libraries. Separate multiple
# directories with ${path.separator}
HTTP.SSLChannel.eay.dir = ${HTTP.SSLChannel.dir}/bin
# Name for compiled secure channel library - excluding any prefix or suffix
# eg: For Windows : axis_transport will produce axis_transport.dll
# For Unix : axis_transport will produce libaxis_transport.so
#
HTTP.SecureChannelLibraryName = http_channelssl
#####################
# Client Properties #
#####################
# Name for compiled client - excluding any prefix or suffix
# eg: For Windows : axis_client will produce axis_client.dll
# For Unix : axis_client will produce libaxis_client.so
clientLibraryName = axis_client
cClientLibraryName = ${clientLibraryName}C
############################
# Server Engine Properties #
############################
# Name for compiled server engine - excluding any prefix or suffix
# eg: For Windows : axis_server will produce axis_server.dll
# For Unix : axis_server will produce libaxis_server.so
serverEngineLibraryName = axis_server
#################################
# Simple Axis Server Properties #
#################################
# Is Simple Axis Server to be used?
server.simpleAxisServer = true
# Name for compiled server engine - excluding any prefix or suffix
# eg: For Windows : simple_axis_server will produce simple_axis_server.exe
# For Unix : simple_axis_server will produce simple_axis_server
simpleAxisServerExecutableName = simple_axis_server
#####################
# Apache Properties #
#####################
# Apache versions to be used
server.apache13 = true
server.apache20 = true
## Values used for Apache 1.3
apache13.dir.server = ${env.APACHE_HOME}
apache13.serverLibraryName = axiscpp_mod
## Values used for Apache 2.0
apache20.dir.server = ${env.APACHE2_HOME}
apache20.serverLibraryName = axiscpp_mod2
# Name for compiled Apache plugin library - excluding any prefix or suffix
# eg: For Windows : axis_apache will produce axis_apache.dll
# For Unix : axis_apache will produce libaxis_apache.so
serverLibraryName = mod_axis
###########################
# Location of output tree #
###########################
dir.obj = ${basedir}/../../../obj
####################
# Trace Properties #
####################
# Instrument the Axis C++ source code with entry/exit trace
dir.src.instrumented = ${dir.obj}/src
#######################################
# Properties for compiling C/C++ code #
#######################################
# Directory in which to place compiled libraries
dir.bin = ${dir.obj}/bin
# Directory in which to place object files
dir.objects = ${dir.obj}/objects
####################################
# Properties for compiling WSDL2Ws #
####################################
# Location of Axis JARs
dir.axisJARs = ${env.AXISJAVA_LIB}
# Directory in which to place compiled Java classes
dir.classes = ${dir.obj}/classes
###########################################
# Properties for packaging Binary release #
###########################################
release = axis-c-${version}-${platform}
dir.release = ${dir.obj}/package/${release}
###############################
# Properties for Deliverables #
###############################
dir.zips = ${basedir}/../../../zips
########################################
# Location of wsdl2ws for Deliverables #
########################################
dir.wsdl2ws = ${dir.release}-bin/lib/axis
############################################
# Properties for building and running test #
############################################
# Directory in which to place all generated test artifacts
# This is also the directory in which code is built and run
dir.test.generated = ${dir.obj}/test/generated
# Log files for test results
results.log = ${dir.test.generated}/results.log
# Directory containing Axis C libraries
# For Windows the packaged product has the .DLLs in the PACKAGE\bin
# directory and the .LIBs in the PACKAGE\lib\axis directory
# but at build time they are all in dir.bin
# For Unix .so files are used for compiling and running so only
# 1 directory is needed
# dir.libraries the location of the libraries needed for running the client
# i.e. the DLLs
# dir.lib the location of the libraries needed for compiling the client
# Use these properties so they can easily be overridden when testing the
# packaged product
dir.libraries = ${dir.bin}
dir.lib = ${dir.bin}
# May want to uncomment for testing so the build output is used
#dir.include = ${dir.package.include}
# If only a single language is required then set it here.
# Valid values are cpp or c. Default if unset is both.
target.lang = cpp
# AXISCPP_DEPLOY directory
axiscpp_deploy = ${dir.test.generated}
# Details of server to be used for testing clients
testHost = localhost
testPort = 8080
monitorPort = 13260
# details of HTTP proxy for any proxy tests
proxy.host=myProxy
proxy.port=8080
1.66 +2 -2 ws-axis/c/src/common/AxisConfig.cpp
Index: AxisConfig.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- AxisConfig.cpp 24 May 2005 14:15:00 -0000 1.65
+++ AxisConfig.cpp 27 Jun 2005 13:51:52 -0000 1.66
@@ -70,7 +70,7 @@
char *sConfPath = NULL;
char sNewConfPath[CONFBUFFSIZE];
char key[CONFBUFFSIZE];
- int iValueLength = 0;
+ long iValueLength = 0;
const char *pcSeparator = ":";
const char pcComment = '#';
@@ -103,7 +103,7 @@
while (AXIS_SUCCESS == fileConfig.fileGet (carrLine, CONFBUFFSIZE))
{
- int linesize = strlen (carrLine);
+ long linesize = strlen (carrLine);
// Ignore lines starting with # and empty lines
if (carrLine[0] == pcComment || carrLine[0] == '\0')
1.63 +1 -1 ws-axis/c/src/common/AxisTrace.cpp
Index: AxisTrace.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- AxisTrace.cpp 16 Jun 2005 10:58:44 -0000 1.62
+++ AxisTrace.cpp 27 Jun 2005 13:51:52 -0000 1.63
@@ -188,7 +188,7 @@
char *envVars[]={"PATH","LIBPATH","LD_LIBRARY_PATH","AXISCPP_DEPLOY","PWD",
"CLASSPATH","INCLUDE","LIB","NLSPATH","OS","COMPUTERNAME","USERNAME",
"HOSTNAME","LANG","LOGIN","LOGNAME","MACHTYPE","OSTYPE","UID","USER"};
- for (unsigned i=0; i<sizeof(envVars)/4; i++)
+ for (unsigned i=0; i<(sizeof(envVars)/sizeof(char*)); i++)
{
text = envVars[i];
const char *value = getenv(envVars[i]);
1.18 +1 -1 ws-axis/c/src/soap/SoapAttachment.cpp
Index: SoapAttachment.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapAttachment.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SoapAttachment.cpp 23 Jun 2005 12:18:24 -0000 1.17
+++ SoapAttachment.cpp 27 Jun 2005 13:51:52 -0000 1.18
@@ -112,7 +112,7 @@
string attachBody = m_binaryBody;
- int boundary = attachBody.find("------=_Part_0_6349096.11054186923",0);
+ long boundary = attachBody.find("------=_Part_0_6349096.11054186923",0);
if (boundary != -1)
{
string attachment = attachBody.substr(0,(boundary-1));
1.19 +2 -2 ws-axis/c/src/soap/xsd/DateTime.cpp
Index: DateTime.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/DateTime.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DateTime.cpp 1 Jun 2005 14:22:56 -0000 1.18
+++ DateTime.cpp 27 Jun 2005 13:51:52 -0000 1.19
@@ -159,7 +159,7 @@
+ (localTime.tm_hour * 60)
+ localTime.tm_min;
- int timeOffsetInMinutes = localTimeInMinutes - utcTimeInMinutes;
+ int timeOffsetInMinutes = (int) (localTimeInMinutes - utcTimeInMinutes);
if (timeOffsetInMinutes == 0)
{
@@ -257,7 +257,7 @@
cTemp2 = const_cast<char*>(strpbrk (valueAsChar, "T"));
cTemp3 = strrchr (cTemp2, ':');
cTemp3[0] = '\0';
- unsigned int len = strlen (cTemp2);
+ unsigned long len = strlen (cTemp2);
cTemp3[0] = ':';
/*if the timezone is represented adding 'Z' at the end */
1.8 +4 -4 ws-axis/c/src/soap/xsd/IAnySimpleType.cpp
Index: IAnySimpleType.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/IAnySimpleType.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IAnySimpleType.cpp 1 Jun 2005 14:22:56 -0000 1.7
+++ IAnySimpleType.cpp 27 Jun 2005 13:51:52 -0000 1.8
@@ -106,7 +106,7 @@
/* Find entity reference characters and returns the first any of chars find
* position
*/
- unsigned int nPos = value.find_first_of (XML_ENTITY_REFERENCE_CHARS);
+ unsigned long nPos = value.find_first_of (XML_ENTITY_REFERENCE_CHARS);
/* Check for position validity */
if (AxisString::npos == nPos)
@@ -114,7 +114,7 @@
return value;
}
- int nOldIdx = 0; // Counter value
+ unsigned long nOldIdx = 0; // Counter value
while (AxisString::npos != nPos)
{ // Get pointered character
switch (value.at (nPos))
@@ -147,8 +147,8 @@
nPos = value.find_first_of (XML_ENTITY_REFERENCE_CHARS, nPos);
}
- int nDataLen = value.length (); // Get the length of the field value
- int nLen = nDataLen - nOldIdx; // Get remaining number of characters
+ unsigned long nDataLen = value.length (); // Get the length of the field value
+ unsigned long nLen = nDataLen - nOldIdx; // Get remaining number of characters
if (nLen > 0)
{
m_strReturnVal += value.substr (nOldIdx, nLen); /* Apend the remaining
1.6 +8 -8 ws-axis/c/src/soap/xsd/constraints/WhiteSpace.cpp
Index: WhiteSpace.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/WhiteSpace.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WhiteSpace.cpp 23 Mar 2005 15:45:02 -0000 1.5
+++ WhiteSpace.cpp 27 Jun 2005 13:51:53 -0000 1.6
@@ -82,7 +82,7 @@
/* Find white space characters and returns the first any of chars find
* position
*/
- unsigned int nPos = value.find_first_of (WHITE_SPACE_CHARS);
+ unsigned long nPos = value.find_first_of (WHITE_SPACE_CHARS);
/* Check for position validity */
if (AxisString::npos == nPos)
@@ -90,7 +90,7 @@
return value;
}
- int nOldIdx = 0; // Counter value
+ unsigned long nOldIdx = 0; // Counter value
while (AxisString::npos != nPos)
{ // Get pointered character
m_strReturnVal.append (value.substr (nOldIdx, nPos - nOldIdx));
@@ -105,8 +105,8 @@
nPos = value.find_first_of (WHITE_SPACE_CHARS, nPos);
}
- int nDataLen = value.length (); // Get the length of the field value
- int nLen = nDataLen - nOldIdx; // Get remaining number of characters
+ unsigned long nDataLen = value.length (); // Get the length of the field value
+ unsigned long nLen = nDataLen - nOldIdx; // Get remaining number of characters
if (nLen > 0)
{
/*
@@ -149,7 +149,7 @@
* Find space character and returns the first any of chars find
* position
*/
- unsigned int nPos = replacedValue.find_first_of (' ');
+ unsigned long nPos = replacedValue.find_first_of (' ');
/* Check for position validity */
if (AxisString::npos == nPos)
@@ -158,7 +158,7 @@
return m_strReturnVal;
}
- int nOldIdx = 0; // Counter value
+ unsigned long nOldIdx = 0; // Counter value
while (AxisString::npos != nPos)
{
m_strReturnVal.append (replacedValue.substr (nOldIdx, nPos - nOldIdx));
@@ -181,8 +181,8 @@
nPos = replacedValue.find_first_of (' ', nPos);
}
- int nDataLen = replacedValue.length (); // Get the length of the field value
- int nLen = nDataLen - nOldIdx; // Get remaining number of characters
+ unsigned long nDataLen = replacedValue.length (); // Get the length of the field value
+ unsigned long nLen = nDataLen - nOldIdx; // Get remaining number of characters
if (nLen > 0)
{
/*
1.35 +13 -13 ws-axis/c/src/transport/axis3/HTTPTransport.cpp
Index: HTTPTransport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPTransport.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- HTTPTransport.cpp 16 Jun 2005 13:27:10 -0000 1.34
+++ HTTPTransport.cpp 27 Jun 2005 13:51:53 -0000 1.35
@@ -468,7 +468,7 @@
if( !m_bReadPastHTTPHeaders)
{
- unsigned int start = std::string::npos;
+ unsigned long start = std::string::npos;
iIterationCountdown = 100;
@@ -549,7 +549,7 @@
//now we have found the end of headers
m_bReadPastHTTPHeaders = true;
- unsigned int pos = 0;
+ unsigned long pos = 0;
// Look for content lenght
if( (pos = m_strReceived.find( ASCII_S_CONTENT_LENGTH )) != std::string::npos)
@@ -649,7 +649,7 @@
*/
// firstly read in the chunk size line.
//There might be chunk extensions in there too but we may not need them
- unsigned int endOfChunkData = m_strReceived.find( ASCII_S_CRLF );
+ unsigned long endOfChunkData = m_strReceived.find( ASCII_S_CRLF );
// make sure we have read at least some part of the message
if( endOfChunkData == std::string::npos)
@@ -681,7 +681,7 @@
"Timed out waiting for SOAP message (1).");
}
- int endOfChunkSize = endOfChunkData;
+ unsigned long endOfChunkSize = endOfChunkData;
// now get the size of the chunk from the data
// look to see if there are any extensions - these are put in brackets so look for those
@@ -737,7 +737,7 @@
// The format we are expecting here is:
// <previous chunk>\r\n<chunk size>\r\n<next chunk>
- unsigned int endOfChunkData = m_strReceived.find( ASCII_S_CRLF );
+ unsigned long endOfChunkData = m_strReceived.find( ASCII_S_CRLF );
iIterationCountdown = 100;
@@ -797,7 +797,7 @@
"Timed out waiting for SOAP message (3).");
}
- int endOfChunkSize = endOfChunkData;
+ unsigned long endOfChunkSize = endOfChunkData;
// look to see if there are any extensions - these are put in brackets so look for those
if (m_strReceived.substr (0, endOfChunkData).find ( ASCII_S_LEFTPAREN ) != string::npos)
@@ -1292,8 +1292,8 @@
*/
void HTTPTransport::processResponseHTTPHeaders() throw (HTTPTransportException)
{
- unsigned int iPosition = std::string::npos;
- unsigned int iStartPosition = iPosition;
+ unsigned long iPosition = std::string::npos;
+ unsigned long iStartPosition = iPosition;
if( (iPosition = m_strResponseHTTPHeaders.find( ASCII_S_HTTP )) != std::string::npos)
{
@@ -1339,7 +1339,7 @@
}
std::string strHeaderLine = m_strResponseHTTPHeaders.substr( 0, iPosition);
- unsigned int iSeperator = strHeaderLine.find( ASCII_S_COLON );
+ unsigned long iSeperator = strHeaderLine.find( ASCII_S_COLON );
if( iSeperator == std::string::npos)
{
@@ -1471,7 +1471,7 @@
// which contain the soap message
m_strReceived = m_strReceived.substr( m_strReceived.find( ASCII_S_CRLFCRLF ) + 4);
- unsigned int intMimeTemp = m_strReceived.find( m_strMimeBoundary);
+ unsigned long intMimeTemp = m_strReceived.find( m_strMimeBoundary);
if (intMimeTemp != std::string::npos)
{
@@ -1485,7 +1485,7 @@
}
else
{
- unsigned int intMimeTemp = m_strReceived.find( m_strMimeBoundary);
+ unsigned long intMimeTemp = m_strReceived.find( m_strMimeBoundary);
if( intMimeTemp != std::string::npos)
{
@@ -1506,8 +1506,8 @@
*/
void HTTPTransport::processMimeHeader()
{
- unsigned int pos = 0;
- unsigned int temppos = 0;
+ unsigned long pos = 0;
+ unsigned long temppos = 0;
// Look for content lenght
if( (pos = m_strMimeReceived.find( "Content-Type: ")) != std::string::npos)
1.53 +4 -0 ws-axis/c/vc/AxisClientDLL.dsp
Index: AxisClientDLL.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/AxisClientDLL.dsp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- AxisClientDLL.dsp 15 Jun 2005 13:37:31 -0000 1.52
+++ AxisClientDLL.dsp 27 Jun 2005 13:51:53 -0000 1.53
@@ -202,6 +202,10 @@
# End Source File
# Begin Source File
+SOURCE=..\src\soap\ContentIdSet.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\src\soap\xsd\Date.cpp
# End Source File
# Begin Source File