axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r713843 - in /webservices/axis/trunk/c: build/ include/axis/
Date Thu, 13 Nov 2008 22:23:40 GMT
Author: nadiramra
Date: Thu Nov 13 14:23:39 2008
New Revision: 713843

URL: http://svn.apache.org/viewvc?rev=713843&view=rev
Log:
AXISCPP-100 enable axis c++ (engine) tracing

Modified:
    webservices/axis/trunk/c/build/buildChannel.xml
    webservices/axis/trunk/c/build/buildClient.xml
    webservices/axis/trunk/c/build/buildLibrary.xml
    webservices/axis/trunk/c/build/buildSSLChannel.xml
    webservices/axis/trunk/c/build/buildServerEngine.xml
    webservices/axis/trunk/c/build/buildTools.xml
    webservices/axis/trunk/c/build/buildTransport.xml
    webservices/axis/trunk/c/build/buildXMLParser.xml
    webservices/axis/trunk/c/build/executeTest.xml
    webservices/axis/trunk/c/include/axis/Axis.h
    webservices/axis/trunk/c/include/axis/Axis.hpp

Modified: webservices/axis/trunk/c/build/buildChannel.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildChannel.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildChannel.xml (original)
+++ webservices/axis/trunk/c/build/buildChannel.xml Thu Nov 13 14:23:39 2008
@@ -3,27 +3,27 @@
    <!--
     Compile the Axis HTTP Transport Channel Library
     -->
-	 <target name="compileAxisHTTPTransportChannel">
+     <target name="compileAxisHTTPTransportChannel">
       <mkdir dir="${dir.objects}"/>
       <mkdir dir="${dir.bin}"/>
       <antcall target="buildVersionResource" inheritall="true">
           <param name="internalName" value="${channelLibraryName}"/>
       </antcall>
 <if>
-	<equals arg1="${transport.HTTP.ipv6}" arg2="true" casesensitive="false"/>
-	<then>
-		<property name="IPV6" value="true"/>
-	</then>
+    <equals arg1="${transport.HTTP.ipv6}" arg2="true" casesensitive="false"/>
+    <then>
+        <property name="IPV6" value="true"/>
+    </then>
 </if>
       <if>
          <not>
             <isset property="aix"/>
          </not>
          <then>
-				<!--
-				  Library name may have been change if windows debug build. Changed
-				  in buildInitialize.xml
-				  -->
+                <!--
+                  Library name may have been change if windows debug build. Changed
+                  in buildInitialize.xml
+                  -->
             <cc outfile="${dir.bin}/${channelLibraryName}" objdir="${dir.objects}"
              exceptions="true" outtype="shared" multithreaded="true">
                <!-- Compilers -->
@@ -37,26 +37,25 @@
                   </defineset>
                </compiler>
                <defineset>
-                  <define name="ENABLE_AXISTRACE" if="trace"/>
-                  <define name="AXISTRACE_LIBRARY"/>
-			<define name="IPV6" if="IPV6"/>
+                  <define name="IPV6" if="IPV6"/>
                </defineset>
-                              <compiler refid="OS400icc"/>
+               <compiler refid="OS400icc"/>
+            	
                <!-- Linkers -->
                <linker refid="SolarisLinker"/>
                <linker refid="LinuxLinker"/>
                <linker refid="HP-UXLinker"/>
                <linker extends="VisualC++Linker">
-                  <syslibset libs="wsock32"/>
+               <syslibset libs="wsock32"/>
                </linker>
-                              <linker refid="OS400Linker"/>
+               <linker refid="OS400Linker"/>
                <!-- Files to compile -->
                <fileset dir="${dir.src}">
                   <include name="transport/${transport}/${channel}/*.cpp"/>
                   <include name="platforms/os400/PlatformSpecificOS400.cpp" if="os400"/>
                   <include name="platforms/windows/PlatformSpecificWindows.cpp" if="windows"/>
-		  <include name="transport/${transport}/HTTPTransportException.cpp"/>
-		  <include name="transport/${transport}/URL.cpp"/>
+                  <include name="common/AxisTrace.cpp"/>
+                  <include name="transport/${transport}/URL.cpp"/>
                </fileset>
             </cc>
          </then>
@@ -66,9 +65,7 @@
                <!-- Compilers -->
                <compiler refid="AIXxlc"/>
                <defineset>
-                  <define name="ENABLE_AXISTRACE" if="trace"/>
-                  <define name="AXISTRACE_LIBRARY"/>
-			<define name="IPV6" if="IPV6"/>
+                  <define name="IPV6" if="IPV6"/>
                </defineset>
 
                <!-- Linkers -->
@@ -76,8 +73,8 @@
                <!-- Files to compile -->
                <fileset dir="${dir.src}">
                   <include name="transport/${transport}/${channel}/*.cpp"/>
-		  <include name="transport/${transport}/HTTPTransportException.cpp"/>
-		  <include name="transport/${transport}/URL.cpp"/>
+                  <include name="common/AxisTrace.cpp"/>
+                  <include name="transport/${transport}/URL.cpp"/>
                </fileset>
             </cc>
          </else>

