axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whitl...@apache.org
Subject cvs commit: ws-axis/c/tools/org/apache/axis/tools/trace TraceInstrumentor.java Tracer.java tracetool.conf
Date Thu, 13 Jan 2005 14:07:06 GMT
whitlock    2005/01/13 06:07:06

  Modified:    c/build  buildTransport.xml buildTransportIPV6.xml
               c/src/transport/axis2 Axis2TransportInstantiator.cpp
               c/src/transport/axis3/HTTPChannel
                        HTTPChannelInstantiator.cpp
               c/src/transport/axis3/HTTPSSLChannel
                        HTTPSSLChannelInstantiator.cpp
               c/src/transport/axis3 HTTPTransportInstantiator.cpp
               c/tools/org/apache/axis/tools/common Configuration.java
               c/tools/org/apache/axis/tools/trace TraceInstrumentor.java
                        Tracer.java tracetool.conf
  Log:
  Move #define AXISTRACE_LIBRARY from the tracetool into the build because it makes the code
simpler
  
  Revision  Changes    Path
  1.8       +2 -0      ws-axis/c/build/buildTransport.xml
  
  Index: buildTransport.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildTransport.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- buildTransport.xml	11 Jan 2005 17:01:47 -0000	1.7
  +++ buildTransport.xml	13 Jan 2005 14:07:06 -0000	1.8
  @@ -27,6 +27,7 @@
                  </compiler>
                  <defineset>
                     <define name="ENABLE_AXISTRACE" if="trace"/>
  +                  <define name="AXISTRACE_LIBRARY"/>
                  </defineset>
                                 <compiler refid="OS400icc"/>
                  <!-- Linkers -->
  @@ -50,6 +51,7 @@
                  <compiler refid="AIXxlc"/>
                  <defineset>
                     <define name="ENABLE_AXISTRACE" if="trace"/>
  +                  <define name="AXISTRACE_LIBRARY"/>
                  </defineset>
   
                  <!-- Linkers -->
  
  
  
  1.5       +6 -0      ws-axis/c/build/buildTransportIPV6.xml
  
  Index: buildTransportIPV6.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildTransportIPV6.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildTransportIPV6.xml	10 Jan 2005 21:00:31 -0000	1.4
  +++ buildTransportIPV6.xml	13 Jan 2005 14:07:06 -0000	1.5
  @@ -26,6 +26,9 @@
   						</defineset>
   					</compiler>
                                 <compiler refid="OS400icc"/>
  +					<defineset>
  +			                  <define name="AXISTRACE_LIBRARY"/>
  +					</defineset>
   					<!-- Linkers -->
   					<linker refid="SolarisLinker"/>
   					<linker refid="LinuxLinker"/>
  @@ -49,6 +52,9 @@
   				 exceptions="true" multithreaded="true">
   					<!-- Compilers -->
   					<compiler refid="AIXxlc"/>
  +					<defineset>
  +			                  <define name="AXISTRACE_LIBRARY"/>
  +					</defineset>
   					<!-- Linkers -->
   					<linker refid="AIXLinker"/>
   					<!-- Files to compile -->
  
  
  
  1.3       +0 -1      ws-axis/c/src/transport/axis2/Axis2TransportInstantiator.cpp
  
  Index: Axis2TransportInstantiator.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis2/Axis2TransportInstantiator.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Axis2TransportInstantiator.cpp	11 Jan 2005 17:01:47 -0000	1.2
  +++ Axis2TransportInstantiator.cpp	13 Jan 2005 14:07:06 -0000	1.3
  @@ -19,7 +19,6 @@
    *
    */
   
  -#define AXISTRACE_LIBRARY
   #define AXISTRACE_LIBRARY_MAINENTRYPOINT
   #include "../../common/AxisTrace.h"
   
  
  
  
  1.4       +0 -1      ws-axis/c/src/transport/axis3/HTTPChannel/HTTPChannelInstantiator.cpp
  
  Index: HTTPChannelInstantiator.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPChannel/HTTPChannelInstantiator.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HTTPChannelInstantiator.cpp	12 Jan 2005 16:05:43 -0000	1.3
  +++ HTTPChannelInstantiator.cpp	13 Jan 2005 14:07:06 -0000	1.4
  @@ -19,7 +19,6 @@
    *
    */
   
  -#define AXISTRACE_LIBRARY
   #define AXISTRACE_LIBRARY_MAINENTRYPOINT
   #include "../../../common/AxisTrace.h"
   
  
  
  
  1.4       +0 -1      ws-axis/c/src/transport/axis3/HTTPSSLChannel/HTTPSSLChannelInstantiator.cpp
  
  Index: HTTPSSLChannelInstantiator.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPSSLChannel/HTTPSSLChannelInstantiator.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HTTPSSLChannelInstantiator.cpp	12 Jan 2005 16:05:57 -0000	1.3
  +++ HTTPSSLChannelInstantiator.cpp	13 Jan 2005 14:07:06 -0000	1.4
  @@ -19,7 +19,6 @@
    *
    */
   
  -#define AXISTRACE_LIBRARY
   #define AXISTRACE_LIBRARY_MAINENTRYPOINT
   #include "../../../common/AxisTrace.h"
   
  
  
  
  1.3       +0 -1      ws-axis/c/src/transport/axis3/HTTPTransportInstantiator.cpp
  
  Index: HTTPTransportInstantiator.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPTransportInstantiator.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HTTPTransportInstantiator.cpp	12 Jan 2005 14:27:50 -0000	1.2
  +++ HTTPTransportInstantiator.cpp	13 Jan 2005 14:07:06 -0000	1.3
  @@ -19,7 +19,6 @@
    *
    */
   
  -#define AXISTRACE_LIBRARY
   #define AXISTRACE_LIBRARY_MAINENTRYPOINT
   #include "../../common/AxisTrace.h"
   
  
  
  
  1.3       +0 -7      ws-axis/c/tools/org/apache/axis/tools/common/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/common/Configuration.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Configuration.java	11 Jan 2005 17:01:47 -0000	1.2
  +++ Configuration.java	13 Jan 2005 14:07:06 -0000	1.3
  @@ -33,7 +33,6 @@
   	private static Set macros = new HashSet();
   	private static Set defines = new HashSet();
   	private static Set attributes = new HashSet();
  -	private static Set librarydirs = new HashSet();
   	private static Map others = new HashMap();
   
       /**
  @@ -82,8 +81,6 @@
   				defines.add(value);
   			} else if ("attribute".equals(key)) {
   				attributes.add(value);
  -			} else if ("librarydir".equals(key)) {
  -				librarydirs.add(value);
   			} else {
   				others.put(key, value);
   			}
  @@ -112,10 +109,6 @@
   
   	public static boolean isAttribute(String s) {
   		return attributes.contains(s);
  -	}
  -
  -	public static Set getLibraryDirs() {
  -		return librarydirs;
   	}
   
   	public static String getConfigured(String key) {
  
  
  
  1.3       +1 -8      ws-axis/c/tools/org/apache/axis/tools/trace/TraceInstrumentor.java
  
  Index: TraceInstrumentor.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/trace/TraceInstrumentor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TraceInstrumentor.java	11 Jan 2005 17:01:47 -0000	1.2
  +++ TraceInstrumentor.java	13 Jan 2005 14:07:06 -0000	1.3
  @@ -74,16 +74,9 @@
   			&& !Configuration.fileExcluded(sourceName)) {
   			Utils.outputDebugString("parsing " + source + "...");
   
  -                  boolean isInLib = false;
  -                  Iterator itDir = Configuration.getLibraryDirs().iterator();
  -                  while (itDir.hasNext()) {
  -                      String libdir= (String)(itDir.next());
  -                      isInLib = isInLib || (-1 != source.getPath().indexOf(libdir));
  -                  }
  -
   			// create a tracer to the output file 
   			Tracer output =
  -				new Tracer(new FileWriter(outputFile, false), depth, headers, isInLib);
  +				new Tracer(new FileWriter(outputFile, false), depth, headers);
   
   			// OK, now we have the output file let's read in the input file !
   			FileReader fr = new FileReader(source);
  
  
  
  1.3       +1 -5      ws-axis/c/tools/org/apache/axis/tools/trace/Tracer.java
  
  Index: Tracer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/trace/Tracer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Tracer.java	11 Jan 2005 17:01:47 -0000	1.2
  +++ Tracer.java	13 Jan 2005 14:07:06 -0000	1.3
  @@ -72,7 +72,7 @@
   	/**
   	 * @param writer a writer to the output file.
   	 */
  -	Tracer(Writer writer, int depth, Headers headers, boolean isInLib) throws IOException
{
  +	Tracer(Writer writer, int depth, Headers headers) throws IOException {
   		super(writer);
   		this.headers = headers;
   		namespace = Configuration.getConfigured("namespace");
  @@ -98,9 +98,6 @@
   		else
   			module = ""; // C-style function
   
  -            String libDirDef = "";
  -            if (isInLib) libDirDef = "#define AXISTRACE_LIBRARY\n";
  -
   		String include = Configuration.getConfigured("include");
   		String includefile = "";
   		if (null == include) {
  @@ -122,7 +119,6 @@
   		String line =
   			hashifdef
   				+ "/* TRACE ADDED BY THE TRACE INSTRUMENTOR TOOL */\n"
  -                        + libDirDef
   				+ "#include "
   				+ includefile
   				+ "\n"
  
  
  
  1.6       +0 -1      ws-axis/c/tools/org/apache/axis/tools/trace/tracetool.conf
  
  Index: tracetool.conf
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/trace/tracetool.conf,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tracetool.conf	12 Jan 2005 14:27:51 -0000	1.5
  +++ tracetool.conf	13 Jan 2005 14:07:06 -0000	1.6
  @@ -69,5 +69,4 @@
   ifdef=ENABLE_AXISTRACE
   namespace=axiscpp
   module=AxisTrace
  -librarydir=transport
   
  
  
  

Mime
View raw message