axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prest...@apache.org
Subject cvs commit: ws-axis/c/build build.AIX.properties build.Linux.properties build.OS400.properties build.SunOS.properties build.Win32.properties executeTest.xml buildSSLChannel.xml
Date Fri, 21 Jan 2005 14:56:13 GMT
prestonf    2005/01/21 06:56:13

  Modified:    c/build  build.AIX.properties build.Linux.properties
                        build.OS400.properties build.SunOS.properties
                        build.Win32.properties executeTest.xml
                        buildSSLChannel.xml
  Log:
  Hi All,
  These are modifications needed for the draft of the new http transport implementation AXIS3
(see AXISCPP-361).
  Regards,
  Fred Preston.
  
  Revision  Changes    Path
  1.14      +5 -5      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.AIX.properties	20 Jan 2005 19:49:16 -0000	1.13
  +++ build.AIX.properties	21 Jan 2005 14:56:13 -0000	1.14
  @@ -73,27 +73,27 @@
   # Channel Properties #
   ######################
   
  -channel.HTTP = true
  +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
  +HTTP.ChannelLibraryName = http_channel
   
   #############################
   # Secure Channel Properties #
   #############################
   
  -SSLchannel.HTTP = true
  +HTTP.SSLChannel = true
   
  -SSLChannel.HTTP.dir.openSSL = ${env.OPENSSL_HOME}
  +HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
   
   # 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
  +HTTP.SecureChannelLibraryName = http_channelssl
   
   #####################
   # Client Properties #
  
  
  
  1.16      +5 -5      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.Linux.properties	20 Jan 2005 19:49:16 -0000	1.15
  +++ build.Linux.properties	21 Jan 2005 14:56:13 -0000	1.16
  @@ -73,27 +73,27 @@
   # Channel Properties #
   ######################
   
  -channel.HTTP = true
  +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
  +HTTP.ChannelLibraryName = http_channel
   
   #############################
   # Secure Channel Properties #
   #############################
   
  -SSLchannel.HTTP = true
  +HTTP.SSLChannel = true
   
  -SSLChannel.HTTP.dir.openSSL = ${env.OPENSSL_HOME}
  +HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
   
   # 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
  +HTTP.SecureChannelLibraryName = http_channelssl
   
   #####################
   # Client Properties #
  
  
  
  1.13      +5 -5      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.OS400.properties	20 Jan 2005 19:49:16 -0000	1.12
  +++ build.OS400.properties	21 Jan 2005 14:56:13 -0000	1.13
  @@ -73,27 +73,27 @@
   # Channel Properties #
   ######################
   
  -channel.HTTP = true
  +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
  +HTTP.ChannelLibraryName = http_channel
   
   #############################
   # Secure Channel Properties #
   #############################
   
  -SSLchannel.HTTP = true
  +HTTP.SSLchannel = true
   
  -SSLChannel.HTTP.dir.openSSL = ${env.OPENSSL_HOME}
  +HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
   
   # 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
  +HTTP.SecureChannelLibraryName = http_channelssl
   
   #####################
   # Client Properties #
  
  
  
  1.14      +5 -5      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.SunOS.properties	20 Jan 2005 19:49:16 -0000	1.13
  +++ build.SunOS.properties	21 Jan 2005 14:56:13 -0000	1.14
  @@ -73,27 +73,27 @@
   # Channel Properties #
   ######################
   
  -channel.HTTP = true
  +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
  +HTTP.ChannelLibraryName = http_channel
   
   #############################
   # Secure Channel Properties #
   #############################
   
  -SSLchannel.HTTP = true
  +HTTP.SSLChannel = true
   
  -SSLChannel.HTTP.dir.openSSL = ${env.OPENSSL_HOME}
  +HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
   
   # 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
  +HTTP.SecureChannelLibraryName = http_channelssl
   
   #####################
   # Client Properties #
  
  
  
  1.12      +5 -5      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.Win32.properties	20 Jan 2005 19:49:16 -0000	1.11
  +++ build.Win32.properties	21 Jan 2005 14:56:13 -0000	1.12
  @@ -73,27 +73,27 @@
   # Channel Properties #
   ######################
   
  -channel.HTTP = true
  +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 = HTTPChannel
  +HTTP.ChannelLibraryName = HTTPChannel
   
   #############################
   # Secure Channel Properties #
   #############################
   
  -SSLchannel.HTTP = true
  +HTTP.SSLchannel = true
   
  -SSLChannel.HTTP.dir.openSSL = ${env.OPENSSL_HOME}
  +HTTP.SSLChannel.dir = ${env.OPENSSL_HOME}
   
   # 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 = HTTPSSLChannel
  +HTTP.SecureChannelLibraryName = HTTPSSLChannel
   
   #####################
   # Client Properties #
  
  
  
  1.8       +5 -5      ws-axis/c/build/executeTest.xml
  
  Index: executeTest.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/executeTest.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- executeTest.xml	18 Jan 2005 11:06:17 -0000	1.7
  +++ executeTest.xml	21 Jan 2005 14:56:13 -0000	1.8
  @@ -82,9 +82,9 @@
   						 output="${results.stdout}" error="${results.stderr}"
   						 failifexecutionfails="false" vmlauncher="false">
   							<arg line="${clientArgs}"/>
  -							<env key="PATH" path="${java.library.path}${path.separator}${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${dir.gskit}/lib"/>
  -							<env key="LD_LIBRARY_PATH" path="${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${dir.gskit}/lib"/>
  -							<env key="LIBPATH" path="${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${dir.gskit}/lib"/>
  +							<env key="PATH" path="${java.library.path}${path.separator}${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${HTTP.SSLChannel.dir}/lib"/>
  +							<env key="LD_LIBRARY_PATH" path="${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${HTTP.SSLChannel.dir}/lib"/>
  +							<env key="LIBPATH" path="${dir.libraries}${path.separator}${dir.xmlParser}${path.separator}${HTTP.SSLChannel.dir}/lib"/>
   							<env key="AXISCPP_DEPLOY" value="${axiscpp_deploy}"/>
   						</exec>
   						<stopwatch name="${testName}.timer" action="total"/>
  @@ -130,8 +130,8 @@
   ClientLogPath:${test.directory}/ClientLog
   Transport_http:${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}
   XMLParser:${dir.libraries}/${libraryPrefix}${xmlParserLibraryName}${librarySuffix}
  -Channel_HTTP:${dir.libraries}/${libraryPrefix}${HTTP.channelLibraryName}${librarySuffix}
  -Channel_HTTP_SSL:${dir.libraries}/${libraryPrefix}${HTTP.secureChannelLibraryName}${librarySuffix}
  +Channel_HTTP:${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}
  +Channel_HTTP_SSL:${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
   
   </echo>
   	</target>
  
  
  
  1.2       +2 -2      ws-axis/c/build/buildSSLChannel.xml
  
  Index: buildSSLChannel.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildSSLChannel.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- buildSSLChannel.xml	14 Jan 2005 16:10:38 -0000	1.1
  +++ buildSSLChannel.xml	21 Jan 2005 14:56:13 -0000	1.2
  @@ -18,7 +18,7 @@
               <cc outfile="${dir.bin}/${channelLibraryName}" objdir="${dir.objects}" 
                exceptions="true" outtype="shared" multithreaded="true">
                  <!-- Compilers -->
  -               <includepath path="${SSLChannel.HTTP.dir.openSSL}"/>
  +               <includepath path="${HTTP.SSLChannel.dir}"/>
                  <compiler refid="SolarisCC"/>
                  <compiler refid="Linuxgcc"/>
                  <compiler extends="VisualC++">
  @@ -39,7 +39,7 @@
                  <linker refid="LinuxLinker"/>
                  <linker extends="VisualC++Linker">
                     <syslibset libs="wsock32"/>
  -                  <syslibset libs="ssleay32,libeay32" dir="${SSLChannel.HTTP.dir.openSSL}/lib"/>
  +                  <syslibset libs="ssleay32,libeay32" dir="${HTTP.SSLChannel.dir}/lib"/>
                  </linker>
   
                  <linker refid="OS400Linker"/>
  
  
  

Mime
View raw message