Modified: webservices/axis/trunk/c/build/buildClient.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildClient.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildClient.xml (original)
+++ webservices/axis/trunk/c/build/buildClient.xml Thu Nov 13 14:23:39 2008
@@ -34,7 +34,6 @@
 					<!-- Additional compiler flag for Client library on all platforms -->
 					<defineset>
 						<define name="AXIS_CLIENT_LIB"/>
-						<define name="ENABLE_AXISTRACE" if="trace"/>
 					</defineset>
 					<!-- Linkers -->
 					<linker refid="SolarisLinker"/>
@@ -72,7 +71,6 @@
 					<!-- Additional compiler flag for Client library on all platforms -->
 					<defineset>
 						<define name="AXIS_CLIENT_LIB"/>
-						<define name="ENABLE_AXISTRACE" if="trace"/>
 					</defineset>
 					<!-- Linkers -->
 					<linker refid="AIXLinker"/>

Modified: webservices/axis/trunk/c/build/buildLibrary.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildLibrary.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildLibrary.xml (original)
+++ webservices/axis/trunk/c/build/buildLibrary.xml Thu Nov 13 14:23:39 2008
@@ -15,10 +15,6 @@
 				<compiler refid="Linuxgcc"/>
 				<compiler refid="HP-UXaC++"/>
 				<compiler extends="VisualC++"/>
-				<defineset>
-					<define name="ENABLE_AXISTRACE" if="trace"/>
-					<define name="AXISTRACE_LIBRARY"/>
-				</defineset>
 				<compiler refid="OS400icc"/>
 				<!-- Linkers -->
 				<linker refid="SolarisLinker"/>
@@ -41,10 +37,6 @@
 				exceptions="true" multithreaded="true">
 				<!-- Compilers -->
 				<compiler refid="AIXxlc"/>
-				<defineset>
-					<define name="ENABLE_AXISTRACE" if="trace"/>
-					<define name="AXISTRACE_LIBRARY"/>
-				</defineset>
 
 				<!-- Linkers -->
 				<linker refid="AIXLinker"/>

Modified: webservices/axis/trunk/c/build/buildSSLChannel.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildSSLChannel.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildSSLChannel.xml (original)
+++ webservices/axis/trunk/c/build/buildSSLChannel.xml Thu Nov 13 14:23:39 2008
@@ -55,8 +55,6 @@
 		<syslibset libs="${HTTP.SSLChannel.libs}" dir="${HTTP.SSLChannel.dir}/out32dll" if="windows"/>
 		<syslibset libs="${HTTP.SSLChannel.libs}" dir="${HTTP.SSLChannel.dir}/lib" unless="windows"/>
                <defineset>
-                  <define name="ENABLE_AXISTRACE" if="trace"/>
-                  <define name="AXISTRACE_LIBRARY"/>
                   <define name="HTTPSSLCHANNEL_EXPORTS"/>
                   <define name="OPENSSL_NO_KRB5"/>
                   <define name="HEADER_DES_H"/>
@@ -77,8 +75,8 @@
                   <include name="transport/${transport}/${channel}/*.cpp"/>
                   <include name="platforms/os400/PlatformSpecificOS400.cpp" if="os400"/>
                   <include name="platforms/windows/PlatformSpecificWindows.cpp" if="windows"/>
-		  <include name="transport/${transport}/HTTPTransportException.cpp"/>
-		  <include name="transport/${transport}/URL.cpp"/>
+                  <include name="common/AxisTrace.cpp"/>
+		          <include name="transport/${transport}/URL.cpp"/>
                </fileset>
             </cc>
          </then>
@@ -89,8 +87,6 @@
                <!-- Compilers -->
                <compiler refid="AIXxlc"/>
                <defineset>
-                  <define name="ENABLE_AXISTRACE" if="trace"/>
-                  <define name="AXISTRACE_LIBRARY"/>
                   <define name="HTTPSSLCHANNEL_EXPORTS"/>
                   <define name="OPENSSL_NO_KRB5"/>
                   <define name="HEADER_DES_H"/>
@@ -104,8 +100,8 @@
                <!-- Files to compile -->
                <fileset dir="${dir.src}">
                   <include name="transport/${transport}/${channel}/*.cpp"/>
-		  <include name="transport/${transport}/HTTPTransportException.cpp"/>
-		  <include name="transport/${transport}/URL.cpp"/>
+		          <include name="transport/${transport}/URL.cpp"/>
+                  <include name="common/AxisTrace.cpp"/>
                </fileset>
             </cc>
          </else>

Modified: webservices/axis/trunk/c/build/buildServerEngine.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildServerEngine.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildServerEngine.xml (original)
+++ webservices/axis/trunk/c/build/buildServerEngine.xml Thu Nov 13 14:23:39 2008
@@ -26,10 +26,7 @@
 						</defineset>
 					</compiler>
                     <compiler refid="OS400icc"/>
