You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2004/05/18 14:30:27 UTC
cvs commit: ws-axis/c/src/engine/server Makefile.am
damitha 2004/05/18 05:30:27
Modified: c configure.ac
c/include/axis/server AxisTrace.h
c/src/common AxisTrace.cpp
c/src/engine Axis.cpp
c/src/engine/client Makefile.am
c/src/engine/server Makefile.am
Log:
Revision Changes Path
1.20 +2 -2 ws-axis/c/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.ac 18 May 2004 12:17:21 -0000 1.19
+++ configure.ac 18 May 2004 12:30:26 -0000 1.20
@@ -2,8 +2,8 @@
AM_INIT_AUTOMAKE(0.3)
AM_CONFIG_HEADER(config.h)
#if you use expat parser
-CFLAGS="-Wall -Wshadow -DENABLE_AXIS_EXCEPTION -D__AXISTRACE__"
-CPPFLAGS="-Wall -Wshadow -DENABLE_AXIS_EXCEPTION -D__AXISTRACE__"
+CFLAGS="-Wall -Wshadow -DENABLE_AXIS_EXCEPTION -DENABLE_AXISTRACE"
+CPPFLAGS="-Wall -Wshadow -DENABLE_AXIS_EXCEPTION -DENABLE_AXISTRACE"
LDFLAGS="-s -L$EXPAT_HOME/lib -lexpat -lstdc++"
AC_PROG_CC
AC_PROG_CXX
1.15 +1 -1 ws-axis/c/include/axis/server/AxisTrace.h
Index: AxisTrace.h
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/server/AxisTrace.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AxisTrace.h 18 May 2004 12:18:15 -0000 1.14
+++ AxisTrace.h 18 May 2004 12:30:26 -0000 1.15
@@ -23,7 +23,7 @@
#include <string>
#include <stdio.h>
-#if defined(__AXISTRACE__)
+#if defined(ENABLE_AXISTRACE)
#define AXISTRACE1(X, Y) g_pAT->logaxis(X,Y,__FILE__,__LINE__);
#define AXISTRACE2(X, Y, Z) g_pAT->logaxis(X,Y,Z,__FILE__,__LINE__);
#define AXISTRACE3(X) g_pAT->trace(X);
1.24 +5 -5 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AxisTrace.cpp 18 May 2004 11:57:51 -0000 1.23
+++ AxisTrace.cpp 18 May 2004 12:30:26 -0000 1.24
@@ -194,22 +194,22 @@
}
-int AxisTrace::logaxis (const char* sLog1, const long nLog2, int level,
+int AxisTrace::logaxis (const char* sLog1, const int nLog2, int level,
char* arg3, int arg4)
{
if (!m_bLoggingOn) return AXIS_FAIL;
- char* convToLong = (char*) malloc(4 * sizeof(char));
+ char* convToInt = (char*) malloc(4 * sizeof(char));
int iResult = logthis(sLog1, level, arg3, arg4);
if(AXIS_SUCCESS == iResult)
{
- sprintf(convToLong, "%d", nLog2);
+ sprintf(convToInt, "%d", nLog2);
/*fputs (convToLong, m_fileTrace);
fputs ("\n", m_fileTrace);
fputs ("-------------------------------------------------", m_fileTrace);
fputs ("\n", m_fileTrace);
fflush (m_fileTrace);*/
- m_fileTrace.filePuts (convToLong);
+ m_fileTrace.filePuts (convToInt);
m_fileTrace.filePuts ("\n");
m_fileTrace.filePuts ("-------------------------------------------------");
m_fileTrace.filePuts ("\n");
@@ -218,7 +218,7 @@
return AXIS_SUCCESS;
}
- free(convToLong);
+ free(convToInt);
return AXIS_FAIL;
}
1.54 +1 -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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Axis.cpp 18 May 2004 11:09:09 -0000 1.53
+++ Axis.cpp 18 May 2004 12:30:26 -0000 1.54
@@ -279,7 +279,7 @@
*/
if (status == AXIS_SUCCESS)
{
-#if defined(__AXISTRACE__)
+#if defined(ENABLE_AXISTRACE)
status = g_pAT->openFileByClient ();
if (status == AXIS_FAIL)
{
1.13 +0 -1 ws-axis/c/src/engine/client/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.am 18 May 2004 11:43:04 -0000 1.12
+++ Makefile.am 18 May 2004 12:30:27 -0000 1.13
@@ -12,7 +12,6 @@
../SerializerPool.cpp \
../SessionScopeHandlerPool.cpp \
../SharedObject.cpp \
- ../../transport/SOAPTransportFactory.cpp \
Call.cpp \
../AxisEngineException.cpp \
../SOAPTransportFactory.cpp \
1.9 +0 -1 ws-axis/c/src/engine/server/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/server/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 18 May 2004 11:43:04 -0000 1.8
+++ Makefile.am 18 May 2004 12:30:27 -0000 1.9
@@ -12,7 +12,6 @@
../SerializerPool.cpp \
../SessionScopeHandlerPool.cpp \
../SharedObject.cpp \
- ../../transport/SOAPTransportFactory.cpp \
../AxisEngineException.cpp \
../SOAPTransportFactory.cpp \
../XMLParserFactory.cpp