You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2003/10/06 14:36:16 UTC
cvs commit: ws-axis/c/src/wsdd WSDDDocument.cpp
damitha 2003/10/06 05:36:16
Modified: c/src/common AxisConfig.h AxisTrace.cpp AxisTrace.h
GDefine.h Makefile.am
c/src/engine Axis.cpp AxisEngine.cpp AxisEngine.h Main.c
c/src/server/apache mod_axis.c
c/src/server/handlers/custom/loghandler Makefile
c/src/server/handlers/custom/simpleauthhandler Makefile
c/src/server/handlers/global/testhandler1 Makefile
c/src/server/handlers/transport/testhandler2 Makefile
c/src/wsdd WSDDDocument.cpp
Log:
log: Created a new Implementation of AxisConfig so that the server takes the
configuration path where the axiscpp.conf lies from the environment
variable AXIS_HOME. User has to set this variable pointing the
path to axiscpp.conf file. This axiscpp.conf file contains all the configuration paths
like wsdd configuration file path, axis log path etc.
Revision Changes Path
1.4 +18 -0 ws-axis/c/src/common/AxisConfig.h
Index: AxisConfig.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisConfig.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AxisConfig.h 27 Sep 2003 10:28:13 -0000 1.3
+++ AxisConfig.h 6 Oct 2003 12:36:15 -0000 1.4
@@ -1,7 +1,9 @@
#if !defined(__AXIS_AXISCONFIG_H_INCLUDED__)
#define __AXIS_AXISCONFIG_H_INCLUDED__
+#define CONFBUFFSIZE 200
+/*
#ifdef WIN32
#ifdef AXIS_APACHE1_3
#define WSDDFILEPATH "./Axis/conf/server.wsdd"
@@ -15,5 +17,21 @@
#define WSDDFILEPATH "/usr/local/apache/Axis/conf/server.wsdd"
#endif
#endif
+*/
+class AxisConfig
+{
+ public:
+ AxisConfig();
+ ~AxisConfig();
+ char* GetWsddFilePath();
+ char* GetAxisLogPath();
+
+ private:
+ bool ReadConfFile();
+ char m_WsddFilePath[CONFBUFFSIZE];
+ char m_AxisLogPath[CONFBUFFSIZE];
+ char m_sWsddFilePath[CONFBUFFSIZE];
+ char m_sAxisLogPath[CONFBUFFSIZE];
+};
#endif
1.5 +9 -30 ws-axis/c/src/common/AxisTrace.cpp
Index: AxisTrace.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisTrace.cpp 19 Sep 2003 14:48:18 -0000 1.4
+++ AxisTrace.cpp 6 Oct 2003 12:36:15 -0000 1.5
@@ -64,13 +64,16 @@
#include <stdio.h>
#include "AxisUtils.h"
#include "GDefine.h"
+#include "AxisConfig.h"
-using namespace std;
+extern AxisConfig* g_pConfig;
+using namespace std;
AxisTrace::AxisTrace()
{
- GetConfPath();
+ m_sFileName = NULL;
+ //GetConfPath();
}
AxisTrace::~AxisTrace()
@@ -79,7 +82,8 @@
int AxisTrace::trace(const char* sLog,char* arg2, int arg3)
{
- if ((fileTrace = fopen(sFileName, "a")) == NULL)
+ m_sFileName = g_pConfig->GetAxisLogPath();
+ if ((fileTrace = fopen(m_sFileName, "a")) == NULL)
return FAIL;
else
{
@@ -113,7 +117,8 @@
int AxisTrace::trace(const char* sLog1, const char* sLog2,char* arg3, int arg4)
{
- if ((fileTrace = fopen(sFileName, "a")) == NULL)
+ m_sFileName = g_pConfig->GetAxisLogPath();
+ if ((fileTrace = fopen(m_sFileName, "a")) == NULL)
return FAIL;
else
{
@@ -145,32 +150,6 @@
return SUCCESS;
}
-}
-
-int AxisTrace::GetConfPath()
-{
- int key;
- int intItr = 0;
- if ((ConfFile = fopen(CONFFILENAME, "r")) == NULL)
- return FAIL;
- else
- {
- //fgets(str,200,ConfFile);
- while (!feof(ConfFile))
- {
- key = fgetc(ConfFile);
- /* The last character read is the end of file marker */
- /* so don't print it */
- if (!feof(ConfFile))
- {
- sFileName[intItr] = key;
- intItr++;
- }
- }
- sFileName[intItr] = '\0';
- }
- fclose(ConfFile);
- return SUCCESS;
}
/*
1.5 +2 -2 ws-axis/c/src/common/AxisTrace.h
Index: AxisTrace.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/AxisTrace.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisTrace.h 19 Sep 2003 14:48:18 -0000 1.4
+++ AxisTrace.h 6 Oct 2003 12:36:15 -0000 1.5
@@ -67,7 +67,7 @@
#include <string>
#include <stdio.h>
-//#define AXISTRACE
+/*#define AXISTRACE*/
#if defined(AXISTRACE)
#define AXISTRACE1(X) tracer.trace(X,__FILE__,__LINE__);
#define AXISTRACE2(X,Y) tracer.trace(X,Y,__FILE__,__LINE__);
@@ -93,7 +93,7 @@
private:
char strLine[4];
- char sFileName[200];
+ char* m_sFileName;
FILE* fileTrace;
FILE* ConfFile;
1.11 +0 -2 ws-axis/c/src/common/GDefine.h
Index: GDefine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/GDefine.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GDefine.h 18 Sep 2003 11:18:49 -0000 1.10
+++ GDefine.h 6 Oct 2003 12:36:15 -0000 1.11
@@ -81,10 +81,8 @@
#ifdef WIN32
#define AxisSprintf(X, Y, Z, W) sprintf(X, Z, W)
- #define CONFFILENAME "c:\\program files\axiscpp.conf"
#else //linux
#define AxisSprintf(X, Y, Z, W) sprintf(X, Z, W)
- #define CONFFILENAME "/etc/axiscpp.conf"
#endif
extern void Ax_Sleep(int);
1.8 +1 -1 ws-axis/c/src/common/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 17 Sep 2003 05:54:38 -0000 1.7
+++ Makefile.am 6 Oct 2003 12:36:15 -0000 1.8
@@ -2,7 +2,7 @@
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
libcommon_la_SOURCES = Param.cpp TypeMapping.cpp Packet.cpp MessageData.cpp \
BasicTypeSerializer.cpp ArrayBean.cpp AxisTime.cpp \
- GDefine.cpp AxisUtils.cpp AxisTrace.cpp AxisException.cpp
+ GDefine.cpp AxisUtils.cpp AxisTrace.cpp AxisException.cpp AxisConfig.cpp
libcommon_la_LIBADD = -L$(XERCES_HOME)/lib -lxerces-c -lstdc++
INCLUDES = -I$(AXISCPP_HOME)/include
1.22 +9 -1 ws-axis/c/src/engine/Axis.cpp
Index: Axis.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/Axis.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Axis.cpp 26 Sep 2003 07:16:28 -0000 1.21
+++ Axis.cpp 6 Oct 2003 12:36:15 -0000 1.22
@@ -87,8 +87,10 @@
#include "DeserializerPool.h"
#include "../wsdd/WSDDDeployment.h"
#include "../common/AxisUtils.h"
+#include "../common/AxisConfig.h"
#include "../wsdd/WSDDKeywords.h"
+
#define BYTESTOREAD 64
//the relative location of the wsdl files hardcoded
#define WSDLDIRECTORY "./Axis/wsdl/"
@@ -108,6 +110,7 @@
HandlerPool* g_pHandlerPool;
//un synchronized read-only global variables.
WSDDDeployment* g_pWSDDDeployment;
+AxisConfig* g_pConfig;
#define AXISTRACE1
@@ -235,7 +238,8 @@
URIMapping::Initialize();
SoapFault::initialize();
ModuleInitialize();
- if (SUCCESS != g_pWSDDDeployment->LoadWSDD(wsddPath)) return FAIL;
+ char* pWsddPath = g_pConfig->GetWsddFilePath();
+ if (SUCCESS != g_pWSDDDeployment->LoadWSDD(pWsddPath)) return FAIL;
return SUCCESS;
}
@@ -268,6 +272,9 @@
g_pHandlerPool = new HandlerPool();
//un synchronized read-only global variables.
g_pWSDDDeployment = new WSDDDeployment();
+ g_pConfig = new AxisConfig();
+
+
}
void ModuleUnInitialize()
@@ -282,4 +289,5 @@
delete g_pHandlerPool;
//un synchronized read-only global variables.
delete g_pWSDDDeployment;
+ delete g_pConfig;
}
1.23 +3 -1 ws-axis/c/src/engine/AxisEngine.cpp
Index: AxisEngine.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngine.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AxisEngine.cpp 11 Sep 2003 10:42:48 -0000 1.22
+++ AxisEngine.cpp 6 Oct 2003 12:36:15 -0000 1.23
@@ -89,6 +89,7 @@
m_pSReqFChain = NULL;
m_pSResFChain = NULL;
m_pMsgData = NULL;
+
}
AxisEngine::~AxisEngine()
@@ -107,7 +108,8 @@
if (SUCCESS != (Status = g_pSerializerPool->GetInstance(&m_pSZ))) return Status;
if (SUCCESS != (Status = g_pDeserializerPool->GetInstance(&m_pDZ))) return Status;
m_pMsgData->SetSerializer(m_pSZ);
- m_pMsgData->SetDeSerializer(m_pDZ);
+ m_pMsgData->SetDeSerializer(m_pDZ);
+
return SUCCESS;
}
1.8 +1 -0 ws-axis/c/src/engine/AxisEngine.h
Index: AxisEngine.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/AxisEngine.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AxisEngine.h 22 Sep 2003 05:12:22 -0000 1.7
+++ AxisEngine.h 6 Oct 2003 12:36:15 -0000 1.8
@@ -66,6 +66,7 @@
#if !defined(__AXISENGINE_INCLUDED__)
#define __AXISENGINE_INCLUDED__
+
#include "../common/GDefine.h"
#include "../common/Packet.h"
#include "../soap/SoapSerializer.h"
1.17 +0 -21 ws-axis/c/src/engine/Main.c
Index: Main.c
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/Main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Main.c 27 Sep 2003 10:28:13 -0000 1.16
+++ Main.c 6 Oct 2003 12:36:15 -0000 1.17
@@ -222,27 +222,6 @@
</soapenv:Body> \
</soapenv:Envelope>";
-int send_response_bytes(const char * res, const void* opstream)
-{
- printf("%s", res);
- return 0;
-}
-
-int get_request_bytes(char * req, int reqsize, int* retsize, const void* ipstream)
-{
- req[0]= '\0';
- strcat(req, ip);
- *retsize= strlen(ip);
-// *retsize = wcslen(ip)*2;
-// memcpy(req, ip, *retsize);
- return 0;
-}
-
-int send_transport_information(Ax_soapstream* sSoapstream)
-{
- return 0;
-}
-
int main()
{
int xx;
1.15 +3 -2 ws-axis/c/src/server/apache/mod_axis.c
Index: mod_axis.c
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/apache/mod_axis.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_axis.c 29 Sep 2003 03:38:20 -0000 1.14
+++ mod_axis.c 6 Oct 2003 12:36:15 -0000 1.15
@@ -7,10 +7,10 @@
#include "../../common/Packet.h"
#include <string.h>
#include <malloc.h>
+
/*
AxisConfig.h contains definitions for the wsdd file path
*/
-#include "../../common/AxisConfig.h"
#define xxx ap_log_rerror(APLOG_MARK,APLOG_ERR, globr,"logged here");
#define yyy ap_log_rerror(APLOG_MARK, APLOG_ERR, globr,"logged here");
@@ -35,7 +35,8 @@
/*
WSDDFILEPATH Defined in common/AxisConfig.h
*/
- initialize_module(1, WSDDFILEPATH);
+
+ initialize_module(1, "");
}
int send_response_bytes(const char* res, const void* opstream)
1.3 +9 -8 ws-axis/c/src/server/handlers/custom/loghandler/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/loghandler/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 2 Oct 2003 06:06:16 -0000 1.2
+++ Makefile 6 Oct 2003 12:36:15 -0000 1.3
@@ -38,10 +38,10 @@
pkgincludedir = $(includedir)/full-package-name
top_builddir = .
-ACLOCAL = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/loghandler/missing --run aclocal-1.6
-AUTOCONF = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/loghandler/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/loghandler/missing --run automake-1.6
-AUTOHEADER = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/loghandler/missing --run autoheader
+ACLOCAL = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/loghandler/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/loghandler/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/loghandler/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/loghandler/missing --run autoheader
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
@@ -65,7 +65,7 @@
EXEEXT =
OBJEXT = o
PATH_SEPARATOR = :
-AMTAR = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/loghandler/missing --run tar
+AMTAR = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/loghandler/missing --run tar
AS = @AS@
AWK = gawk
CC = gcc
@@ -83,13 +83,13 @@
VERSION = VERSION
am__include = include
am__quote =
-install_sh = /home/damitha/projects/axiscpp/c/src/server/handlers/custom/loghandler/install-sh
+install_sh = /home/damitha/projects/ws-axis/c/src/server/handlers/custom/loghandler/install-sh
lib_LTLIBRARIES = libloghandler.la
SUBDIRS =
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
libloghandler_la_SOURCES = LogAccessCount.cpp LogHandler.cpp
-libloghandler_la_LIBADD = -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c -ldl $(AXISCPP_HOME)/release/libaxiscpp_mod.a
+libloghandler_la_LIBADD = -L$(AXISCPP_HOME)/lib/xerces-c -lxerces-c -ldl $(AXISCPP_HOME)/release/libaxiscpp_mod.la
INCLUDES = -I$(AXISCPP_HOME)/include -I$(AXISCPP_HOME)/src/common
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -99,7 +99,8 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
libloghandler_la_LDFLAGS =
-libloghandler_la_DEPENDENCIES = $(AXISCPP_HOME)/release/libaxiscpp_mod.a
+libloghandler_la_DEPENDENCIES = \
+ $(AXISCPP_HOME)/release/libaxiscpp_mod.la
am_libloghandler_la_OBJECTS = LogAccessCount.lo LogHandler.lo
libloghandler_la_OBJECTS = $(am_libloghandler_la_OBJECTS)
1.3 +6 -6 ws-axis/c/src/server/handlers/custom/simpleauthhandler/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/custom/simpleauthhandler/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 2 Oct 2003 06:06:16 -0000 1.2
+++ Makefile 6 Oct 2003 12:36:15 -0000 1.3
@@ -38,10 +38,10 @@
pkgincludedir = $(includedir)/full-package-name
top_builddir = .
-ACLOCAL = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/simpleauthhandler/missing --run aclocal-1.6
-AUTOCONF = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/simpleauthhandler/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/simpleauthhandler/missing --run automake-1.6
-AUTOHEADER = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/simpleauthhandler/missing --run autoheader
+ACLOCAL = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/simpleauthhandler/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/simpleauthhandler/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/simpleauthhandler/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/simpleauthhandler/missing --run autoheader
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
@@ -65,7 +65,7 @@
EXEEXT =
OBJEXT = o
PATH_SEPARATOR = :
-AMTAR = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/custom/simpleauthhandler/missing --run tar
+AMTAR = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/custom/simpleauthhandler/missing --run tar
AS = @AS@
AWK = gawk
CC = gcc
@@ -83,7 +83,7 @@
VERSION = VERSION
am__include = include
am__quote =
-install_sh = /home/damitha/projects/axiscpp/c/src/server/handlers/custom/simpleauthhandler/install-sh
+install_sh = /home/damitha/projects/ws-axis/c/src/server/handlers/custom/simpleauthhandler/install-sh
lib_LTLIBRARIES = libsimpleauthhandler.la
SUBDIRS =
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
1.3 +6 -6 ws-axis/c/src/server/handlers/global/testhandler1/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/global/testhandler1/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 2 Oct 2003 06:06:16 -0000 1.2
+++ Makefile 6 Oct 2003 12:36:16 -0000 1.3
@@ -38,10 +38,10 @@
pkgincludedir = $(includedir)/full-package-name
top_builddir = .
-ACLOCAL = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/global/testhandler1/missing --run aclocal-1.6
-AUTOCONF = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/global/testhandler1/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/global/testhandler1/missing --run automake-1.6
-AUTOHEADER = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/global/testhandler1/missing --run autoheader
+ACLOCAL = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/global/testhandler1/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/global/testhandler1/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/global/testhandler1/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/global/testhandler1/missing --run autoheader
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
@@ -65,7 +65,7 @@
EXEEXT =
OBJEXT = o
PATH_SEPARATOR = :
-AMTAR = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/global/testhandler1/missing --run tar
+AMTAR = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/global/testhandler1/missing --run tar
AS = @AS@
AWK = gawk
CC = gcc
@@ -83,7 +83,7 @@
VERSION = VERSION
am__include = include
am__quote =
-install_sh = /home/damitha/projects/axiscpp/c/src/server/handlers/global/testhandler1/install-sh
+install_sh = /home/damitha/projects/ws-axis/c/src/server/handlers/global/testhandler1/install-sh
lib_LTLIBRARIES = libtesthandler1.la
SUBDIRS =
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
1.4 +6 -6 ws-axis/c/src/server/handlers/transport/testhandler2/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/ws-axis/c/src/server/handlers/transport/testhandler2/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 2 Oct 2003 06:06:16 -0000 1.3
+++ Makefile 6 Oct 2003 12:36:16 -0000 1.4
@@ -38,10 +38,10 @@
pkgincludedir = $(includedir)/full-package-name
top_builddir = .
-ACLOCAL = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/transport/testhandler2/missing --run aclocal-1.6
-AUTOCONF = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/transport/testhandler2/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/transport/testhandler2/missing --run automake-1.6
-AUTOHEADER = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/transport/testhandler2/missing --run autoheader
+ACLOCAL = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/transport/testhandler2/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/transport/testhandler2/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/transport/testhandler2/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/transport/testhandler2/missing --run autoheader
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
@@ -65,7 +65,7 @@
EXEEXT =
OBJEXT = o
PATH_SEPARATOR = :
-AMTAR = ${SHELL} /home/damitha/projects/axiscpp/c/src/server/handlers/transport/testhandler2/missing --run tar
+AMTAR = ${SHELL} /home/damitha/projects/ws-axis/c/src/server/handlers/transport/testhandler2/missing --run tar
AS = @AS@
AWK = gawk
CC = gcc
@@ -83,7 +83,7 @@
VERSION = VERSION
am__include = include
am__quote =
-install_sh = /home/damitha/projects/axiscpp/c/src/server/handlers/transport/testhandler2/install-sh
+install_sh = /home/damitha/projects/ws-axis/c/src/server/handlers/transport/testhandler2/install-sh
lib_LTLIBRARIES = libtesthandler2.la
SUBDIRS =
AM_CPPFLAGS = -Wshadow -Wall -pedantic -ansi
1.17 +2 -2 ws-axis/c/src/wsdd/WSDDDocument.cpp
Index: WSDDDocument.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdd/WSDDDocument.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WSDDDocument.cpp 12 Sep 2003 06:32:54 -0000 1.16
+++ WSDDDocument.cpp 6 Oct 2003 12:36:16 -0000 1.17
@@ -65,7 +65,7 @@
#include "WSDDDocument.h"
#include "WSDDKeywords.h"
#include <string>
-//#include "../common/AxisTrace.h"
+#include "../common/AxisTrace.h"
WSDDDocument::WSDDDocument()
{
@@ -98,7 +98,7 @@
SAX2XMLReader* parser = XMLReaderFactory::createXMLReader();
parser->setContentHandler(this);
parser->setErrorHandler(this);
-// AXISTRACE1("BEFORE parser->parse(sWSDD);");
+ AXISTRACE1("BEFORE parser->parse(sWSDD);");
parser->parse(sWSDD);
delete parser;
}