-					<!-- Additional compiler flag for Client library on all platforms -->
-					<defineset>
-						<define name="ENABLE_AXISTRACE" if="trace"/>
-					</defineset>
+
 					<!-- Linkers -->
 					<linker refid="SolarisLinker"/>
 					<linker refid="LinuxLinker"/>
@@ -62,10 +59,7 @@
 				 exceptions="true" multithreaded="true">
 				  	<!-- Compilers -->
 					<compiler refid="AIXxlc"/>
-					<!-- Additional compiler flag for Client library on all platforms -->
-					<defineset>
-						<define name="ENABLE_AXISTRACE" if="trace"/>
-					</defineset>
+
 					<!-- Linkers -->
 					<linker refid="AIXLinker"/>
 					<!-- Files to be compiled -->

Modified: webservices/axis/trunk/c/build/buildTools.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildTools.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildTools.xml (original)
+++ webservices/axis/trunk/c/build/buildTools.xml Thu Nov 13 14:23:39 2008
@@ -17,39 +17,9 @@
 	</target>
 	
 	<!--
-	  Compile, package and run the trace tool
-	  -->
-	<target name="addTrace" depends="buildTools"
-	  description="Run the trace tool">
-		<!--  Ensure that the  directories are clean -->
-		<delete dir="${dir.src.instrumented}"/>
-
-		<path id ="tracecp">
-			<fileset dir="${dir.classes}" includes="buildtools.jar"/>
-		</path>
-
-		<!-- Allow caller to override the config filename -->
-		<property name="trace.config.file" value="${dir.tools}/org/apache/axis/tools/trace/tracetool.conf"/>
-
-		<java classname="org.apache.axis.tools.trace.TraceInstrumentor" fork="true" failonerror="true">
-                  <classpath refid="tracecp"/>
-			<arg value="-config"/>
-			<arg value="${trace.config.file}"/>
-			<arg value="-include"/>
-			<arg value="${dir.src}"/>
-			<arg value="-include"/>
-			<arg value="${dir.include}"/>
-			<arg value="-source"/>
-			<arg value="${dir.src}"/>
-			<arg value="-target"/>
-			<arg value="${dir.src.instrumented}"/>
-		</java>
-      </target>
-
-	<!--
 	  Compile, package and run the C binding generator
 	  -->
-	<target name="buildCBindings" depends="generateCHeaders, compileCBindings" if="buildCBindings"
+	<target name="buildCBindings" depends="compileCBindings" if="buildCBindings"
 	  description="Generate the C bindings and compile and link the C bindings client library"/>
 
 	<target name="generateCHeaders" depends="buildTools"  if="buildCBindings"
@@ -100,7 +70,6 @@
 					<!-- Additional compiler flag for Client library on all platforms -->
 					<defineset>
 						<define name="AXIS_CLIENTC_LIB"/>
-						<define name="ENABLE_AXISTRACE" if="trace"/>
 					</defineset>
 					<includepath path="${dir.include}${path.separator}${dir.obj}/include"/>
 					<!-- Linkers -->
@@ -129,7 +98,6 @@
 					<!-- Additional compiler flag for Client library on all platforms -->
 					<defineset>
 						<define name="AXIS_CLIENTC_LIB"/>
-						<define name="ENABLE_AXISTRACE" if="trace"/>
 					</defineset>
 					<includepath path="${dir.include}${path.separator}${dir.obj}/include"/>
 					<!-- Linkers -->

Modified: webservices/axis/trunk/c/build/buildTransport.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildTransport.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildTransport.xml (original)
+++ webservices/axis/trunk/c/build/buildTransport.xml Thu Nov 13 14:23:39 2008
@@ -1,81 +1,73 @@
 <project name="Axis C Transport" default="compileAxisTransport"
-	basedir="..">
+    basedir="..">
 
