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 sa...@apache.org on 2005/02/09 12:30:54 UTC
cvs commit: ws-axis/c/src/wcg WSClass.cpp
samisa 2005/02/09 03:30:54
Modified: c/include/axis BasicHandler.hpp IAttribute.hpp
IHeaderBlock.hpp
c/src/cbindings IAttributeC.cpp IHeaderBlockC.cpp
c/src/common ISoapMethod.h Param.cpp Param.h
c/src/soap Attribute.cpp Attribute.h ComplexElement.cpp
HeaderBlock.cpp HeaderBlock.h SoapDeSerializer.cpp
SoapEnvelope.cpp SoapFault.cpp SoapFault.h
SoapMethod.cpp SoapMethod.h SoapSerializer.cpp
c/src/wcg WSClass.cpp
Log:
Changed setUri to setURI and getUri to getURI. AXISCPP-385
Revision Changes Path
1.4 +1 -1 ws-axis/c/include/axis/BasicHandler.hpp
Index: BasicHandler.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/BasicHandler.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasicHandler.hpp 7 Jan 2005 12:05:40 -0000 1.3
+++ BasicHandler.hpp 9 Feb 2005 11:30:53 -0000 1.4
@@ -107,7 +107,7 @@
* IHeaderBlock* pIHeaderBlock= pISZ->createHeaderBlock();
*
* pIHeaderBlock->setLocalName("echoMeStringResponse");
- * pIHeaderBlock->setUri("http://soapinterop.org/echoheader/");
+ * pIHeaderBlock->setURI("http://soapinterop.org/echoheader/");
*
* pachTemp = "EchoStringHeaderHandlerPr1.id";
*
1.6 +2 -2 ws-axis/c/include/axis/IAttribute.hpp
Index: IAttribute.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/IAttribute.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IAttribute.hpp 23 Nov 2004 15:48:56 -0000 1.5
+++ IAttribute.hpp 9 Feb 2005 11:30:53 -0000 1.6
@@ -42,11 +42,11 @@
virtual ~IAttribute() {};
virtual void setValue(const AxisChar* value) = 0;
- virtual void setUri(const AxisChar* uri) = 0;
+ virtual void setURI(const AxisChar* uri) = 0;
virtual void setPrefix(const AxisChar* prefix) = 0;
virtual void setLocalName(const AxisChar* localname) = 0;
virtual const AxisChar* getValue() = 0;
- virtual const AxisChar* getUri() = 0;
+ virtual const AxisChar* getURI() = 0;
virtual const AxisChar* getPrefix() = 0;
virtual const AxisChar* getLocalName() = 0;
};
1.7 +1 -1 ws-axis/c/include/axis/IHeaderBlock.hpp
Index: IHeaderBlock.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/IHeaderBlock.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- IHeaderBlock.hpp 12 Jan 2005 13:50:30 -0000 1.6
+++ IHeaderBlock.hpp 9 Feb 2005 11:30:53 -0000 1.7
@@ -278,7 +278,7 @@
* @param uri The namespace uri to set in.
*/
- virtual void setUri(const AxisChar* uri)=0;
+ virtual void setURI(const AxisChar* uri)=0;
/*
* Commented by Susantha - 21/06/2004
1.2 +2 -2 ws-axis/c/src/cbindings/IAttributeC.cpp
Index: IAttributeC.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/cbindings/IAttributeC.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IAttributeC.cpp 21 Jan 2005 17:56:43 -0000 1.1
+++ IAttributeC.cpp 9 Feb 2005 11:30:53 -0000 1.2
@@ -33,7 +33,7 @@
AXISC_STORAGE_CLASS_INFO void axiscSetUriIAttribute(AXISCHANDLE attribute, const AxiscChar * uri) {
IAttribute *attr = (IAttribute*)attribute;
- attr->setUri(uri);
+ attr->setURI(uri);
}
AXISC_STORAGE_CLASS_INFO void axiscSetPrefixIAttribute(AXISCHANDLE attribute, const AxiscChar * prefix) {
@@ -53,7 +53,7 @@
AXISC_STORAGE_CLASS_INFO const AxiscChar * axiscGetUri(AXISCHANDLE attribute) {
IAttribute *attr = (IAttribute*)attribute;
- return attr->getUri();
+ return attr->getURI();
}
AXISC_STORAGE_CLASS_INFO const AxiscChar * axiscGetPrefixIAttribute(AXISCHANDLE attribute) {
1.2 +1 -1 ws-axis/c/src/cbindings/IHeaderBlockC.cpp
Index: IHeaderBlockC.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/cbindings/IHeaderBlockC.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IHeaderBlockC.cpp 25 Jan 2005 10:56:21 -0000 1.1
+++ IHeaderBlockC.cpp 9 Feb 2005 11:30:53 -0000 1.2
@@ -99,7 +99,7 @@
AXISC_STORAGE_CLASS_INFO void axiscSetUriIHeaderBlock(AXISCHANDLE headerBlock, const AxiscChar * uri) {
IHeaderBlock *hdr = (IHeaderBlock*)headerBlock;
- hdr->setUri(uri);
+ hdr->setURI(uri);
}
AXISC_STORAGE_CLASS_INFO void axiscSetPrefixIHeaderBlock(AXISCHANDLE headerBlock, const AxiscChar * prefix) {
1.12 +1 -1 ws-axis/c/src/common/ISoapMethod.h
Index: ISoapMethod.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/ISoapMethod.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ISoapMethod.h 6 Aug 2004 14:44:28 -0000 1.11
+++ ISoapMethod.h 9 Feb 2005 11:30:53 -0000 1.12
@@ -36,7 +36,7 @@
{
public:
virtual void setLocalName (const AxisChar* localname) = 0;
- virtual void setUri (const AxisChar* uri) = 0;
+ virtual void setURI (const AxisChar* uri) = 0;
virtual void setPrefix (const AxisChar* prefix) = 0;
virtual ~ ISoapMethod ()
{
1.48 +1 -1 ws-axis/c/src/common/Param.cpp
Index: Param.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Param.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Param.cpp 27 Jan 2005 08:32:37 -0000 1.47
+++ Param.cpp 9 Feb 2005 11:30:53 -0000 1.48
@@ -324,7 +324,7 @@
m_strPrefix = prefix;
}
-void Param::setUri (const AxisChar* uri)
+void Param::setURI (const AxisChar* uri)
{
m_strUri = uri;
}
1.27 +1 -1 ws-axis/c/src/common/Param.h
Index: Param.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Param.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Param.h 14 Jan 2005 13:42:18 -0000 1.26
+++ Param.h 9 Feb 2005 11:30:53 -0000 1.27
@@ -82,7 +82,7 @@
int setValue(XSDTYPE nType, ParamValue Value);
int serialize(SoapSerializer& pSZ);
void setPrefix(const AxisChar* prefix);
- void setUri(const AxisChar* uri);
+ void setURI(const AxisChar* uri);
int setArrayElements(void* pElements);
int setArrayElements(void* pObject, AXIS_DESERIALIZE_FUNCT pDZFunct,
AXIS_OBJECT_DELETE_FUNCT pDelFunct, AXIS_OBJECT_SIZE_FUNCT pSizeFunct);
1.30 +2 -2 ws-axis/c/src/soap/Attribute.cpp
Index: Attribute.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/Attribute.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Attribute.cpp 12 Jan 2005 13:50:30 -0000 1.29
+++ Attribute.cpp 9 Feb 2005 11:30:53 -0000 1.30
@@ -62,7 +62,7 @@
m_prefix= prefix;
}
-void Attribute::setUri(const AxisChar* uri)
+void Attribute::setURI(const AxisChar* uri)
{
m_uri= uri;
}
@@ -83,7 +83,7 @@
return m_prefix.c_str();
}
-const AxisChar* Attribute::getUri()
+const AxisChar* Attribute::getURI()
{
return m_uri.c_str();
}
1.11 +2 -2 ws-axis/c/src/soap/Attribute.h
Index: Attribute.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/Attribute.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Attribute.h 23 Nov 2004 17:21:04 -0000 1.10
+++ Attribute.h 9 Feb 2005 11:30:53 -0000 1.11
@@ -62,12 +62,12 @@
virtual ~Attribute();
void setValue(const AxisChar* value);
- void setUri(const AxisChar* uri);
+ void setURI(const AxisChar* uri);
void setPrefix(const AxisChar* prefix);
void setLocalName(const AxisChar* localname);
const AxisChar* getValue();
- const AxisChar* getUri();
+ const AxisChar* getURI();
const AxisChar* getPrefix();
const AxisChar* getLocalName();
1.35 +4 -4 ws-axis/c/src/soap/ComplexElement.cpp
Index: ComplexElement.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/ComplexElement.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ComplexElement.cpp 7 Feb 2005 16:40:39 -0000 1.34
+++ ComplexElement.cpp 9 Feb 2005 11:30:53 -0000 1.35
@@ -619,7 +619,7 @@
{
while( it_m_attributes != m_attributes.end())
{
- if( !strcmp( (*it_m_attributes)->getUri(), pachURI))
+ if( !strcmp( (*it_m_attributes)->getURI(), pachURI))
{
return (IAttribute*) (*it_m_attributes);
}
@@ -653,7 +653,7 @@
{
while( it_m_attributes != m_attributes.end())
{
- if( !strcmp( (*it_m_attributes)->getUri(), pachURI) &&
+ if( !strcmp( (*it_m_attributes)->getURI(), pachURI) &&
!strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
{
return (IAttribute*) (*it_m_attributes);
@@ -689,7 +689,7 @@
while( it_m_attributes != m_attributes.end())
{
if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname) &&
- !strcmp( (*it_m_attributes)->getUri(), pachURI))
+ !strcmp( (*it_m_attributes)->getURI(), pachURI))
{
return (IAttribute*) (*it_m_attributes);
}
@@ -725,7 +725,7 @@
while( it_m_attributes != m_attributes.end())
{
if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname) &&
- !strcmp( (*it_m_attributes)->getUri(), pachURI) &&
+ !strcmp( (*it_m_attributes)->getURI(), pachURI) &&
!strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
{
return (IAttribute*) (*it_m_attributes);
1.46 +2 -2 ws-axis/c/src/soap/HeaderBlock.cpp
Index: HeaderBlock.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- HeaderBlock.cpp 31 Jan 2005 13:00:53 -0000 1.45
+++ HeaderBlock.cpp 9 Feb 2005 11:30:53 -0000 1.46
@@ -171,7 +171,7 @@
m_sPrefix= prefix;
}
-void HeaderBlock::setUri(const AxisChar* uri)
+void HeaderBlock::setURI(const AxisChar* uri)
{
m_uri= uri;
}
@@ -465,7 +465,7 @@
{
setPrefix("m");
setLocalName("reservation");
- setUri("http://travelcompany.example.org/reservation");
+ setURI("http://travelcompany.example.org/reservation");
Attribute* pAttribute2 = new Attribute();
pAttribute2->setPrefix("SOAP-ENV");
1.25 +1 -1 ws-axis/c/src/soap/HeaderBlock.h
Index: HeaderBlock.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/HeaderBlock.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- HeaderBlock.h 12 Jan 2005 13:50:30 -0000 1.24
+++ HeaderBlock.h 9 Feb 2005 11:30:53 -0000 1.25
@@ -327,7 +327,7 @@
*
* @param uri The namespace uri to set in.
*/
- void setUri(const AxisChar* uri);
+ void setURI(const AxisChar* uri);
/*
* Commented by Susantha - 21/06/2004
1.142 +3 -3 ws-axis/c/src/soap/SoapDeSerializer.cpp
Index: SoapDeSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- SoapDeSerializer.cpp 9 Feb 2005 08:13:47 -0000 1.141
+++ SoapDeSerializer.cpp 9 Feb 2005 11:30:53 -0000 1.142
@@ -153,7 +153,7 @@
{
pAttr = new Attribute ();
pAttr->setLocalName (m_pNode->m_pchAttributes[i]);
- pAttr->setUri (m_pNode->m_pchAttributes[i + 1]);
+ pAttr->setURI (m_pNode->m_pchAttributes[i + 1]);
pAttr->setValue (m_pNode->m_pchAttributes[i + 2]);
m_pEnvl->addAttribute (pAttr);
}
@@ -246,7 +246,7 @@
if (m_pNode->m_pchNamespace)
{
- pHeaderBlock->setUri (m_pNode->m_pchNamespace);
+ pHeaderBlock->setURI (m_pNode->m_pchNamespace);
}
pHeaderBlock->setLocalName (m_pNode->m_pchNameOrValue);
@@ -261,7 +261,7 @@
pAttribute->setLocalName (m_pNode->
m_pchAttributes
[iAttributeArrayIndex++]);
- pAttribute->setUri (m_pNode->
+ pAttribute->setURI (m_pNode->
m_pchAttributes
[iAttributeArrayIndex++]);
pAttribute->setValue (m_pNode->
1.31 +1 -1 ws-axis/c/src/soap/SoapEnvelope.cpp
Index: SoapEnvelope.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapEnvelope.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SoapEnvelope.cpp 17 Dec 2004 11:49:46 -0000 1.30
+++ SoapEnvelope.cpp 9 Feb 2005 11:30:54 -0000 1.31
@@ -305,7 +305,7 @@
Attribute* pAttribute = new Attribute();
pAttribute->setPrefix("xmlns");
pAttribute->setLocalName("env");
- pAttribute->setUri("http://www.w3.org/2003/05/soap-envelope");
+ pAttribute->setURI("http://www.w3.org/2003/05/soap-envelope");
addNamespaceDecl(pAttribute);
SoapBody* pSoapBody = new SoapBody();
1.48 +1 -1 ws-axis/c/src/soap/SoapFault.cpp
Index: SoapFault.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- SoapFault.cpp 30 Dec 2004 06:22:04 -0000 1.47
+++ SoapFault.cpp 9 Feb 2005 11:30:54 -0000 1.48
@@ -330,7 +330,7 @@
m_strLocalname = localname;
}
-void SoapFault::setUri(const AxisChar* uri)
+void SoapFault::setURI(const AxisChar* uri)
{
m_strUri = uri;
}
1.10 +1 -1 ws-axis/c/src/soap/SoapFault.h
Index: SoapFault.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapFault.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SoapFault.h 23 Nov 2004 17:21:04 -0000 1.9
+++ SoapFault.h 9 Feb 2005 11:30:54 -0000 1.10
@@ -125,7 +125,7 @@
int setCmplxFaultObject(const void* pCmplxFaultObject);
- void setUri(const AxisChar* uri);
+ void setURI(const AxisChar* uri);
void setLocalName(const AxisChar* localname);
1.31 +1 -1 ws-axis/c/src/soap/SoapMethod.cpp
Index: SoapMethod.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapMethod.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- SoapMethod.cpp 27 Jan 2005 08:32:37 -0000 1.30
+++ SoapMethod.cpp 9 Feb 2005 11:30:54 -0000 1.31
@@ -56,7 +56,7 @@
m_strLocalname = localname;
}
-void SoapMethod::setUri(const AxisChar* uri)
+void SoapMethod::setURI(const AxisChar* uri)
{
m_strUri = uri;
}
1.22 +1 -1 ws-axis/c/src/soap/SoapMethod.h
Index: SoapMethod.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapMethod.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SoapMethod.h 6 Aug 2004 14:44:37 -0000 1.21
+++ SoapMethod.h 9 Feb 2005 11:30:54 -0000 1.22
@@ -90,7 +90,7 @@
int serialize(SoapSerializer& pSZ);
/* int serialize(string&); */
void addOutputParam(Param *param);
- void setUri(const AxisChar* uri);
+ void setURI(const AxisChar* uri);
void setLocalName(const AxisChar* localname);
void setPrefix(const AxisChar* prefix);
SoapMethod();
1.95 +3 -3 ws-axis/c/src/soap/SoapSerializer.cpp
Index: SoapSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- SoapSerializer.cpp 3 Feb 2005 05:10:21 -0000 1.94
+++ SoapSerializer.cpp 9 Feb 2005 11:30:54 -0000 1.95
@@ -176,7 +176,7 @@
{
pAb->SetItemName(pName);
if (NULL != pNamespace) {
- pParam->setUri(pNamespace);
+ pParam->setURI(pNamespace);
}
pParam->setName("array");
}
@@ -425,7 +425,7 @@
setSoapMethod(pMethod);
pMethod->setLocalName(sLocalName);
pMethod->setPrefix(getNamespacePrefix(sURI));
- pMethod->setUri(sURI);
+ pMethod->setURI(sURI);
return AXIS_SUCCESS;
}
@@ -438,7 +438,7 @@
setSoapFault(pSoapFault);
pSoapFault->setLocalName(sLocalName);
pSoapFault->setPrefix(getNamespacePrefix(sURI));
- pSoapFault->setUri(sURI);
+ pSoapFault->setURI(sURI);
pSoapFault->setFaultcode(sFaultCode);
pSoapFault->setFaultstring(sFaultString);
char* pcNodeName = g_pConfig->getAxisConfProperty(AXCONF_NODENAME);
1.14 +1 -1 ws-axis/c/src/wcg/WSClass.cpp
Index: WSClass.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/wcg/WSClass.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WSClass.cpp 28 Apr 2004 10:28:37 -0000 1.13
+++ WSClass.cpp 9 Feb 2005 11:30:54 -0000 1.14
@@ -191,7 +191,7 @@
file << "\tISoapMethod* pMethod = pIWSSZ->createSoapMethod();" << endl;
file << "\tpMethod->setLocalName(name);" << endl;
file << "\tpMethod->setPrefix(pIWSSZ->getNewNamespacePrefix());"<<endl;
- file << "\tpMethod->setUri(\"" << g_ClassNamespaces[m_AWSName]
+ file << "\tpMethod->setURI(\"" << g_ClassNamespaces[m_AWSName]
<< "\");"<< endl;
/* http://www.opensource.lk will come from wsdd */
file << "\treturn AXIS_SUCCESS;" << endl;