sanjaya 2005/03/29 04:35:50
Modified: c/build executeTest.xml
Log:
1.Changed the value of XMLParser directive of axiscpp.conf to use parer lib
specified by build.PLATFORM.properties 2. Added changes to write a comment (#)
character for Channel_HTTP_SSL directive in axiscpp.conf when the
build.PLATFORM.properties specifies not to build SSL transport channel
Revision Changes Path
1.22 +21 -2 ws-axis/c/build/executeTest.xml
Index: executeTest.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/executeTest.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- executeTest.xml 18 Mar 2005 12:25:48 -0000 1.21
+++ executeTest.xml 29 Mar 2005 12:35:50 -0000 1.22
@@ -155,6 +155,24 @@
<dirname file="${axiscpp.conf}" property="confFileDirectory"/>
<mkdir dir="${confFileDirectory}"/>
+
+ <!-- Select which parser library to use -->
+ <condition property="ClientParserLib"
value="${libraryPrefix}${xml4c.xmlParserLibraryName}${librarySuffix}">
+ <istrue value="${testconf.client.parser.xml4c}"/>
+ </condition>
+ <condition property="ClientParserLib"
value="${libraryPrefix}${xerces.xmlParserLibraryName}${librarySuffix}">
+ <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
@@ -179,9 +197,10 @@
</if>
<echo file="${axiscpp.conf}" append="true">
Transport_http:${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}
-XMLParser:${dir.libraries}/${libraryPrefix}${xmlParserLibraryName}${librarySuffix}
+#XMLParser:${dir.libraries}/${libraryPrefix}${xmlParserLibraryName}${librarySuffix}
+XMLParser:${dir.libraries}/${ClientParserLib}
Channel_HTTP:${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}
-Channel_HTTP_SSL:${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
+${commentSSLDirective}Channel_HTTP_SSL:${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}
</echo>
</target>