-	<!--
-		Compile the Axis Transport Library
-	-->
-	<target name="compileAxisTransport">
-		<mkdir dir="${dir.objects}" />
-		<mkdir dir="${dir.bin}" />
-		<antcall target="buildVersionResource" inheritall="true">
-			<param name="internalName" value="${transportLibraryName}" />
-		</antcall>
-		<if>
-			<not>
-				<isset property="aix" />
-			</not>
-			<then>
-				<!--
-					Library name may have been change if windows debug build. Changed
-					in buildInitialize.xml
-				-->
-				<cc outfile="${dir.bin}/${transportLibraryName}"
-					objdir="${dir.objects}" exceptions="true" outtype="shared"
-					multithreaded="true">
-					<!-- Compilers -->
-					<compiler refid="SolarisCC" />
-					<compiler refid="Linuxgcc" />
-					<compiler refid="HP-UXaC++" />
-					<compiler extends="VisualC++">
-						<defineset>
-							<define name="AXISTRANSPORTDLL_EXPORTS" />
-						</defineset>
-					</compiler>
-					<defineset>
-						<define name="ENABLE_AXISTRACE" if="trace" />
-						<define name="AXISTRACE_LIBRARY" />
-					</defineset>
-					<compiler refid="OS400icc" />
-					<!-- Linkers -->
-					<linker refid="SolarisLinker" />
-					<linker refid="LinuxLinker" />
-					<linker refid="HP-UXLinker" />
-					<linker extends="VisualC++Linker">
-						<syslibset libs="wsock32" />
-					</linker>
-					<linker refid="OS400Linker" />
-					<!-- Files to compile -->
-					<fileset dir="${dir.src}">
-						<include name="soap/apr_base64.cpp" />
-						<include name="transport/${transport}/*.cpp" />
-						<include
-							name="platforms/os400/PlatformSpecificOS400.cpp" if="os400" />
-						<include
-							name="platforms/windows/PlatformSpecificWindows.cpp"
-							if="windows" />
-					</fileset>
-				</cc>
-			</then>
-			<else>
-				<cc
-					outfile="${dir.bin}/${libraryPrefix}${transportLibraryName}${librarySuffix}"
-					objdir="${dir.objects}" exceptions="true" multithreaded="true">
-					<!-- Compilers -->
-					<compiler refid="AIXxlc" />
-					<defineset>
-						<define name="ENABLE_AXISTRACE" if="trace" />
-						<define name="AXISTRACE_LIBRARY" />
-					</defineset>
+    <!--
+        Compile the Axis Transport Library
+    -->
+    <target name="compileAxisTransport">
+        <mkdir dir="${dir.objects}" />
+        <mkdir dir="${dir.bin}" />
+        <antcall target="buildVersionResource" inheritall="true">
+            <param name="internalName" value="${transportLibraryName}" />
+        </antcall>
+        <if>
+            <not>
+                <isset property="aix" />
+            </not>
+            <then>
+                <!--
+                    Library name may have been change if windows debug build. Changed
+                    in buildInitialize.xml
+                -->
+                <cc outfile="${dir.bin}/${transportLibraryName}"
+                    objdir="${dir.objects}" exceptions="true" outtype="shared"
+                    multithreaded="true">
+                    <!-- Compilers -->
+                    <compiler refid="SolarisCC" />
+                    <compiler refid="Linuxgcc" />
+                    <compiler refid="HP-UXaC++" />
+                    <compiler extends="VisualC++">
+                        <defineset>
+                            <define name="AXISTRANSPORTDLL_EXPORTS" />
+                        </defineset>
+                    </compiler>
+                    <compiler refid="OS400icc" />
+                	
+                    <!-- Linkers -->
+                    <linker refid="SolarisLinker" />
+                    <linker refid="LinuxLinker" />
+                    <linker refid="HP-UXLinker" />
+                    <linker extends="VisualC++Linker">
+                        <syslibset libs="wsock32" />
+                    </linker>
+                    <linker refid="OS400Linker" />
+                    <!-- Files to compile -->
+                    <fileset dir="${dir.src}">
+                        <include name="soap/apr_base64.cpp" />
+                        <include name="transport/${transport}/*.cpp" />
+                        <include name="common/AxisTrace.cpp"/>
+                        <include name="platforms/os400/PlatformSpecificOS400.cpp" if="os400"
/>
+                        <include name="platforms/windows/PlatformSpecificWindows.cpp"
if="windows" />
+                    </fileset>
+                </cc>
+            </then>
+            <else>
+                <cc
+                    outfile="${dir.bin}/${libraryPrefix}${transportLibraryName}${librarySuffix}"
+                    objdir="${dir.objects}" exceptions="true" multithreaded="true">
+                    <!-- Compilers -->
+                    <compiler refid="AIXxlc" />
 
-					<!-- Linkers -->
-					<linker refid="AIXLinker" />
-					<!-- Files to compile -->
-					<fileset dir="${dir.src}">
-						<include name="soap/apr_base64.cpp" />
-						<include name="transport/${transport}/*.cpp" />
-					</fileset>
-				</cc>
-			</else>
-		</if>
-	</target>
+                    <!-- Linkers -->
+                    <linker refid="AIXLinker" />
+                    <!-- Files to compile -->
+                    <fileset dir="${dir.src}">
+                        <include name="soap/apr_base64.cpp" />
+                        <include name="transport/${transport}/*.cpp" />
+                        <include name="common/AxisTrace.cpp"/>
+                    </fileset>
+                </cc>
+            </else>
+        </if>
+    </target>
 </project>

Modified: webservices/axis/trunk/c/build/buildXMLParser.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/buildXMLParser.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildXMLParser.xml (original)
+++ webservices/axis/trunk/c/build/buildXMLParser.xml Thu Nov 13 14:23:39 2008
@@ -37,10 +37,6 @@
 						</defineset>
 					</compiler>
                     <compiler refid="OS400icc"/>
-		            <defineset>
-		                <define name="ENABLE_AXISTRACE" if="trace"/>
-		                <define name="AXISTRACE_LIBRARY"/>
-		            </defineset>
 
 					<!-- Additional include directory for XML Parser -->
 					<includepath path="${dir.xmlParser}"/>
@@ -60,6 +56,9 @@
 					<!-- Files to be compiled -->
 					<fileset dir="${dir.xmlParser}">
 						<include name="*.cpp"/>
