axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From di...@apache.org
Subject cvs commit: ws-axis/c/build executeTest.xml
Date Wed, 15 Jun 2005 10:59:52 GMT
dicka       2005/06/15 03:59:52

  Modified:    c/build  executeTest.xml
  Log:
  Small modification to test framework, so that the SSL channel is only set in the generated
axiscpp.conf if the individual test specifies to do so.
  
  PR: AXISCPP-684
  Submitted by: Adrian Dick
  
  Revision  Changes    Path
  1.34      +7 -22     ws-axis/c/build/executeTest.xml
  
  Index: executeTest.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/executeTest.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- executeTest.xml	15 Jun 2005 10:46:35 -0000	1.33
  +++ executeTest.xml	15 Jun 2005 10:59:52 -0000	1.34
  @@ -271,15 +271,6 @@
   			<istrue value="${testconf.client.parser.xerces}"/>
   		</condition>
   
  -		<!-- Decide whether the Channel_HTTP_SSL directive should be 
  -		commented according to build.PLATFORM.properties -->
  -		<condition property="commentSSLDirective" value="#">
  -			<isfalse value="${HTTP.SSLChannel}"/>
  -		</condition>
  -		<condition property="commentSSLDirective" value="">
  -			<istrue value="${HTTP.SSLChannel}"/>
  -		</condition>
  -
   		<echo file="${axiscpp.conf}">#Available directives are as follows:
   #
   # ClientLogPath:	 The path to the client log
  @@ -304,22 +295,16 @@
   		</if>
   		<echo file="${axiscpp.conf}" append="true">
   Transport_http:${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}
  -#XMLParser:${dir.libraries}/${libraryPrefix}${xmlParserLibraryName}${librarySuffix}
   XMLParser:${dir.libraries}/${ClientParserLib}
   Channel_HTTP:${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}
   </echo>
  -<if>
  -	<istrue value="${test.ssl}" />
  -<then>
  -   <echo file="${axiscpp.conf}" append="true">Channel_HTTP_SSL:${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
  -   </echo>	
  -</then>
  -<else>  
  -	<echo file="${axiscpp.conf}" append="true">
  -${commentSSLDirective}Channel_HTTP_SSL:${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
  -	</echo>
  -</else>
  -</if>
  +        <if>
  +            <istrue value="${test.ssl}" />
  +            <then>
  +                <echo file="${axiscpp.conf}" append="true">Channel_HTTP_SSL:${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
  +</echo>	
  +            </then>
  +        </if>
   	</target>
   </project>
   
  
  
  

Mime
View raw message