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 wh...@apache.org on 2005/02/18 13:24:26 UTC
cvs commit: ws-axis/c/vc/samples/client/simple Calculator.dsp
whitlock 2005/02/18 04:24:26
Modified: c/samples/client/interoptests/groupB
InteropTestPortTypeB.cpp InteropTestPortTypeB.hpp
c/samples/client/rpcfault MathOps.cpp
c/samples/client/testHandler THandler.cpp
c/samples/server/echoStringHeaderHandler ESHHandler.cpp
c/src/common AxisTrace.cpp AxisTrace.h
c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp
ClientStubWriter.java
c/vc/samples/client/ArrayClient ArrayClient.dsp
c/vc/samples/client/DocLitFaultClient DocLitFaultClient.dsp
c/vc/samples/client/RPCFaultClient RPCFaultClient.dsp
c/vc/samples/client/RefClient RefClient.dsp
c/vc/samples/client/interoptests/base base.dsp
c/vc/samples/client/interoptests/groupB groupB.dsp
c/vc/samples/client/session/Cookie cookiesessions.dsp
c/vc/samples/client/session/Headers/sessionClient
sessionClient.dsp
c/vc/samples/client/simple Calculator.dsp
Log:
AXISCPP-453 Make samples work with new soap faults. This includes regenerating code and updating the MSVC projects.
AXISCPP-164 Added startup trace
Revision Changes Path
1.22 +25 -42 ws-axis/c/samples/client/interoptests/groupB/InteropTestPortTypeB.cpp
Index: InteropTestPortTypeB.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/groupB/InteropTestPortTypeB.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- InteropTestPortTypeB.cpp 13 Jan 2005 02:35:04 -0000 1.21
+++ InteropTestPortTypeB.cpp 18 Feb 2005 12:24:24 -0000 1.22
@@ -35,7 +35,7 @@
InteropTestPortTypeB::InteropTestPortTypeB()
:Stub(" ", APTHTTP1_1)
{
- m_pCall->setEndpointURI("http://localhost/axis/groupB");
+ m_pCall->setEndpointURI("http://localhost/axis/InteropGroupB");
}
InteropTestPortTypeB::~InteropTestPortTypeB()
@@ -55,7 +55,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER))
return ;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "groupB#echoStructAsSimpleTypes");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropGroupB#echoStructAsSimpleTypes");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoStructAsSimpleTypes", "http://soapinterop.org/");
applyUserPreferences();
@@ -69,7 +69,6 @@
*OutValue2 = m_pCall->getElementAsFloat("outputFloat", 0);
}
}
-
m_pCall->unInitialize();
}
catch(AxisException& e)
@@ -77,16 +76,14 @@
int iExceptionCode = e.getExceptionCode();
if(AXISC_NODE_VALUE_MISMATCH_EXCEPTION != iExceptionCode)
{
-
- m_pCall->unInitialize();
- throw groupB_AxisClientException(e.what());
+ throw SoapFaultException(e);
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/groupB" );
+ ISoapFault* pSoapFault = (ISoapFault*)
+ m_pCall->checkFault("Fault","http://localhost/axis/InteropGroupB" );
if(pSoapFault)
{
-
- m_pCall->unInitialize();
- throw groupB_AxisClientException(pSoapFault);
+ m_pCall->unInitialize();
+ throw SoapFaultException(e);
}
else throw;
}
@@ -104,7 +101,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER))
return pReturn;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "groupB#echoSimpleTypesAsStruct");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropGroupB#echoSimpleTypesAsStruct");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoSimpleTypesAsStruct", "http://soapinterop.org/");
applyUserPreferences();
@@ -118,7 +115,6 @@
pReturn = (SOAPStruct*)m_pCall->getCmplxObject((void*) Axis_DeSerialize_SOAPStruct, (void*) Axis_Create_SOAPStruct, (void*) Axis_Delete_SOAPStruct,"_return", 0);
}
}
-
m_pCall->unInitialize();
return pReturn;
}
@@ -127,16 +123,14 @@
int iExceptionCode = e.getExceptionCode();
if(AXISC_NODE_VALUE_MISMATCH_EXCEPTION != iExceptionCode)
{
-
- m_pCall->unInitialize();
- throw groupB_AxisClientException(e.what());
+ throw SoapFaultException(e);
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/groupB" );
+ ISoapFault* pSoapFault = (ISoapFault*)
+ m_pCall->checkFault("Fault","http://localhost/axis/InteropGroupB" );
if(pSoapFault)
{
-
- m_pCall->unInitialize();
- throw groupB_AxisClientException(pSoapFault);
+ m_pCall->unInitialize();
+ throw SoapFaultException(e);
}
else throw;
}
@@ -154,7 +148,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER))
return pReturn;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "groupB#echoNestedStruct");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropGroupB#echoNestedStruct");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoNestedStruct", "http://soapinterop.org/");
applyUserPreferences();
@@ -166,7 +160,6 @@
pReturn = (SOAPStructStruct*)m_pCall->getCmplxObject((void*) Axis_DeSerialize_SOAPStructStruct, (void*) Axis_Create_SOAPStructStruct, (void*) Axis_Delete_SOAPStructStruct,"_return", 0);
}
}
-
m_pCall->unInitialize();
return pReturn;
}
@@ -175,16 +168,14 @@
int iExceptionCode = e.getExceptionCode();
if(AXISC_NODE_VALUE_MISMATCH_EXCEPTION != iExceptionCode)
{
-
- m_pCall->unInitialize();
- throw groupB_AxisClientException(e.what());
+ throw SoapFaultException(e);
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/groupB" );
+ ISoapFault* pSoapFault = (ISoapFault*)
+ m_pCall->checkFault("Fault","http://localhost/axis/InteropGroupB" );
if(pSoapFault)
{
-
- m_pCall->unInitialize();
- throw groupB_AxisClientException(pSoapFault);
+ m_pCall->unInitialize();
+ throw SoapFaultException(e);
}
else throw;
}
@@ -202,7 +193,7 @@
{
if (AXIS_SUCCESS != m_pCall->initialize(CPP_RPC_PROVIDER))
return pReturn;
- m_pCall->setTransportProperty(SOAPACTION_HEADER , "groupB#echoNestedArray");
+ m_pCall->setTransportProperty(SOAPACTION_HEADER , "InteropGroupB#echoNestedArray");
m_pCall->setSOAPVersion(SOAP_VER_1_1);
m_pCall->setOperation("echoNestedArray", "http://soapinterop.org/");
applyUserPreferences();
@@ -214,7 +205,6 @@
pReturn = (SOAPArrayStruct*)m_pCall->getCmplxObject((void*) Axis_DeSerialize_SOAPArrayStruct, (void*) Axis_Create_SOAPArrayStruct, (void*) Axis_Delete_SOAPArrayStruct,"_return", 0);
}
}
-
m_pCall->unInitialize();
return pReturn;
}
@@ -223,23 +213,16 @@
int iExceptionCode = e.getExceptionCode();
if(AXISC_NODE_VALUE_MISMATCH_EXCEPTION != iExceptionCode)
{
-
- m_pCall->unInitialize();
- throw groupB_AxisClientException(e.what());
+ throw SoapFaultException(e);
}
- ISoapFault* pSoapFault = (ISoapFault*) m_pCall->checkFault("Fault","http://localhost/axis/groupB" );
+ ISoapFault* pSoapFault = (ISoapFault*)
+ m_pCall->checkFault("Fault","http://localhost/axis/InteropGroupB" );
if(pSoapFault)
{
-
- m_pCall->unInitialize();
- throw groupB_AxisClientException(pSoapFault);
+ m_pCall->unInitialize();
+ throw SoapFaultException(e);
}
else throw;
}
}
-int InteropTestPortTypeB::getFaultDetail(char** ppcDetail)
-{
- return m_pCall->getFaultDetail(ppcDetail);
-}
-
1.2 +2 -2 ws-axis/c/samples/client/interoptests/groupB/InteropTestPortTypeB.hpp
Index: InteropTestPortTypeB.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/interoptests/groupB/InteropTestPortTypeB.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InteropTestPortTypeB.hpp 10 Jan 2005 05:34:42 -0000 1.1
+++ InteropTestPortTypeB.hpp 18 Feb 2005 12:24:24 -0000 1.2
@@ -7,8 +7,9 @@
#define __INTEROPTESTPORTTYPEB_CLIENTSTUB_H__INCLUDED_
#include <axis/client/Stub.hpp>
-#include "groupB_AxisClientException.hpp"
+#include <axis/SoapFaultException.hpp>
#include <axis/ISoapFault.hpp>
+AXIS_CPP_NAMESPACE_USE
#include "SOAPArrayStruct.hpp"
#include "SOAPStruct.hpp"
#include "SOAPStructStruct.hpp"
@@ -25,7 +26,6 @@
STORAGE_CLASS_INFO SOAPStruct* echoSimpleTypesAsStruct(xsd__string Value0,xsd__int Value1,xsd__float Value2);
STORAGE_CLASS_INFO SOAPStructStruct* echoNestedStruct(SOAPStructStruct* Value0);
STORAGE_CLASS_INFO SOAPArrayStruct* echoNestedArray(SOAPArrayStruct* Value0);
- int getFaultDetail(char** ppcDetail);
};
#endif /* !defined(__INTEROPTESTPORTTYPEB_CLIENTSTUB_H__INCLUDED_)*/
1.26 +1 -1 ws-axis/c/samples/client/rpcfault/MathOps.cpp
Index: MathOps.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/rpcfault/MathOps.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- MathOps.cpp 17 Feb 2005 16:28:40 -0000 1.25
+++ MathOps.cpp 18 Feb 2005 12:24:24 -0000 1.26
@@ -71,7 +71,7 @@
m_pCall->checkFault("Fault","http://localhost/axis/MathOps" );
if(pSoapFault)
{
- pcCmplxFaultName = pSoapFault->getCmplxFaultObjectName().c_str();
+ pcCmplxFaultName = pSoapFault->getCmplxFaultObjectName();
if(0 == strcmp("DivByZero", pcCmplxFaultName))
{
DivByZeroStruct* pFaultDetail =
1.7 +1 -1 ws-axis/c/samples/client/testHandler/THandler.cpp
Index: THandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/client/testHandler/THandler.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- THandler.cpp 24 Nov 2004 13:25:18 -0000 1.6
+++ THandler.cpp 18 Feb 2005 12:24:24 -0000 1.7
@@ -72,7 +72,7 @@
//pIHeaderBlock->setUri("http://opensource.lk/testClientHandlerHeader/");
pIHeaderBlock->setLocalName("echoMeString");
- pIHeaderBlock->setUri("http://soapinterop.org/echoheader/");
+ pIHeaderBlock->setURI("http://soapinterop.org/echoheader/");
const AxisChar* pachHeaderVal = "test Header Val";
1.18 +1 -1 ws-axis/c/samples/server/echoStringHeaderHandler/ESHHandler.cpp
Index: ESHHandler.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/samples/server/echoStringHeaderHandler/ESHHandler.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ESHHandler.cpp 24 Nov 2004 13:25:18 -0000 1.17
+++ ESHHandler.cpp 18 Feb 2005 12:24:24 -0000 1.18
@@ -56,7 +56,7 @@
IHeaderBlock* pIHeaderBlock= pISZ->createHeaderBlock();
pIHeaderBlock->setLocalName("echoMeStringResponse");
- pIHeaderBlock->setUri("http://soapinterop.org/echoheader/");
+ pIHeaderBlock->setURI("http://soapinterop.org/echoheader/");
pachTemp = "EchoStringHeaderHandlerPr1.id";
1.57 +69 -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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- AxisTrace.cpp 10 Feb 2005 13:08:43 -0000 1.56
+++ AxisTrace.cpp 18 Feb 2005 12:24:24 -0000 1.57
@@ -38,51 +38,97 @@
AXIS_CPP_NAMESPACE_START
using namespace std;
-bool AxisTrace::m_bLoggingOn = false;
+enum AxisTraceState AxisTrace::m_bLoggingOn = STATE_UNINITIALISED;
AxisFile *AxisTrace::m_fileTrace = NULL;
int AxisTrace::openFile ()
{
- m_fileTrace = new AxisFile();
- //char* sFileName = g_pConfig->getAxisLogPath ();
- char* sFileName = g_pConfig->getAxisConfProperty(AXCONF_LOGPATH);
- if (!sFileName) return AXIS_FAIL;
- if(AXIS_FAIL == m_fileTrace->fileOpen(sFileName, "a"))
- return AXIS_FAIL;
- m_bLoggingOn = true;
- traceHeader();
- return AXIS_SUCCESS;
+ return initialise(g_pConfig->getAxisConfProperty(AXCONF_LOGPATH), STATE_ON);
}
int AxisTrace::openFileByClient ()
{
- m_fileTrace = new AxisFile();
- //char* sFileName = g_pConfig->getAxisClientLogPath ();
- char* sFileName = g_pConfig->getAxisConfProperty(AXCONF_CLIENTLOGPATH);
- if (!sFileName) return AXIS_FAIL;
- if(AXIS_FAIL == m_fileTrace->fileOpen(sFileName, "a"))
- return AXIS_FAIL;
- m_bLoggingOn = true;
+ return initialise(g_pConfig->getAxisConfProperty(AXCONF_CLIENTLOGPATH), STATE_ON);
+}
+
+int AxisTrace::initialise(const char *filename, AxisTraceState newState)
+{
+ AxisFile *newFile = NULL;
+ int result = AXIS_SUCCESS;
+ if (NULL != filename)
+ {
+ newFile = new AxisFile();
+ if (NULL == newFile ||
+ AXIS_FAIL == newFile->fileOpen(filename, "a"))
+ result = AXIS_FAIL;
+ }
+
+ if (NULL != m_fileTrace)
+ {
+ if (AXIS_FAIL == result)
+ {
+ /*
+ * If we have failed to open the trace file specified in axiscpp.conf and the
+ * startup trace file is open then write a sensible error message out to the
+ * startup trace file before we close it.
+ */
+ if (NULL == newFile)
+ traceLineInternal("Failed to open trace file in axiscpp.conf because of no storage");
+ else
+ {
+ string text = "Failed to open trace file ";
+ text += filename;
+ text += " that was specified by ClientLogPath in axiscpp.conf";
+ traceLineInternal(text.c_str());
+ }
+ }
+ delete m_fileTrace;
+ }
+ m_bLoggingOn = STATE_OFF;
+
+ if (NULL == filename || AXIS_FAIL == result)
+ {
+ if (NULL != newFile) delete newFile;
+ return AXIS_FAIL;
+ }
+
+ m_fileTrace = newFile;
+ m_bLoggingOn = newState;
traceHeader();
- return AXIS_SUCCESS;
+ return AXIS_SUCCESS;
}
void AxisTrace::terminate()
{
- m_bLoggingOn = false;
+ m_bLoggingOn = STATE_STOPPED;
delete m_fileTrace;
m_fileTrace = NULL;
}
bool AxisTrace::isTraceOn()
{
- return m_bLoggingOn;
+ switch (m_bLoggingOn)
+ {
+ case STATE_OFF:
+ case STATE_STOPPED:
+ return false;
+
+ case STATE_ON:
+ case STATE_STARTUP:
+ return true;
+
+ case STATE_UNINITIALISED:
+ return AXIS_SUCCESS==initialise(getenv("AXISCPP_STARTUP_TRACE"),STATE_STARTUP);
+
+ default:
+ return false;
+ }
}
int AxisTrace::logaxis (const char* sLog1, const char* sLog2, const char *type,
char* file, int line)
{
- if (!m_bLoggingOn) return AXIS_FAIL;
+ if (isTraceOn()) return AXIS_FAIL;
string name = file;
name += "@";
@@ -189,6 +235,8 @@
const char *methodname, const void *that,
const char *parms)
{
+ if (!isTraceOn()) return;
+
time_t current = time(NULL);
struct tm *tm = localtime(¤t);
@@ -244,7 +292,6 @@
void AxisTrace::traceLine2(const char *data)
{
- if (!isTraceOn()) return;
m_fileTrace->filePuts(data);
m_fileTrace->filePuts("\n");
m_fileTrace->fileFlush();
@@ -460,12 +507,4 @@
}
}
-/*
-int main(int argc, char* argv[])
-{
- tracer.trace("test");
- return 0;
-}
-*/
-
AXIS_CPP_NAMESPACE_END
1.31 +22 -1 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AxisTrace.h 10 Feb 2005 13:08:43 -0000 1.30
+++ AxisTrace.h 18 Feb 2005 12:24:24 -0000 1.31
@@ -85,6 +85,25 @@
#define TRACE_WARN "W"
#define TRACE_EXCEPT "X"
+/*
+ * enum AxisTraceState gives the states that trace can be in. This is primarily
+ * to support startup trace. So initially trace is uninitialised. Then at the
+ * first trace call isTraceOn decides whether startup trace should be on and
+ * either initialises startup trace or switches trace off. Then when axiscpp.conf
+ * is read in openFile() or openFileByClient() is called which switches trace off
+ * or on depending on how ClientLogPath or LogPath is set. Either way startup
+ * trace is switched off when axiscpp.conf is read in. When trace is terminated,
+ * trace is set to stopped.
+ */
+enum AxisTraceState
+{
+ STATE_UNINITIALISED=0,
+ STATE_OFF,
+ STATE_ON,
+ STATE_STOPPED,
+ STATE_STARTUP
+};
+
class AxisTraceEntrypoints {
public:
void (*m_traceLine)(const char *data);
@@ -275,7 +294,8 @@
#endif
private:
- static bool m_bLoggingOn;
+
+ static enum AxisTraceState m_bLoggingOn;
static AxisFile *m_fileTrace;
static int logthis(const char* pcLog, int level, char* arg2, int arg3);
@@ -283,6 +303,7 @@
static void addDataParameter(std::string& line, unsigned len, void *value);
static void traceHeader();
static void traceLine2(const char *data);
+ static int initialise(const char *filename, enum AxisTraceState newState);
};
AXIS_CPP_NAMESPACE_END
1.71 +2 -2 ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java
Index: ClientStubWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wsdl/org/apache/axis/wsdl/wsdl2ws/cpp/ClientStubWriter.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ClientStubWriter.java 18 Feb 2005 11:11:20 -0000 1.70
+++ ClientStubWriter.java 18 Feb 2005 12:24:25 -0000 1.71
@@ -738,7 +738,7 @@
+ "\" );\n");
writer.write("\t\tif(pSoapFault)\n");
writer.write("\t\t{\n");
- //writer.write("\t\t\tpcCmplxFaultName = pSoapFault->getCmplxFaultObjectName().c_str();\n");
+ //writer.write("\t\t\tpcCmplxFaultName = pSoapFault->getCmplxFaultObjectName();\n");
//to get fault info
Iterator paramsFault = minfo.getFaultType().iterator();
String faultInfoName = null;
@@ -756,7 +756,7 @@
{
flag = true;
writer.write(
- "\t\t\tpcCmplxFaultName = pSoapFault->getCmplxFaultObjectName().c_str();\n");
+ "\t\t\tpcCmplxFaultName = pSoapFault->getCmplxFaultObjectName();\n");
}
while (paramsFault.hasNext())
{
1.2 +0 -4 ws-axis/c/vc/samples/client/ArrayClient/ArrayClient.dsp
Index: ArrayClient.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/ArrayClient/ArrayClient.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArrayClient.dsp 7 Oct 2004 09:33:55 -0000 1.1
+++ ArrayClient.dsp 18 Feb 2005 12:24:25 -0000 1.2
@@ -87,10 +87,6 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\samples\client\array\array_AxisClientException.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\samples\client\array\ArrayClient.cpp
# End Source File
# Begin Source File
1.4 +0 -8 ws-axis/c/vc/samples/client/DocLitFaultClient/DocLitFaultClient.dsp
Index: DocLitFaultClient.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/DocLitFaultClient/DocLitFaultClient.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DocLitFaultClient.dsp 2 Dec 2004 08:33:13 -0000 1.3
+++ DocLitFaultClient.dsp 18 Feb 2005 12:24:25 -0000 1.4
@@ -97,10 +97,6 @@
SOURCE=..\..\..\..\samples\client\doclitfault\MathOpsClient.cpp
# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\samples\client\doclitfault\MathOpsDL_AxisClientException.cpp
-# End Source File
# End Group
# Begin Group "Header Files"
@@ -113,10 +109,6 @@
SOURCE=..\..\..\..\samples\client\doclitfault\MathOps.hpp
# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\samples\client\doclitfault\MathOpsDL_AxisClientException.hpp
-# End Source File
# End Group
# Begin Group "Resource Files"
1.4 +0 -8 ws-axis/c/vc/samples/client/RPCFaultClient/RPCFaultClient.dsp
Index: RPCFaultClient.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/RPCFaultClient/RPCFaultClient.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RPCFaultClient.dsp 2 Dec 2004 07:54:01 -0000 1.3
+++ RPCFaultClient.dsp 18 Feb 2005 12:24:25 -0000 1.4
@@ -96,10 +96,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\samples\client\rpcfault\MathOps_AxisClientException.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\samples\client\rpcfault\MathOpsClient.cpp
# End Source File
# End Group
@@ -114,10 +110,6 @@
SOURCE=..\..\..\..\samples\client\rpcfault\MathOps.hpp
# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\samples\client\rpcfault\MathOps_AxisClientException.hpp
-# End Source File
# End Group
# Begin Group "Resource Files"
1.2 +4 -8 ws-axis/c/vc/samples/client/RefClient/RefClient.dsp
Index: RefClient.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/RefClient/RefClient.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RefClient.dsp 7 Oct 2004 09:35:00 -0000 1.1
+++ RefClient.dsp 18 Feb 2005 12:24:25 -0000 1.2
@@ -49,7 +49,7 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 AxisClient.lib /nologo /subsystem:console /machine:I386 /out:"../../../../bin/RefClient.exe" /libpath:"../../../../bin"
!ELSEIF "$(CFG)" == "RefClient - Win32 Debug"
@@ -65,15 +65,15 @@
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 AxisClient_D.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../../bin/RefClient_D.exe" /pdbtype:sept /libpath:"../../../../bin"
!ENDIF
@@ -91,10 +91,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\samples\client\ref\ref_AxisClientException.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\samples\client\ref\RefClient.cpp
# End Source File
# Begin Source File
1.9 +0 -4 ws-axis/c/vc/samples/client/interoptests/base/base.dsp
Index: base.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/base/base.dsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- base.dsp 22 Dec 2004 10:10:18 -0000 1.8
+++ base.dsp 18 Feb 2005 12:24:25 -0000 1.9
@@ -88,10 +88,6 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\samples\client\interoptests\base\base_AxisClientException.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\samples\client\interoptests\base\InteropBaseClient.cpp
# End Source File
# Begin Source File
1.7 +0 -4 ws-axis/c/vc/samples/client/interoptests/groupB/groupB.dsp
Index: groupB.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/interoptests/groupB/groupB.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- groupB.dsp 12 Aug 2004 13:44:08 -0000 1.6
+++ groupB.dsp 18 Feb 2005 12:24:25 -0000 1.7
@@ -87,10 +87,6 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\samples\client\interoptests\groupB\AxisClientException.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\samples\client\interoptests\groupB\InteropGroupBClient.cpp
# End Source File
# Begin Source File
1.2 +0 -4 ws-axis/c/vc/samples/client/session/Cookie/cookiesessions.dsp
Index: cookiesessions.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/session/Cookie/cookiesessions.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cookiesessions.dsp 29 Nov 2004 13:02:34 -0000 1.1
+++ cookiesessions.dsp 18 Feb 2005 12:24:25 -0000 1.2
@@ -93,10 +93,6 @@
SOURCE=..\..\..\..\..\samples\client\session\cookie\gen_src\Total.cpp
# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\samples\client\session\cookie\gen_src\TotalService_AxisClientException.cpp
-# End Source File
# End Group
# Begin Group "Header Files"
1.2 +0 -8 ws-axis/c/vc/samples/client/session/Headers/sessionClient/sessionClient.dsp
Index: sessionClient.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/session/Headers/sessionClient/sessionClient.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sessionClient.dsp 29 Nov 2004 13:06:05 -0000 1.1
+++ sessionClient.dsp 18 Feb 2005 12:24:25 -0000 1.2
@@ -91,10 +91,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\..\samples\client\session\headers\sessionclient\gen_src\Counter_AxisClientException.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\..\samples\client\session\headers\sessionclient\CounterClient.cpp
# End Source File
# End Group
@@ -105,10 +101,6 @@
SOURCE=..\..\..\..\..\..\samples\client\session\headers\sessionclient\gen_src\Counter.hpp
# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\..\samples\client\session\headers\sessionclient\gen_src\Counter_AxisClientException.hpp
-# End Source File
# End Group
# Begin Group "Resource Files"
1.3 +0 -8 ws-axis/c/vc/samples/client/simple/Calculator.dsp
Index: Calculator.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/samples/client/simple/Calculator.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Calculator.dsp 4 Jan 2005 07:04:30 -0000 1.2
+++ Calculator.dsp 18 Feb 2005 12:24:25 -0000 1.3
@@ -93,10 +93,6 @@
SOURCE=..\..\..\..\samples\client\simple\Calculator.cpp
# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\samples\client\simple\Calculator_AxisClientException.cpp
-# End Source File
# End Group
# Begin Group "Header Files"
@@ -105,10 +101,6 @@
SOURCE=..\..\..\..\samples\client\simple\Calculator.hpp
# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\samples\client\simple\Calculator_AxisClientException.hpp
-# End Source File
# End Group
# Begin Group "Resource Files"