+		                <include name="common/AxisTrace.cpp"/>
+	                    <include name="platforms/os400/PlatformSpecificOS400.cpp" if="os400"/>
+					    <include name="platforms/windows/PlatformSpecificWindows.cpp" if="windows"/>
 					</fileset>
 				</cc>
 			</then>
@@ -68,10 +67,6 @@
 				 exceptions="true" multithreaded="true">
 				 	<!-- Compilers -->
 					<compiler refid="AIXxlc"/>
-			            <defineset>
-			                  <define name="ENABLE_AXISTRACE" if="trace"/>
-			                  <define name="AXISTRACE_LIBRARY"/>
-			            </defineset>
 
 					<!-- Additional include directory for XML Parser -->
 					<includepath path="${dir.xmlParser}"/>
@@ -81,6 +76,7 @@
 					<!-- Files to be compiled -->
 					<fileset dir="${dir.xmlParser}">
 						<include name="*.cpp"/>
+		                <include name="common/AxisTrace.cpp"/>
 					</fileset>
 				</cc>
 			</else>
@@ -111,8 +107,6 @@
 					</compiler>
                     <compiler refid="OS400icc"/>
 		            <defineset>
-	                   <define name="ENABLE_AXISTRACE" if="trace"/>
-	                   <define name="AXISTRACE_LIBRARY"/>
                        <define name="AXIS_XML4C" if="isXML4C" unless="os400"/>
 		            </defineset>
 
@@ -138,7 +132,9 @@
 					<!-- Files to be compiled -->
 					<fileset dir="${dir.src}">
 						<include name="xml/${xmlParser}/*.cpp"/>
-						<include name="xml/AxisParseException.cpp"/>
+                        <include name="common/AxisTrace.cpp"/>
+                        <include name="platforms/os400/PlatformSpecificOS400.cpp" if="os400"/>
+					    <include name="platforms/windows/PlatformSpecificWindows.cpp" if="windows"/>
 					</fileset>
 				</cc>
 			</then>
@@ -148,8 +144,6 @@
 				 	<!-- Compilers -->
 					<compiler refid="AIXxlc"/>
 			            <defineset>
-			                <define name="ENABLE_AXISTRACE" if="trace"/>
-			                <define name="AXISTRACE_LIBRARY"/>
                             <define name="AXIS_XML4C" if="isXML4C"/>         
 			            </defineset>
 
@@ -164,7 +158,7 @@
 					<!-- Files to be compiled -->
 					<fileset dir="${dir.src}">
 						<include name="xml/${xmlParser}/*.cpp"/>
-						<include name="xml/AxisParseException.cpp"/>
+                        <include name="common/AxisTrace.cpp"/>
 					</fileset>
 				</cc>
 			</else>

Modified: webservices/axis/trunk/c/build/executeTest.xml
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/build/executeTest.xml?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/executeTest.xml (original)
+++ webservices/axis/trunk/c/build/executeTest.xml Thu Nov 13 14:23:39 2008
@@ -9,15 +9,11 @@
 		depends="setResultExpectations, setRequestExpectations, copyattachment, setServerResponse"
/>
 
 	<target name="setResultExpectations" unless="buildOnly">
-		<basename file="${expected.file}"
-			property="expected.file.basename" />
-		<copy file="${dir.autotests}/output/${test.expected.output}"
-			tofile="${expected.file}" />
-		<!--
-			Convert to OS specific format
-		-->
-		<fixcrlf srcdir="${test.directory}"
-			includes="${expected.file.basename}" />
+		<basename file="${expected.file}" property="expected.file.basename" />
+		<copy file="${dir.autotests}/output/${test.expected.output}" tofile="${expected.file}"
/>
+		
+		<!-- Convert to OS specific format -->
+		<fixcrlf srcdir="${test.directory}" includes="${expected.file.basename}" />
 	</target>
 
     <!--
@@ -26,23 +22,18 @@
 
 
     <target name="copyattachment" if="test.attachment" unless="buildOnly">
-		<copy file="${dir.autotests}/attachment/${test.attachment}"
-			todir="${test.directory}" failonerror="false" />
+		<copy file="${dir.autotests}/attachment/${test.attachment}"	todir="${test.directory}"
failonerror="false" />
 	</target>
 
 
 	<!-- Only copy expected request file if it exists -->
-	<target name="setRequestExpectations" if="requestFileExists"
-		unless="buildOnly">
-		<basename file="${r_expected.file}"
-			property="r_expected.file.basename" />
-		<copy file="${dir.autotests}/output/${test.expected.request}"
-			tofile="${r_expected.file}" failonerror="false" />
-		<!--
-			Convert to OS specific format
-		-->
-		<fixcrlf srcdir="${test.directory}"
-			includes="${r_expected.file.basename}" />
+	<target name="setRequestExpectations" if="requestFileExists" unless="buildOnly">
+		<basename file="${r_expected.file}" property="r_expected.file.basename" />
+		<copy file="${dir.autotests}/output/${test.expected.request}" tofile="${r_expected.file}"
failonerror="false" />
+		
+		<!-- Convert to OS specific format 	-->
+		<fixcrlf srcdir="${test.directory}"	includes="${r_expected.file.basename}" />
+		
 		<!--
 			change the destination host in the expected request file to match the monitor we are 
 			actually using
