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 na...@apache.org on 2006/04/18 08:52:51 UTC

svn commit: r394863 [4/6] - in /webservices/axis/trunk/c: include/axis/ src/cbindings/ src/cbindings/client/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/ src/wsdl/org/apache/axis/wsdl/wsdl2ws/c/literal/ tests/auto_bui...

Modified: webservices/axis/trunk/c/src/cbindings/client/StubC.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/cbindings/client/StubC.cpp?rev=394863&r1=394862&r2=394863&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/cbindings/client/StubC.cpp (original)
+++ webservices/axis/trunk/c/src/cbindings/client/StubC.cpp Mon Apr 17 23:52:47 2006
@@ -44,7 +44,7 @@
 extern "C" {
 
 AXISC_STORAGE_CLASS_INFO 
-AXISCHANDLE axiscCreateStub(const char * pcEndPointURI, 
+AXISCHANDLE axiscStubCreate(const char * pcEndPointURI, 
                             AXISC_PROTOCOL_TYPE eProtocol) 
 {  
     try
@@ -55,18 +55,18 @@
     }
     catch ( AxisException& e  )
     {
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
     
     return (AXISCHANDLE)NULL;
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscDestroyStub(AXISCHANDLE stub) 
+void axiscStubDestroy(AXISCHANDLE stub) 
 {
 	if ((AXISCHANDLE)NULL == stub)
 		return;
@@ -81,16 +81,16 @@
     }
     catch ( AxisException& e  )
     {
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscSetEndPoint(AXISCHANDLE stub, 
+void axiscStubSetEndPoint(AXISCHANDLE stub, 
                       const char * pcEndPointURI) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -104,18 +104,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscSetTransportPropertyStub(AXISCHANDLE stub, 
+void axiscStubSetTransportProperty(AXISCHANDLE stub, 
                                    const char * pcKey, 
                                    const char * pcValue) 
 {
@@ -130,18 +130,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-const char * axiscGetTransportPropertyStub(AXISCHANDLE stub, 
+const char * axiscStubGetTransportProperty(AXISCHANDLE stub, 
                                            const char *key, 
                                            AxiscBool response) 
 {
@@ -156,20 +156,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (const char *)NULL;
 }
 
 AXISC_STORAGE_CLASS_INFO 
-const char * axiscGetFirstTransportPropertyKey(AXISCHANDLE stub, 
+const char * axiscStubGetFirstTransportPropertyKey(AXISCHANDLE stub, 
                                                AxiscBool response) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -183,20 +183,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
     
     return (const char *)NULL;
 }
 
 AXISC_STORAGE_CLASS_INFO 
-const char * axiscGetNextTransportPropertyKey(AXISCHANDLE stub, 
+const char * axiscStubGetNextTransportPropertyKey(AXISCHANDLE stub, 
                                               AxiscBool response) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -210,20 +210,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (const char *)NULL;
 }
 
 AXISC_STORAGE_CLASS_INFO 
-const char * axiscGetCurrentTransportPropertyKey(AXISCHANDLE stub, 
+const char * axiscStubGetCurrentTransportPropertyKey(AXISCHANDLE stub, 
                                                  AxiscBool response) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -237,20 +237,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (const char *)NULL;    
 }
 
 AXISC_STORAGE_CLASS_INFO 
-const char * axiscGetCurrentTransportPropertyValue(AXISCHANDLE stub, 
+const char * axiscStubGetCurrentTransportPropertyValue(AXISCHANDLE stub, 
                                                    AxiscBool response) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -264,20 +264,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (const char *)NULL;    
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscDeleteCurrentTransportProperty(AXISCHANDLE stub, 
+void axiscStubDeleteCurrentTransportProperty(AXISCHANDLE stub, 
                                          AxiscBool response) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -291,18 +291,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscDeleteTransportProperty(AXISCHANDLE stub, 
+void axiscStubDeleteTransportProperty(AXISCHANDLE stub, 
                                   char * pcKey, 
                                   unsigned int uiOccurance) 
 {
@@ -317,18 +317,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscSetHandlerPropertyStub(AXISCHANDLE stub, 
+void axiscStubSetHandlerProperty(AXISCHANDLE stub, 
                                  AxiscChar * name, 
                                  void * value, 
                                  int len) 
@@ -344,18 +344,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-AXISCHANDLE axiscCreateSOAPHeaderBlock(AXISCHANDLE stub, 
+AXISCHANDLE axiscStubCreateSOAPHeaderBlock(AXISCHANDLE stub, 
                                        AxiscChar * pachLocalName, 
                                        AxiscChar * pachUri, 
                                        AxiscChar * pachPrefix) 
@@ -371,20 +371,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (AXISCHANDLE)NULL;
 }
 
 AXISC_STORAGE_CLASS_INFO 
-AXISCHANDLE axiscGetFirstSOAPHeaderBlock(AXISCHANDLE stub) 
+AXISCHANDLE axiscStubGetFirstSOAPHeaderBlock(AXISCHANDLE stub) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -397,20 +397,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (AXISCHANDLE)NULL;    
 }
 
 AXISC_STORAGE_CLASS_INFO 
-AXISCHANDLE axiscGetNextSOAPHeaderBlock(AXISCHANDLE stub) 
+AXISCHANDLE axiscStubGetNextSOAPHeaderBlock(AXISCHANDLE stub) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -423,20 +423,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (AXISCHANDLE)NULL;    
 }
 
 AXISC_STORAGE_CLASS_INFO 
-AXISCHANDLE axiscGetCurrentSOAPHeaderBlock(AXISCHANDLE stub) 
+AXISCHANDLE axiscStubGetCurrentSOAPHeaderBlock(AXISCHANDLE stub) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -449,20 +449,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (AXISCHANDLE)NULL;    
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscDeleteCurrentSOAPHeaderBlock(AXISCHANDLE stub) 
+void axiscStubDeleteCurrentSOAPHeaderBlock(AXISCHANDLE stub) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -475,18 +475,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscDeleteSOAPHeaderBlock(AXISCHANDLE stub, AXISCHANDLE pHeaderBlock) 
+void axiscStubDeleteSOAPHeaderBlock(AXISCHANDLE stub, AXISCHANDLE pHeaderBlock) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -499,18 +499,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscSetProxyStub(AXISCHANDLE stub, 
+void axiscStubSetProxy(AXISCHANDLE stub, 
                        const char * pcProxyHost, 
                        unsigned int uiProxyPort) 
 {
@@ -525,18 +525,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscSetTransportTimeout(AXISCHANDLE stub, 
+void axiscStubSetTransportTimeout(AXISCHANDLE stub, 
                               long lSeconds) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -550,18 +550,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-int axiscGetStatusStub(AXISCHANDLE stub) 
+int axiscStubGetStatus(AXISCHANDLE stub) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -574,20 +574,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return -1;
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscSetMaintainSession(AXISCHANDLE stub, 
+void axiscStubSetMaintainSession(AXISCHANDLE stub, 
                              AxiscBool bSession) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -601,18 +601,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscSetTransportProtocol(AXISCHANDLE stub, 
+void axiscStubSetTransportProtocol(AXISCHANDLE stub, 
                                AXISC_PROTOCOL_TYPE eProtocol) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
@@ -626,18 +626,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-AXISC_PROTOCOL_TYPE axiscGetTransportProtocol(AXISCHANDLE stub) 
+AXISC_PROTOCOL_TYPE axiscStubGetTransportProtocol(AXISCHANDLE stub) 
 {
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -650,20 +650,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
     
     return (AXISC_PROTOCOL_TYPE)-1;
 }
 
 AXISC_STORAGE_CLASS_INFO 
-AXISCHANDLE axiscGetCall(AXISCHANDLE stub) 
+AXISCHANDLE axiscStubGetCall(AXISCHANDLE stub) 
 { 
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -678,20 +678,20 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 
     return (AXISCHANDLE)NULL;    
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscApplyUserPreferences(AXISCHANDLE stub) 
+void axiscStubApplyUserPreferences(AXISCHANDLE stub) 
 { 
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -704,17 +704,17 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 AXISC_STORAGE_CLASS_INFO 
-void axiscIncludeSecure(AXISCHANDLE stub)
+void axiscStubIncludeSecure(AXISCHANDLE stub)
 { 
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -727,18 +727,18 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }
 
 AXISC_STORAGE_CLASS_INFO 
-void axiscSetSOAPHeaders(AXISCHANDLE stub) 
+void axiscStubSetSOAPHeaders(AXISCHANDLE stub) 
 { 
     AxisObjectContainer *h = (AxisObjectContainer *)stub;
     h->_exception.resetException();
@@ -751,13 +751,13 @@
     catch ( AxisException& e  )
     {
         h->_exception.setExceptionFromException(e);
-        axiscInvokeExceptionHandler(e.getExceptionCode(), e.what());
+        axiscAxisInvokeExceptionHandler(e.getExceptionCode(), e.what());
     }
     catch ( ... )
     {
         h->_exception.setExceptionCode(-1);  
         h->_exception.setMessage("Unrecognized exception thrown.");  
-        axiscInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
+        axiscAxisInvokeExceptionHandler(-1, "Unrecognized exception thrown.");
     }
 }