@@ -50,25 +41,20 @@
 		<replaceregexp file="${r_expected.file}"
 			match="Host: [0-9a-z\.]*:[0-9]*"
 			replace="Host: 127.0.0.1:${monitorPort}" byline="true" />
-		<propertyregex property="restOfURL" input="${test.endpoint}"
-			regexp="://(.*)" select="\1" />
-
-		<propertyregex property="context" input="${restOfURL}"
-			regexp="/(.*)" select="\1" />
-
-		<replaceregexp file="${r_expected.file}"
-			match="POST [0-9a-zA-Z/-_]*"
-			replace="POST /${context}" byline="true" />
 		
+		<propertyregex property="restOfURL" input="${test.endpoint}" regexp="://(.*)" select="\1"
/>
 
+		<propertyregex property="context" input="${restOfURL}" regexp="/(.*)" select="\1" />
+
+		<replaceregexp file="${r_expected.file}" match="POST [0-9a-zA-Z/-_]*" replace="POST
/${context}" byline="true" />
 	</target>
+	
 	<!-- Only copy server response file if it exists and we are in unit test mode (mockServer
mode)-->
 	<target name="setServerResponse" unless="buildOnly">
 		<if>
 			<equals arg1="${mockServer}" arg2="true" />
 			<then>
-				<basename file="${response_expected.file}"
-					property="response_expected.file.basename" />
+				<basename file="${response_expected.file}" property="response_expected.file.basename"
/>
 				<copy
 					file="${dir.autotests}/output/${test.expected.serverResponse}"
 					tofile="${response_expected.file}" failonerror="true" />
@@ -78,41 +64,32 @@
 
 
 
-	<target name="setTestArgs"
-		depends="setEndpoint, setForMonitor, setForNoMonitor, setProxyArgs" />
+	<target name="setTestArgs" depends="setEndpoint, setForMonitor, setForNoMonitor, setProxyArgs"
/>
 
 	<target name="setEndpoint" unless="test.endpoint">
 		<property name="clientArgs" value="" />
 	</target>
 
 	<target name="setForMonitor" if="test.endpoint"	unless="test.nomonitor">
-		<propertyregex property="protocol" input="${test.endpoint}"
-			regexp="(.*)://" select="\1" />
+		<propertyregex property="protocol" input="${test.endpoint}"	regexp="(.*)://" select="\1"
/>
 
-		<propertyregex property="restOfURL" input="${test.endpoint}"
-			regexp="://(.*)" select="\1" />
+		<propertyregex property="restOfURL" input="${test.endpoint}" regexp="://(.*)" select="\1"
/>
 
-		<propertyregex property="context" input="${restOfURL}"
-			regexp="/(.*)" select="\1" />
+		<propertyregex property="context" input="${restOfURL}" regexp="/(.*)" select="\1" />
 
-		<property name="clientArgs"
-			value="${protocol}://127.0.0.1:${monitorPort}/${context}" />
+		<property name="clientArgs" value="${protocol}://127.0.0.1:${monitorPort}/${context}"
/>
 	</target>
 
-	<target name="setForNoMonitor" depends="checkIfEndpointSet"
-		if="endpoint.ok">
+	<target name="setForNoMonitor" depends="checkIfEndpointSet" if="endpoint.ok">
 
-		<propertyregex property="restOfURL" input="${test.endpoint}"
-			regexp="://(.*)" select="\1" />
+		<propertyregex property="restOfURL" input="${test.endpoint}" regexp="://(.*)" select="\1"
/>
 
-		<propertyregex property="protocol" input="${test.endpoint}"
-			regexp="(.*)://${restOfURL}" select="\1" />
-		<propertyregex property="context" input="${restOfURL}"
-			regexp="/(.*)" select="\1" />
+		<propertyregex property="protocol" input="${test.endpoint}" regexp="(.*)://${restOfURL}"
select="\1" />
+		<propertyregex property="context" input="${restOfURL}" regexp="/(.*)" select="\1" />
 
-		<property name="clientArgs"
-			value="${protocol}://${testHost}:${testPort}/${context}" />
+		<property name="clientArgs"	value="${protocol}://${testHost}:${testPort}/${context}"
/>
 	</target>
+	
 	<target name="setProxyArgs">
 		<if>
 			<equals arg1="${test.proxyRequired}" arg2="true"/>
@@ -123,8 +100,7 @@
 	</target>
 	
 	<target name="setVerbatim" if="test.verbatim">
-		<property name="clientArgs"
-			value="${testHost} ${testPort} ${test.endpoint}" />
+		<property name="clientArgs"	value="${testHost} ${testPort} ${test.endpoint}" />
 	</target>
 
 	<target name="checkIfEndpointSet" depends="setVerbatim">
@@ -160,21 +136,9 @@
 			<param name="TCPMonitor.classname" value="org.apache.test.TCPMonitor"/>
 		</antcall>
 	</target>
+	
 	<target name="executeMonitor">
 		<monitor requestFile="${test.directory}/tcpm.req" responseFile="${test.directory}/tcpm.res"
listenerPort="${monitorPort}" servicePort="${testPort}" serviceHost="${actualTestHost}"/>
-		
-<!--		<java classname="${TCPMonitor.classname}" >
-			<arg line="-l ${monitorPort}" />
-			<arg line="-p ${testPort}" />
-			<arg line="-h ${actualTestHost}" />
-			<arg line="-o &quot;${test.directory}/tcpm.req&quot;" />
-			<arg line="-r &quot;${test.directory}/tcpm.res&quot;" />
-			<classpath>
-				<pathelement
-					location="${dir.obj}/test/monitor/monitor.jar" />
-			</classpath>
-		</java>
-		-->
 	</target>
 
 	<target name="startMockServer">
@@ -238,12 +202,9 @@
 				<antcall target="callClient"/>
 
 				<stopwatch name="${test.name}.timer" action="total" />
-				<propertycopy property="timer1"
-					from="${test.name}.timer" />
-				<echo file="${results.log}" append="true"
-					message="${test.name} - Execution Time - ${timer1}${line.separator}" />
-				<echo
-					message="${test.name} - Execution Time - ${timer1}" />
+				<propertycopy property="timer1" from="${test.name}.timer" />
+				<echo file="${results.log}" append="true" message="${test.name} - Execution Time -
${timer1}${line.separator}" />
+				<echo message="${test.name} - Execution Time - ${timer1}" />
 
 		        <if>
 		            <isfalse value="${test.nomonitor}" />
@@ -261,6 +222,7 @@
 			</finally>
 		</trycatch>
 	</target>
+	
 	<target name="callClient">
 		<!-- %XML4C_HOME%\bin;%PACKAGE_BIN%;%XMS_BIN%;%MQ_HOME%\bin;%PATH%-->
 	<exec dir="${test.directory}"
@@ -297,41 +259,11 @@
 		</condition>
 
 		<if>
-		    <and>
-				<isset property="test.notrace"/>
-				<not>
-					<istrue value="${test.ssl}"/>
-				</not>
-		    </and>
-			<then>
-
-<!-- No Client Log, No SSL Library -->
-				<echo message="No Client log or SSL library."/>
-				<exec executable="${dir.release}/bin/${axisConfigurationExecutableName}${executableSuffix}">
-					<arg line="Client"/>
-                    <arg line="-acd  &quot;${confFileDirectory}&quot;"/>
-                    <arg line="-th  &quot;${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}&quot;"/>
-                    <arg line="-c   &quot;${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}&quot;"/>
-                    <arg line="-x   &quot;${dir.libraries}/${ClientParserLib}&quot;"/>
-                    <arg line="-so  &quot;${env.SSL_KEYS_HOME}/myKeyRing.kdb,axis4all,AXIS,NONE,05,NONE,false&quot;"/>
-                    <arg line="-b   false"/>
-                    <arg line="-pi  quiet"/>
-                    <arg line="-qmf off"/>
-				</exec>
-			</then>
-		</if>
-
-		<if>
-		    <and>
-				<not>
-					<istrue value="${test.ssl}"/>
-				</not>
-                <not>      
-				    <isset property="test.notrace"/>
-                </not>
-		    </and>
+			<not>
+				<istrue value="${test.ssl}"/>
+			</not>
 			<then>
-<!-- Client Log, No SSL Library -->
+<!-- No SSL Library -->
 				<echo message="Client log, but no SSL library."/>
 				<exec executable="${dir.release}/bin/${axisConfigurationExecutableName}${executableSuffix}">
 					<arg line="Client"/>
@@ -350,37 +282,9 @@
 		</if>
 
 		<if>
-		    <and>
-				<isset property="test.notrace"/>
-				<istrue value="${test.ssl}"/>
-		    </and>
-			<then>
-<!-- No Client Log, SSL Library -->
-				<echo message="No Client log but SSL library."/>
-				<exec executable="${dir.release}/bin/${axisConfigurationExecutableName}${executableSuffix}">
-					<arg line="Client"/>
-                    <arg line="-acd  ${confFileDirectory}"/>
-                    <arg line="-th  ${dir.libraries}/${libraryPrefix}${transportLibraryName}${librarySuffix}"/>
-                    <arg line="-c   ${dir.libraries}/${libraryPrefix}${HTTP.ChannelLibraryName}${librarySuffix}"/>
-                    <arg line="-cs  ${dir.libraries}/${libraryPrefix}${HTTP.SecureChannelLibraryName}${librarySuffix}"/>
-                    <arg line="-x   ${dir.libraries}/${ClientParserLib}"/>
-                    <arg line="-so  &quot;${env.SSL_KEYS_HOME}/myKeyRing.kdb,axis4all,AXIS,NONE,05,NONE,false&quot;"/>
-                    <arg line="-b   false"/>
-                    <arg line="-pi  quiet"/>
-                    <arg line="-qmf off"/>
-				</exec>
-			</then>
-		</if>
-
-		<if>
-		    <and>
-                <not>      
-				    <isset property="test.notrace"/>
-                </not>
-		        <istrue value="${test.ssl}"/>
-		    </and>
+		    <istrue value="${test.ssl}"/>
 			<then>
-<!-- Client Log, SSL Library -->
+<!-- SSL Library -->
 				<echo message="Client log and SSL library."/>
 				<exec executable="${dir.release}/bin/${axisConfigurationExecutableName}${executableSuffix}">
 					<arg line="Client"/>
@@ -431,6 +335,7 @@
 			<then>
 				<echo file="${axiscpp.conf}" append="true">
 ClientLogPath:${test.directory}/ClientLog.taw
+LogFilter:stub;engine;parser;transport;
 </echo>
 			</then>
 		</if>

Modified: webservices/axis/trunk/c/include/axis/Axis.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/include/axis/Axis.h?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/Axis.h (original)
+++ webservices/axis/trunk/c/include/axis/Axis.h Thu Nov 13 14:23:39 2008
@@ -153,6 +153,46 @@
 AXISC_STORAGE_CLASS_INFO 
 void axiscAxisGenerateUnknownElementException(const char *s);
 
+/**
+ * Start Axis logging. This must be done prior to any activiy in order to propagate 
+ * logging attributes to parser and transport.  If there are active transports and 
+ * parsers, you will not get trace records other than those associated with the  
+ * the engine and newly instantiated transports and parsers.
+ * 
+ * @param logFilePath  Path to where trace records are written to.
+ * @param filter       Trace filter.  The string filter is a semicolon delimited string
+ *                     of possible filters.  Possible filters include:
+ * 
+ *                     stub         - show trace records generated by stubs
+ *                     engine       - show trace records generated by engine
+ *                     parser       - show trace records generated by parser
+ *                     transport    - show trace records generated by transport
+ *                     noEntryExit  - do not show entry/exit trace records
+ *                     
+ *                     The default filter is "stub;engine;parser;transport".
+ *                     Specifying a NULL pointer or NULL string is equivalent to 
+ *                     requesting the defailt filter.
+ */
+AXISC_STORAGE_CLASS_INFO
+int axiscAxisStartTrace(const char* logFilePath, const char *logFilter);
+
+/**
+ * Stop Axis logging. This should be done as the last step when everything has been cleaned
+ * up. Otherwise, active transports and parsers will continue to trace.
+ */
+AXISC_STORAGE_CLASS_INFO
+void axiscAxisStopTrace();
+
+/**
+ * Log trace. 
+ * 
+ * @param  functionName  - function for which trace record is being written.
+ * @param  fmt           - format as defined in printf and related functions.
+ * @param  ...           - variable nuumber of parameters.
+ */
+AXISC_STORAGE_CLASS_INFO
+void  axiscAxisWriteTrace(const char* functionName, const char * fmt, ...);
+
 #ifdef __cplusplus
   }
 #endif

Modified: webservices/axis/trunk/c/include/axis/Axis.hpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/include/axis/Axis.hpp?rev=713843&r1=713842&r2=713843&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/Axis.hpp (original)
+++ webservices/axis/trunk/c/include/axis/Axis.hpp Thu Nov 13 14:23:39 2008
@@ -90,6 +90,43 @@
      * Stop Axis engine. 
      */
      static void stopAxis();
+     
+     /**
+      * Start Axis logging. This must be done prior to any activiy in order to propagate

+      * logging attributes to parser and transport.  If there are active transports and 
+      * parsers, you will not get trace records other than those associated with the  
+      * the engine and newly instantiated transports and parsers.
+      * 
+      * @param logFilePath  Path to where trace records are written to.
+      * @param filter       Trace filter.  The string filter is a semicolon delimited string
+	  *                     of possible filters.  Possible filters include:
+	  * 
+	  *                     stub         - show trace records generated by stubs
+	  *                     engine       - show trace records generated by engine
+	  *                     parser       - show trace records generated by parser
+	  *                     transport    - show trace records generated by transport
+	  *                     noEntryExit  - do not show entry/exit trace records
+	  *                     
+	  *                     The default filter is "stub;engine;parser;transport".
+	  *                     Specifying a NULL pointer or NULL string is equivalent to 
+	  *                     requesting the defailt filter.
+	  */
+     static int startTrace(const char* logFilePath, const char *logFilter=NULL);
+  
+     /**
+      * Stop Axis logging. This should be done as the last step when everything has been
cleaned
+      * up. Otherwise, active transports and parsers will continue to trace.
+      */
+     static void stopTrace();
+     
+     /**
+      * Log trace. 
+      * 
+      * @param  functionName  - class method or function for which trace record is being
written.
+      * @param  fmt           - format as defined in printf and related functions.
+      * @param  ...           - variable nuumber of parameters.
+      */
+     static void writeTrace(const char* functionName, const char * fmt, ...);
 };
 
 AXIS_CPP_NAMESPACE_END



Mime
View raw message