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 2008/12/03 06:30:01 UTC
svn commit: r722783 [1/2] - /webservices/axis/trunk/c/src/soap/
Author: nadiramra
Date: Tue Dec 2 21:29:56 2008
New Revision: 722783
URL: http://svn.apache.org/viewvc?rev=722783&view=rev
Log:
Minor - remove tabs from code.....replace with spaces.
Modified:
webservices/axis/trunk/c/src/soap/Attribute.cpp
webservices/axis/trunk/c/src/soap/Attribute.h
webservices/axis/trunk/c/src/soap/BasicNode.cpp
webservices/axis/trunk/c/src/soap/CharacterElement.cpp
webservices/axis/trunk/c/src/soap/CharacterElement.h
webservices/axis/trunk/c/src/soap/ComplexElement.cpp
webservices/axis/trunk/c/src/soap/ComplexElement.h
webservices/axis/trunk/c/src/soap/ContentIdSet.cpp
webservices/axis/trunk/c/src/soap/ContentIdSet.hpp
webservices/axis/trunk/c/src/soap/HeaderBlock.cpp
webservices/axis/trunk/c/src/soap/HeaderBlock.h
webservices/axis/trunk/c/src/soap/Namespace.cpp
webservices/axis/trunk/c/src/soap/Namespace.h
webservices/axis/trunk/c/src/soap/SoapAttachment.cpp
webservices/axis/trunk/c/src/soap/SoapAttachment.hpp
webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.cpp
webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.hpp
webservices/axis/trunk/c/src/soap/SoapAttachmentReference.cpp
webservices/axis/trunk/c/src/soap/SoapAttachmentReference.hpp
webservices/axis/trunk/c/src/soap/SoapBody.cpp
webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
webservices/axis/trunk/c/src/soap/SoapDeSerializer.h
webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp
webservices/axis/trunk/c/src/soap/SoapHeader.cpp
webservices/axis/trunk/c/src/soap/SoapHeader.h
webservices/axis/trunk/c/src/soap/SoapKeywordMapping.cpp
webservices/axis/trunk/c/src/soap/SoapSerializer.cpp
webservices/axis/trunk/c/src/soap/SoapSerializer.h
webservices/axis/trunk/c/src/soap/URIMapping.cpp
Modified: webservices/axis/trunk/c/src/soap/Attribute.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/Attribute.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/Attribute.cpp (original)
+++ webservices/axis/trunk/c/src/soap/Attribute.cpp Tue Dec 2 21:29:56 2008
@@ -41,30 +41,30 @@
Attribute::Attribute( list<Attribute*> attribute)
{
- if( (void *) &attribute != NULL && !attribute.empty())
- {
- list<Attribute*>::iterator itAttributeList = attribute.begin();
-
- while( itAttributeList != attribute.end())
- {
- m_PrefixList.push_back( (*itAttributeList)->getPrefix());
-
- itAttributeList++;
- }
- }
+ if( (void *) &attribute != NULL && !attribute.empty())
+ {
+ list<Attribute*>::iterator itAttributeList = attribute.begin();
+
+ while( itAttributeList != attribute.end())
+ {
+ m_PrefixList.push_back( (*itAttributeList)->getPrefix());
+
+ itAttributeList++;
+ }
+ }
}
Attribute::~Attribute()
{
- m_PrefixList.clear();
+ m_PrefixList.clear();
}
int Attribute::setLocalName(const AxisChar* localname)
{
- if(NULL==localname)
- {
+ if(NULL==localname)
+ {
localname="";
- }
+ }
m_localname= localname;
return AXIS_SUCCESS;
@@ -72,81 +72,81 @@
int Attribute::setPrefix(const AxisChar* prefix)
{
- if( NULL == prefix)
- {
+ if( NULL == prefix)
+ {
prefix = "";
- }
+ }
+
+ if( (void *) &m_PrefixList != NULL && !m_PrefixList.empty())
+ {
+ list<const char*>::iterator itPrefixList = m_PrefixList.begin();
- if( (void *) &m_PrefixList != NULL && !m_PrefixList.empty())
- {
- list<const char*>::iterator itPrefixList = m_PrefixList.begin();
-
- while( itPrefixList != m_PrefixList.end())
- {
- if( !strcmp( (*itPrefixList), prefix))
- {
- return AXIS_FAIL;
- }
- else
- {
- itPrefixList++;
- }
- }
- }
+ while( itPrefixList != m_PrefixList.end())
+ {
+ if( !strcmp( (*itPrefixList), prefix))
+ {
+ return AXIS_FAIL;
+ }
+ else
+ {
+ itPrefixList++;
+ }
+ }
+ }
- m_prefix = prefix;
+ m_prefix = prefix;
return AXIS_SUCCESS;
}
int Attribute::setURI(const AxisChar* uri)
{
- if(NULL==uri)
- {
+ if(NULL==uri)
+ {
uri="";
- }
+ }
+
+ /**
+ * sets the prefix according to the URI
+ */
- /**
- * sets the prefix according to the URI
- */
-
- if(m_prefix != "")
- {
-
-
- bool bPrefixFound = false;
- list<Namespace*>::iterator itCurrNamespaceDecl = m_namespaceDecls.begin();
-
- while( itCurrNamespaceDecl != m_namespaceDecls.end() && !bPrefixFound)
- {
- if( !(bPrefixFound = !strcmp( (*itCurrNamespaceDecl)->getURI(), uri)))
- {
- itCurrNamespaceDecl++;
- }
- }
-
-
- if( bPrefixFound)
- {
- setPrefix((*itCurrNamespaceDecl)->getPrefix());
-
- }
- else
- {
- setPrefix(NULL);
- }
- }
-
- m_uri= uri;
+ if(m_prefix != "")
+ {
+
+
+ bool bPrefixFound = false;
+ list<Namespace*>::iterator itCurrNamespaceDecl = m_namespaceDecls.begin();
+
+ while( itCurrNamespaceDecl != m_namespaceDecls.end() && !bPrefixFound)
+ {
+ if( !(bPrefixFound = !strcmp( (*itCurrNamespaceDecl)->getURI(), uri)))
+ {
+ itCurrNamespaceDecl++;
+ }
+ }
+
+
+ if( bPrefixFound)
+ {
+ setPrefix((*itCurrNamespaceDecl)->getPrefix());
+
+ }
+ else
+ {
+ setPrefix(NULL);
+ }
+ }
+
+ m_uri= uri;
return AXIS_SUCCESS;
}
int Attribute::setValue(const AxisChar* value)
{
- if(NULL==value)
- {
+ if(NULL==value)
+ {
value="";
- }
+ }
m_value= value;
return AXIS_SUCCESS;
}
@@ -154,22 +154,22 @@
const AxisChar* Attribute::getLocalName()
{
- return m_localname.c_str();
+ return m_localname.c_str();
}
const AxisChar* Attribute::getPrefix()
{
- return m_prefix.c_str();
+ return m_prefix.c_str();
}
const AxisChar* Attribute::getURI()
{
- return m_uri.c_str();
+ return m_uri.c_str();
}
const AxisChar* Attribute::getValue()
{
- return m_value.c_str();
+ return m_value.c_str();
}
@@ -181,27 +181,27 @@
m_localname= localname;
m_prefix= prefix;
m_uri= uri;
- if (NULL==value)
- m_value = "";
- else
- m_value= value;
-
- if( (void *) &attribute != NULL && !attribute.empty())
- {
- list<Attribute*>::iterator itAttributeList = attribute.begin();
-
- while( itAttributeList != attribute.end())
- {
- m_PrefixList.push_back( (*itAttributeList)->getPrefix());
-
- itAttributeList++;
- }
- }
-
- if( prefix != NULL && strlen( prefix) > 0)
- {
- m_PrefixList.push_back( prefix);
- }
+ if (NULL==value)
+ m_value = "";
+ else
+ m_value= value;
+
+ if( (void *) &attribute != NULL && !attribute.empty())
+ {
+ list<Attribute*>::iterator itAttributeList = attribute.begin();
+
+ while( itAttributeList != attribute.end())
+ {
+ m_PrefixList.push_back( (*itAttributeList)->getPrefix());
+
+ itAttributeList++;
+ }
+ }
+
+ if( prefix != NULL && strlen( prefix) > 0)
+ {
+ m_PrefixList.push_back( prefix);
+ }
}
Attribute::Attribute(list<Attribute*> attribute, const AxisChar *localname, const AxisChar *prefix,
@@ -210,27 +210,27 @@
m_localname= localname;
m_prefix= prefix;
m_uri= "";
- if (NULL==value)
- m_value = "";
- else
- m_value= value;
-
- if( (void *) &attribute != NULL && !attribute.empty())
- {
- list<Attribute*>::iterator itAttributeList = attribute.begin();
-
- while( itAttributeList != attribute.end())
- {
- m_PrefixList.push_back( (*itAttributeList)->getPrefix());
-
- itAttributeList++;
- }
- }
-
- if( prefix != NULL && strlen( prefix) > 0)
- {
- m_PrefixList.push_back( prefix);
- }
+ if (NULL==value)
+ m_value = "";
+ else
+ m_value= value;
+
+ if( (void *) &attribute != NULL && !attribute.empty())
+ {
+ list<Attribute*>::iterator itAttributeList = attribute.begin();
+
+ while( itAttributeList != attribute.end())
+ {
+ m_PrefixList.push_back( (*itAttributeList)->getPrefix());
+
+ itAttributeList++;
+ }
+ }
+
+ if( prefix != NULL && strlen( prefix) > 0)
+ {
+ m_PrefixList.push_back( prefix);
+ }
}
Attribute::Attribute(list<Attribute*> attribute, const Attribute& rCopy)
@@ -241,22 +241,22 @@
this->m_uri= rCopy.m_uri;
this->m_value= rCopy.m_value;
- if( (void *) &attribute != NULL && !attribute.empty())
- {
- list<Attribute*>::iterator itAttributeList = attribute.begin();
-
- while( itAttributeList != attribute.end())
- {
- m_PrefixList.push_back( (*itAttributeList)->getPrefix());
-
- itAttributeList++;
- }
- }
-
- if( rCopy.m_prefix.length() > 0)
- {
- m_PrefixList.push_back( rCopy.m_prefix.c_str());
- }
+ if( (void *) &attribute != NULL && !attribute.empty())
+ {
+ list<Attribute*>::iterator itAttributeList = attribute.begin();
+
+ while( itAttributeList != attribute.end())
+ {
+ m_PrefixList.push_back( (*itAttributeList)->getPrefix());
+
+ itAttributeList++;
+ }
+ }
+
+ if( rCopy.m_prefix.length() > 0)
+ {
+ m_PrefixList.push_back( rCopy.m_prefix.c_str());
+ }
}
Attribute* Attribute::clone()
@@ -291,7 +291,7 @@
int Attribute::serialize(SoapSerializer& pSZ,
list<AxisChar*>& lstTmpNameSpaceStack,
- const AxisChar *uri)
+ const AxisChar *uri)
{
int intStatus= AXIS_FAIL;
@@ -301,17 +301,17 @@
/*
* User has provided the prefix. So we just have to serialilze. We will
- * not worry to declare the namespace at all. Because it is the users
- * responsibiltiy to add his/her namespace declaration seperately.
+ * not worry to declare the namespace at all. Because it is the users
+ * responsibiltiy to add his/her namespace declaration seperately.
*/
if(!m_prefix.empty() || NULL!=uri)
{
pSZ.serialize(m_prefix.c_str(), ":", NULL);
}
- /*
+ /*
* User hasn't provided the prefix. So we have to do the following.
- * - get the prefix from the Serializer
- * - if this is a new namespace, then also declare the namespace.
+ * - get the prefix from the Serializer
+ * - if this is a new namespace, then also declare the namespace.
*/
else if (!m_uri.empty())
{
@@ -321,7 +321,7 @@
if (blnIsNewNamespace)
{
lstTmpNameSpaceStack.push_back((AxisChar*)m_uri.c_str());
- pSZ.serialize("xmlns:", m_prefix.c_str(), "=\"", m_uri.c_str(), "\" ", NULL);
+ pSZ.serialize("xmlns:", m_prefix.c_str(), "=\"", m_uri.c_str(), "\" ", NULL);
}
pSZ.serialize(m_prefix.c_str(), ":", NULL);
Modified: webservices/axis/trunk/c/src/soap/Attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/Attribute.h?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/Attribute.h (original)
+++ webservices/axis/trunk/c/src/soap/Attribute.h Tue Dec 2 21:29:56 2008
@@ -81,13 +81,7 @@
AxisString m_uri;
AxisString m_value;
list<const char*> m_PrefixList;
-
- /**
- *Dushshantha:
- *namespace declaration list
- */
-
- list<Namespace*> m_namespaceDecls;
+ list<Namespace*> m_namespaceDecls;
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/BasicNode.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/BasicNode.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/BasicNode.cpp (original)
+++ webservices/axis/trunk/c/src/soap/BasicNode.cpp Tue Dec 2 21:29:56 2008
@@ -53,21 +53,21 @@
BasicNode::BasicNode(const BasicNode& rCopy):m_iNodeType(rCopy.m_iNodeType), m_pachValue(NULL)
{
- if(this->m_pachValue)
- delete [] this->m_pachValue;
- this->m_pachValue = NULL;
-
- if( rCopy.m_pachValue)
- {
+ if(this->m_pachValue)
+ delete [] this->m_pachValue;
+ this->m_pachValue = NULL;
+
+ if( rCopy.m_pachValue)
+ {
this->m_pachValue = new char[strlen(rCopy.m_pachValue)+1];
strcpy(this->m_pachValue,rCopy.m_pachValue);
- }
+ }
}
BasicNode::~BasicNode()
{
- if(m_pachValue)
- delete [] m_pachValue;
+ if(m_pachValue)
+ delete [] m_pachValue;
}
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/CharacterElement.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/CharacterElement.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/CharacterElement.cpp (original)
+++ webservices/axis/trunk/c/src/soap/CharacterElement.cpp Tue Dec 2 21:29:56 2008
@@ -94,7 +94,7 @@
}
else
{
- return AXIS_FAIL;
+ return AXIS_FAIL;
}
}
Modified: webservices/axis/trunk/c/src/soap/CharacterElement.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/CharacterElement.h?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/CharacterElement.h (original)
+++ webservices/axis/trunk/c/src/soap/CharacterElement.h Tue Dec 2 21:29:56 2008
@@ -43,8 +43,8 @@
* method.
*/
IAttribute* getAttribute(AxisChar* pachPrefix, AxisChar* pachURI,
- AxisChar* pachLocalname)
- {return NULL;}
+ AxisChar* pachLocalname)
+ {return NULL;}
/**
     * This method is overridden to always return NULL because this is a CharacterElement.
Modified: webservices/axis/trunk/c/src/soap/ComplexElement.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/ComplexElement.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/ComplexElement.cpp (original)
+++ webservices/axis/trunk/c/src/soap/ComplexElement.cpp Tue Dec 2 21:29:56 2008
@@ -44,7 +44,7 @@
ComplexElement::ComplexElement():m_pParent(NULL)
{
- m_pachPrefix = NULL;
+ m_pachPrefix = NULL;
m_pachLocalName = NULL;
m_pachURI = NULL;
@@ -75,22 +75,22 @@
while(itCurrBasicNode != rCopy.m_children.end())
{
- this->m_children.push_back((*itCurrBasicNode)->clone());
+ this->m_children.push_back((*itCurrBasicNode)->clone());
itCurrBasicNode++;
}
if(rCopy.m_pachPrefix) {
- this->m_pachPrefix = new char[strlen(rCopy.m_pachPrefix)+1];
+ this->m_pachPrefix = new char[strlen(rCopy.m_pachPrefix)+1];
strcpy(this->m_pachPrefix,rCopy.m_pachPrefix);
}
if(rCopy.m_pachLocalName) {
- this->m_pachLocalName = new char[strlen(rCopy.m_pachLocalName)+1];
+ this->m_pachLocalName = new char[strlen(rCopy.m_pachLocalName)+1];
strcpy(this->m_pachLocalName,rCopy.m_pachLocalName);
}
if(rCopy.m_pachURI) {
- this->m_pachURI = new char[strlen(rCopy.m_pachURI)+1];
+ this->m_pachURI = new char[strlen(rCopy.m_pachURI)+1];
strcpy(this->m_pachURI,rCopy.m_pachURI);
}
@@ -106,17 +106,17 @@
ComplexElement::~ComplexElement()
{
- if (NULL != m_pachPrefix)
- delete [] m_pachPrefix;
- m_pachPrefix = NULL;
-
- if (NULL != m_pachLocalName)
- delete [] m_pachLocalName;
- m_pachLocalName = NULL;
-
- if (NULL != m_pachURI)
- delete [] m_pachURI;
- m_pachURI = NULL;
+ if (NULL != m_pachPrefix)
+ delete [] m_pachPrefix;
+ m_pachPrefix = NULL;
+
+ if (NULL != m_pachLocalName)
+ delete [] m_pachLocalName;
+ m_pachLocalName = NULL;
+
+ if (NULL != m_pachURI)
+ delete [] m_pachURI;
+ m_pachURI = NULL;
m_pParent = NULL;
@@ -174,11 +174,11 @@
int ComplexElement::setPrefix(const AxisChar* pachPrefix)
{
- if (NULL==pachPrefix)
- return AXIS_FAIL;
+ if (NULL==pachPrefix)
+ return AXIS_FAIL;
- if (NULL != m_pachPrefix)
- delete [] m_pachPrefix;
+ if (NULL != m_pachPrefix)
+ delete [] m_pachPrefix;
m_pachPrefix = new AxisChar[strlen(pachPrefix)+1];
strcpy(m_pachPrefix, pachPrefix);
return AXIS_SUCCESS;
@@ -186,11 +186,11 @@
int ComplexElement::setLocalName(const AxisChar* pachLocalName)
{
- if (NULL==pachLocalName)
- return AXIS_FAIL;
+ if (NULL==pachLocalName)
+ return AXIS_FAIL;
- if (NULL != m_pachLocalName)
- delete [] m_pachLocalName;
+ if (NULL != m_pachLocalName)
+ delete [] m_pachLocalName;
m_pachLocalName = new AxisChar[strlen(pachLocalName)+1];
strcpy(m_pachLocalName, pachLocalName);
return AXIS_SUCCESS;
@@ -229,7 +229,7 @@
}
pSZ.serialize(m_pachLocalName, NULL);
if ((NULL!=m_pachPrefix) && (strlen(m_pachPrefix)!=0) &&
- (NULL!=m_pachURI) && (strlen(m_pachURI)!=0))
+ (NULL!=m_pachURI) && (strlen(m_pachURI)!=0))
{
pSZ.serialize(" xmlns:", m_pachPrefix, "=\"", m_pachURI, "\"",
NULL);
@@ -299,8 +299,8 @@
const AxisChar* pachTmp = pSZ.getNamespacePrefix(m_pachURI,
blnIsNewNamespace);
- if (NULL!=m_pachPrefix)
- delete [] m_pachPrefix;
+ if (NULL!=m_pachPrefix)
+ delete [] m_pachPrefix;
m_pachPrefix = new AxisChar[strlen(pachTmp)+1];
strcpy(m_pachPrefix , pachTmp);
@@ -321,17 +321,17 @@
NULL);
}
- iStatus= attrSerialize(pSZ, lstTmpNameSpaceStack);
- if(iStatus==AXIS_FAIL)
- {
- break;
- }
-
- iStatus= serializeNamespaceDecl(pSZ);
- if(iStatus==AXIS_FAIL)
- {
- break;
- }
+ iStatus= attrSerialize(pSZ, lstTmpNameSpaceStack);
+ if(iStatus==AXIS_FAIL)
+ {
+ break;
+ }
+
+ iStatus= serializeNamespaceDecl(pSZ);
+ if(iStatus==AXIS_FAIL)
+ {
+ break;
+ }
pSZ.serialize(">", NULL);
@@ -368,8 +368,8 @@
iStatus= (*itCurrAttribute)->serialize(pSZ, lstTmpNameSpaceStack);
if(iStatus==AXIS_FAIL)
{
- break;
- }
+ break;
+ }
itCurrAttribute++;
}
@@ -382,8 +382,8 @@
while(itCurrNamespaceDecl != m_namespaceDecls.end())
{
- (*itCurrNamespaceDecl)->serialize(pSZ);
- itCurrNamespaceDecl++;
+ (*itCurrNamespaceDecl)->serialize(pSZ);
+ itCurrNamespaceDecl++;
}
return AXIS_SUCCESS;
@@ -407,8 +407,8 @@
int ComplexElement::setURI(const AxisChar* pachURI)
{
- if (NULL!=m_pachURI)
- delete [] m_pachURI;
+ if (NULL!=m_pachURI)
+ delete [] m_pachURI;
m_pachURI = new AxisChar[strlen(pachURI)+1];
strcpy(m_pachURI, pachURI);
return AXIS_SUCCESS;
@@ -561,10 +561,10 @@
list <Attribute*>::reverse_iterator iAttributeReverseIte = m_attributes.rbegin();
if (iAttributeReverseIte == m_attributes.rend()) {
m_viCurrentAttribute = m_attributes.end();
- return NULL;
+ return NULL;
} else {
- m_viCurrentAttribute = m_attributes.end();
- return ((IAttribute*)*iAttributeReverseIte);
+ m_viCurrentAttribute = m_attributes.end();
+ return ((IAttribute*)*iAttributeReverseIte);
}
}
@@ -591,178 +591,178 @@
}
IAttribute* ComplexElement::getAttribute(AxisChar* pachPrefix,
- AxisChar* pachURI,
- AxisChar* pachLocalname)
+ AxisChar* pachURI,
+ AxisChar* pachLocalname)
{
- // Create local enumeration for valid parameters.
- typedef enum
- {
- eParamHasURI = 1,
- eParamHasPrefix = 2,
- eParamHasLocalName = 4
- } EPARAMS_USED;
-
- // Keep a list of valid parameters.
- int iValidParams = 0;
-
- // For each parameter, test its validity by checking that the pointer is
- // not null and then (and only then) that the string pointed to by the
- // non-null pointer is not empty (string length is greater than zero). Iff
- // the test remains valid, add the enumerated equivalent of the parameter
- // to the list of valid parameters.
- if( (pachURI != NULL) && (strlen( pachURI) > 0))
- {
- iValidParams += eParamHasURI;
- }
-
- if( (pachPrefix != NULL) && (strlen( pachPrefix) > 0))
- {
- iValidParams += eParamHasPrefix;
- }
-
- if( (pachLocalname != NULL) && (strlen( pachLocalname) > 0))
- {
- iValidParams += eParamHasLocalName;
- }
+ // Create local enumeration for valid parameters.
+ typedef enum
+ {
+ eParamHasURI = 1,
+ eParamHasPrefix = 2,
+ eParamHasLocalName = 4
+ } EPARAMS_USED;
+
+ // Keep a list of valid parameters.
+ int iValidParams = 0;
+
+ // For each parameter, test its validity by checking that the pointer is
+ // not null and then (and only then) that the string pointed to by the
+ // non-null pointer is not empty (string length is greater than zero). Iff
+ // the test remains valid, add the enumerated equivalent of the parameter
+ // to the list of valid parameters.
+ if( (pachURI != NULL) && (strlen( pachURI) > 0))
+ {
+ iValidParams += eParamHasURI;
+ }
+
+ if( (pachPrefix != NULL) && (strlen( pachPrefix) > 0))
+ {
+ iValidParams += eParamHasPrefix;
+ }
+
+ if( (pachLocalname != NULL) && (strlen( pachLocalname) > 0))
+ {
+ iValidParams += eParamHasLocalName;
+ }
- // Get the pointer to the start of the attribute list.
+ // Get the pointer to the start of the attribute list.
list<Attribute*>::iterator it_m_attributes = m_attributes.begin();
- // Depending on the list of valid parameters, choose which case is
- // appropriate and then perform the search using those valid parameters.
- // NB: Currently, the first match is returned in all cases.
- switch( iValidParams)
- {
- // Parameter list contains a valid URI
- case eParamHasURI:
- {
- while( it_m_attributes != m_attributes.end())
- {
- if( !strcmp( (*it_m_attributes)->getURI(), pachURI))
- {
- return (IAttribute*) (*it_m_attributes);
- }
- else
- {
- it_m_attributes++;
- }
- }
- break;
- }
-
- // Parameter list contains a valid Prefix
- case eParamHasPrefix:
- {
- while( it_m_attributes != m_attributes.end())
- {
- if( !strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
- {
- return (IAttribute*) (*it_m_attributes);
- }
- else
- {
- it_m_attributes++;
- }
- }
- break;
- }
-
- // Parameter list contains a valid URI and Prefix
- case eParamHasURI + eParamHasPrefix:
- {
- while( it_m_attributes != m_attributes.end())
- {
- if( !strcmp( (*it_m_attributes)->getURI(), pachURI) &&
- !strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
- {
- return (IAttribute*) (*it_m_attributes);
- }
- else
- {
- it_m_attributes++;
- }
- }
- break;
- }
-
- // Parameter list contains a valid LocalName
- case eParamHasLocalName:
- {
- while( it_m_attributes != m_attributes.end())
- {
- if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname))
- {
- return (IAttribute*) (*it_m_attributes);
- }
- else
- {
- it_m_attributes++;
- }
- }
- break;
- }
-
- // Parameter list contains a valid LocalName and URI
- case eParamHasLocalName + eParamHasURI:
- {
- while( it_m_attributes != m_attributes.end())
- {
- if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname) &&
- !strcmp( (*it_m_attributes)->getURI(), pachURI))
- {
- return (IAttribute*) (*it_m_attributes);
- }
- else
- {
- it_m_attributes++;
- }
- }
- break;
- }
-
- // Parameter list contains a valid LocalName and Prefix
- case eParamHasLocalName + eParamHasPrefix:
- {
- while( it_m_attributes != m_attributes.end())
- {
- if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname) &&
- !strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
- {
- return (IAttribute*) (*it_m_attributes);
- }
- else
- {
- it_m_attributes++;
- }
- }
- break;
- }
-
- // Parameter list contains a valid LocalName, URI and Prefix
- case eParamHasLocalName + eParamHasPrefix + eParamHasURI:
- {
- while( it_m_attributes != m_attributes.end())
- {
- if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname) &&
- !strcmp( (*it_m_attributes)->getURI(), pachURI) &&
- !strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
- {
- return (IAttribute*) (*it_m_attributes);
- }
- else
- {
- it_m_attributes++;
- }
- }
- break;
- }
-
- // Parameter list contains no valid parameters
- default:
- {
- break;
- }
- }
+ // Depending on the list of valid parameters, choose which case is
+ // appropriate and then perform the search using those valid parameters.
+ // NB: Currently, the first match is returned in all cases.
+ switch( iValidParams)
+ {
+ // Parameter list contains a valid URI
+ case eParamHasURI:
+ {
+ while( it_m_attributes != m_attributes.end())
+ {
+ if( !strcmp( (*it_m_attributes)->getURI(), pachURI))
+ {
+ return (IAttribute*) (*it_m_attributes);
+ }
+ else
+ {
+ it_m_attributes++;
+ }
+ }
+ break;
+ }
+
+ // Parameter list contains a valid Prefix
+ case eParamHasPrefix:
+ {
+ while( it_m_attributes != m_attributes.end())
+ {
+ if( !strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
+ {
+ return (IAttribute*) (*it_m_attributes);
+ }
+ else
+ {
+ it_m_attributes++;
+ }
+ }
+ break;
+ }
+
+ // Parameter list contains a valid URI and Prefix
+ case eParamHasURI + eParamHasPrefix:
+ {
+ while( it_m_attributes != m_attributes.end())
+ {
+ if( !strcmp( (*it_m_attributes)->getURI(), pachURI) &&
+ !strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
+ {
+ return (IAttribute*) (*it_m_attributes);
+ }
+ else
+ {
+ it_m_attributes++;
+ }
+ }
+ break;
+ }
+
+ // Parameter list contains a valid LocalName
+ case eParamHasLocalName:
+ {
+ while( it_m_attributes != m_attributes.end())
+ {
+ if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname))
+ {
+ return (IAttribute*) (*it_m_attributes);
+ }
+ else
+ {
+ it_m_attributes++;
+ }
+ }
+ break;
+ }
+
+ // Parameter list contains a valid LocalName and URI
+ case eParamHasLocalName + eParamHasURI:
+ {
+ while( it_m_attributes != m_attributes.end())
+ {
+ if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname) &&
+ !strcmp( (*it_m_attributes)->getURI(), pachURI))
+ {
+ return (IAttribute*) (*it_m_attributes);
+ }
+ else
+ {
+ it_m_attributes++;
+ }
+ }
+ break;
+ }
+
+ // Parameter list contains a valid LocalName and Prefix
+ case eParamHasLocalName + eParamHasPrefix:
+ {
+ while( it_m_attributes != m_attributes.end())
+ {
+ if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname) &&
+ !strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
+ {
+ return (IAttribute*) (*it_m_attributes);
+ }
+ else
+ {
+ it_m_attributes++;
+ }
+ }
+ break;
+ }
+
+ // Parameter list contains a valid LocalName, URI and Prefix
+ case eParamHasLocalName + eParamHasPrefix + eParamHasURI:
+ {
+ while( it_m_attributes != m_attributes.end())
+ {
+ if( !strcmp( (*it_m_attributes)->getLocalName(), pachLocalname) &&
+ !strcmp( (*it_m_attributes)->getURI(), pachURI) &&
+ !strcmp( (*it_m_attributes)->getPrefix(), pachPrefix))
+ {
+ return (IAttribute*) (*it_m_attributes);
+ }
+ else
+ {
+ it_m_attributes++;
+ }
+ }
+ break;
+ }
+
+ // Parameter list contains no valid parameters
+ default:
+ {
+ break;
+ }
+ }
return NULL;
}
Modified: webservices/axis/trunk/c/src/soap/ComplexElement.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/ComplexElement.h?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/ComplexElement.h (original)
+++ webservices/axis/trunk/c/src/soap/ComplexElement.h Tue Dec 2 21:29:56 2008
@@ -54,7 +54,7 @@
* If not found returns NULL.
*/
IAttribute* getAttribute(AxisChar* pachPrefix, AxisChar* pachURI,
- AxisChar* pachLocalname);
+ AxisChar* pachLocalname);
/**
* Returns the first Attribute of this node. NOTE: When traversing the
Modified: webservices/axis/trunk/c/src/soap/ContentIdSet.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/ContentIdSet.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/ContentIdSet.cpp (original)
+++ webservices/axis/trunk/c/src/soap/ContentIdSet.cpp Tue Dec 2 21:29:56 2008
@@ -31,61 +31,61 @@
ContentIdSet::ContentIdSet()
{
- m_maxId = 0;
+ m_maxId = 0;
}
ContentIdSet::~ContentIdSet()
{
- clearAll();
+ clearAll();
}
void ContentIdSet::registerId(const char* id)
{
- for (list<const char*>::iterator it = m_set.begin(); it != m_set.end(); it++)
- {
- if ((*it) && 0==strcmp(id,*it)) throw AxisSoapException(CLIENT_MIME_CONTENT_ID_NOT_UNIQUE);
- }
- char *copy = new char[strlen(id)+1];
- strcpy(copy,id);
- m_set.push_back(const_cast<const char *>(copy));
+ for (list<const char*>::iterator it = m_set.begin(); it != m_set.end(); it++)
+ {
+ if ((*it) && 0==strcmp(id,*it)) throw AxisSoapException(CLIENT_MIME_CONTENT_ID_NOT_UNIQUE);
+ }
+ char *copy = new char[strlen(id)+1];
+ strcpy(copy,id);
+ m_set.push_back(const_cast<const char *>(copy));
}
const char *ContentIdSet::generateId()
{
- m_maxId++;
- char pszId[8];
- sprintf(pszId,"%u",m_maxId);
- bool found = true;
- while (found)
- {
- found = false;
- for (list<const char*>::iterator it = m_set.begin(); it != m_set.end(); it++)
- {
- if ((*it) && 0==strcmp(*it,pszId))
- {
- m_maxId++;
- sprintf(pszId,"%u",m_maxId);
- found = true;
- break;
- }
- }
- }
-
- char *copy = new char[strlen(pszId)+1];
- strcpy(copy,pszId);
- m_set.push_back(const_cast<const char *>(copy));
- return const_cast<const char *>(copy);
+ m_maxId++;
+ char pszId[8];
+ sprintf(pszId,"%u",m_maxId);
+ bool found = true;
+ while (found)
+ {
+ found = false;
+ for (list<const char*>::iterator it = m_set.begin(); it != m_set.end(); it++)
+ {
+ if ((*it) && 0==strcmp(*it,pszId))
+ {
+ m_maxId++;
+ sprintf(pszId,"%u",m_maxId);
+ found = true;
+ break;
+ }
+ }
+ }
+
+ char *copy = new char[strlen(pszId)+1];
+ strcpy(copy,pszId);
+ m_set.push_back(const_cast<const char *>(copy));
+ return const_cast<const char *>(copy);
}
void ContentIdSet::clearAll()
{
- for (list<const char*>::iterator it = m_set.begin(); it != m_set.end(); it++)
- {
- char *id = const_cast<char*>(*it);
- delete [] id;
- }
- m_set.clear();
- m_maxId = 0;
+ for (list<const char*>::iterator it = m_set.begin(); it != m_set.end(); it++)
+ {
+ char *id = const_cast<char*>(*it);
+ delete [] id;
+ }
+ m_set.clear();
+ m_maxId = 0;
}
Modified: webservices/axis/trunk/c/src/soap/ContentIdSet.hpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/ContentIdSet.hpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/ContentIdSet.hpp (original)
+++ webservices/axis/trunk/c/src/soap/ContentIdSet.hpp Tue Dec 2 21:29:56 2008
@@ -38,14 +38,14 @@
class ContentIdSet
{
public:
- ContentIdSet();
- virtual ~ContentIdSet();
- void registerId(const char* id);
- const char *generateId();
- void clearAll();
-private:
- list<const char*> m_set;
- int m_maxId;
+ ContentIdSet();
+ virtual ~ContentIdSet();
+ void registerId(const char* id);
+ const char *generateId();
+ void clearAll();
+private:
+ list<const char*> m_set;
+ int m_maxId;
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/HeaderBlock.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/HeaderBlock.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/HeaderBlock.cpp (original)
+++ webservices/axis/trunk/c/src/soap/HeaderBlock.cpp Tue Dec 2 21:29:56 2008
@@ -51,38 +51,38 @@
HeaderBlock::
HeaderBlock()
{
- logEntryEngine("HeaderBlock::HeaderBlock")
+ logEntryEngine("HeaderBlock::HeaderBlock")
iNoOFChildren = 0;
- m_sPrefix = "";
-
- logExit()
+ m_sPrefix = "";
+
+ logExit()
}
HeaderBlock::
HeaderBlock(const AxisChar *pachLocalName, const AxisChar *pachUri)
{
- logEntryEngine("HeaderBlock::HeaderBlock")
+ logEntryEngine("HeaderBlock::HeaderBlock")
iNoOFChildren = 0;
m_localname = pachLocalName;
m_uri = pachUri;
m_sPrefix = "";
- logExit()
+ logExit()
}
HeaderBlock::
HeaderBlock(const AxisChar *pachLocalName, const AxisChar *pachUri, const AxisChar *pachPrefix)
{
- logEntryEngine("HeaderBlock::HeaderBlock")
+ logEntryEngine("HeaderBlock::HeaderBlock")
- iNoOFChildren = 0;
+ iNoOFChildren = 0;
m_localname = pachLocalName;
m_uri = pachUri;
m_sPrefix = pachPrefix;
- logExit()
+ logExit()
}
HeaderBlock::
@@ -90,7 +90,7 @@
IHeaderBlock(rCopy), iNoOFChildren(rCopy.iNoOFChildren), m_localname(rCopy.m_localname),
m_sPrefix(rCopy.m_sPrefix), m_uri(rCopy.m_uri)
{
- logEntryEngine("HeaderBlock::HeaderBlock")
+ logEntryEngine("HeaderBlock::HeaderBlock")
list<BasicNode*>::const_iterator itCurrChild= rCopy.m_children.begin();
while(itCurrChild != rCopy.m_children.end())
@@ -106,16 +106,16 @@
itCurrAttribute++;
}
- /* TO DO: check whether we have to do this
- *
- list<Namespace*>::const_iterator itCurrNamespace= rCopy.m_namespaceDecls.begin();
+ /* TO DO: check whether we have to do this
+ *
+ list<Namespace*>::const_iterator itCurrNamespace= rCopy.m_namespaceDecls.begin();
while(itCurrNamespace != rCopy.m_namespaceDecls.end())
{
this->m_namespaceDecls.push_back( (*itCurrNamespace)->clone() );
itCurrNamespace++;
}
- */
- logExit()
+ */
+ logExit()
}
IHeaderBlock* HeaderBlock::
@@ -127,7 +127,7 @@
HeaderBlock::
~HeaderBlock()
{
- logEntryEngine("HeaderBlock::~HeaderBlock")
+ logEntryEngine("HeaderBlock::~HeaderBlock")
// Clear the Attributes
list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
@@ -156,24 +156,24 @@
}
m_children.clear();
- logExit()
+ logExit()
}
int HeaderBlock::
setLocalName(const AxisChar* localname)
{
- logEntryEngine("HeaderBlock::setLocalName")
+ logEntryEngine("HeaderBlock::setLocalName")
- int Status = AXIS_FAIL;
-
- if(localname)
- {
- m_localname=localname;
- Status = AXIS_SUCCESS;
- }
-
- logExitWithReturnCode(Status)
-
+ int Status = AXIS_FAIL;
+
+ if(localname)
+ {
+ m_localname=localname;
+ Status = AXIS_SUCCESS;
+ }
+
+ logExitWithReturnCode(Status)
+
return Status;
}
@@ -186,14 +186,14 @@
int HeaderBlock::
setPrefix(const AxisChar* prefix)
{
- logEntryEngine("HeaderBlock::setPrefix")
+ logEntryEngine("HeaderBlock::setPrefix")
- if(prefix)
- m_sPrefix= prefix;
- else
- m_sPrefix="";
+ if(prefix)
+ m_sPrefix= prefix;
+ else
+ m_sPrefix="";
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
@@ -201,14 +201,14 @@
int HeaderBlock::
setURI(const AxisChar* uri)
{
- logEntryEngine("HeaderBlock::setURI")
+ logEntryEngine("HeaderBlock::setURI")
- if(uri)
- m_uri= uri;
- else
- m_uri="";
-
- logExitWithReturnCode(AXIS_SUCCESS)
+ if(uri)
+ m_uri= uri;
+ else
+ m_uri="";
+
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
@@ -216,16 +216,16 @@
int HeaderBlock::
addAttribute(Attribute* pAttr)
{
- logEntryEngine("HeaderBlock::addAttribute")
+ logEntryEngine("HeaderBlock::addAttribute")
- int Status = AXIS_FAIL;
+ int Status = AXIS_FAIL;
if (pAttr)
{
m_attributes.push_back(pAttr);
Status = AXIS_SUCCESS;
}
- logExitWithReturnCode(Status)
+ logExitWithReturnCode(Status)
return Status;
}
@@ -233,7 +233,7 @@
int HeaderBlock::
serialize(SoapSerializer& pSZ)
{
- logEntryEngine("HeaderBlock::serialize")
+ logEntryEngine("HeaderBlock::serialize")
/*
*In the code we don't look whether the m_sPrefix is available or
@@ -260,24 +260,24 @@
}
else
{
- // new namespace and will be declared as a namespace declaration.
- blnIsNewNamespace = true;
- /* Adding to the Serializers namespace list b'cas the child
- elements of this HeaderBlock might use this namespace, so that they
- can get the correct corrosponding prefix from the Serializer.
- */
- pSZ.addNamespaceToNamespaceList(m_uri.c_str(), m_sPrefix.c_str());
- /* Adding this namespace to the temprory namespace list b'cas we
- have to remove this namespce from the Serializer at the end of this
- HeaderBlock serialization.
- */
- lstTmpNameSpaceStack.push_back((AxisChar*)m_uri.c_str());
- }
+ // new namespace and will be declared as a namespace declaration.
+ blnIsNewNamespace = true;
+ /* Adding to the Serializers namespace list b'cas the child
+ elements of this HeaderBlock might use this namespace, so that they
+ can get the correct corrosponding prefix from the Serializer.
+ */
+ pSZ.addNamespaceToNamespaceList(m_uri.c_str(), m_sPrefix.c_str());
+ /* Adding this namespace to the temprory namespace list b'cas we
+ have to remove this namespce from the Serializer at the end of this
+ HeaderBlock serialization.
+ */
+ lstTmpNameSpaceStack.push_back((AxisChar*)m_uri.c_str());
+ }
pSZ.serialize(m_sPrefix.c_str(), ":", m_localname.c_str(), NULL);
-
- if (blnIsNewNamespace)
- pSZ.serialize(" xmlns:", m_sPrefix.c_str(), "=\"", m_uri.c_str(), "\"", NULL);
+
+ if (blnIsNewNamespace)
+ pSZ.serialize(" xmlns:", m_sPrefix.c_str(), "=\"", m_uri.c_str(), "\"", NULL);
iStatus= attrSerialize(pSZ, lstTmpNameSpaceStack);
if(iStatus==AXIS_FAIL)
@@ -306,9 +306,9 @@
}
while(0);
- m_sPrefix = "";
-
- logExitWithReturnCode(iStatus)
+ m_sPrefix = "";
+
+ logExitWithReturnCode(iStatus)
return iStatus;
}
@@ -316,7 +316,7 @@
int HeaderBlock::
attrSerialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack)
{
- logEntryEngine("HeaderBlock::attrSerialize")
+ logEntryEngine("HeaderBlock::attrSerialize")
int iStatus= AXIS_SUCCESS;
@@ -324,23 +324,23 @@
while(itCurrAttribute != m_attributes.end())
{
- // See if this prefix matches a namespace within this headerblock
- const AxisChar *uri = NULL;
- Attribute *attr = *itCurrAttribute;
- const AxisChar *attrPrefix = attr->getPrefix();
- if (NULL != attrPrefix)
- {
- list<Namespace*>::iterator itNs = m_namespaceDecls.begin();
- while (itNs != m_namespaceDecls.end())
- {
- if (0 == strcmp((*itNs)->getPrefix(), attrPrefix))
- {
- uri = (*itNs)->getURI();
- break;
- }
- itNs++;
- }
- }
+ // See if this prefix matches a namespace within this headerblock
+ const AxisChar *uri = NULL;
+ Attribute *attr = *itCurrAttribute;
+ const AxisChar *attrPrefix = attr->getPrefix();
+ if (NULL != attrPrefix)
+ {
+ list<Namespace*>::iterator itNs = m_namespaceDecls.begin();
+ while (itNs != m_namespaceDecls.end())
+ {
+ if (0 == strcmp((*itNs)->getPrefix(), attrPrefix))
+ {
+ uri = (*itNs)->getURI();
+ break;
+ }
+ itNs++;
+ }
+ }
iStatus= (*itCurrAttribute)->serialize(pSZ, lstTmpNameSpaceStack, uri);
if(iStatus==AXIS_FAIL)
@@ -350,7 +350,7 @@
itCurrAttribute++;
}
- logExitWithReturnCode(iStatus)
+ logExitWithReturnCode(iStatus)
return iStatus;
}
@@ -358,7 +358,7 @@
bool HeaderBlock::
isSerializable()
{
- logEntryEngine("HeaderBlock::isSerializable")
+ logEntryEngine("HeaderBlock::isSerializable")
bool bStatus= true;
@@ -386,7 +386,7 @@
int HeaderBlock::
addChild(BasicNode *pBasicNode)
{
- logEntryEngine("HeaderBlock::addChild")
+ logEntryEngine("HeaderBlock::addChild")
int iStatus = AXIS_FAIL;
@@ -398,7 +398,7 @@
iStatus = AXIS_SUCCESS;
}
- logExitWithReturnCode(iStatus)
+ logExitWithReturnCode(iStatus)
return iStatus;
}
@@ -406,30 +406,30 @@
int HeaderBlock::
serializeChildren(SoapSerializer& pSZ, list<AxisChar *>& lstTmpNameSpaceStack)
{
- logEntryEngine("HeaderBlock::serializeChildren")
+ logEntryEngine("HeaderBlock::serializeChildren")
int iStatus = AXIS_SUCCESS;
- // SOAP serialiser does not have an == operator so can't check it
+ // SOAP serialiser does not have an == operator so can't check it
list<BasicNode*>::iterator itCurrBasicNode = m_children.begin();
while( itCurrBasicNode != m_children.end() && iStatus == AXIS_SUCCESS)
{
if ((*itCurrBasicNode)->getNodeType() == ELEMENT_NODE)
{
- // Processing for ELEMENT_NODE types
+ // Processing for ELEMENT_NODE types
iStatus = (*itCurrBasicNode)->serialize( pSZ, lstTmpNameSpaceStack);
}
else
{
- // Processing for CHARACTER_NODE types
+ // Processing for CHARACTER_NODE types
iStatus = (*itCurrBasicNode)->serialize( pSZ);
}
itCurrBasicNode++;
}
- logExitWithReturnCode(iStatus)
+ logExitWithReturnCode(iStatus)
return iStatus;
}
@@ -437,40 +437,40 @@
INamespace* HeaderBlock::
createNamespaceDecl( const AxisChar * pPrefix, const AxisChar * pURI)
{
- logEntryEngine("HeaderBlock::createNamespaceDecl")
-
+ logEntryEngine("HeaderBlock::createNamespaceDecl")
+
INamespace* returnPtr = NULL;
- // Check that the prefix and uri are valid pointers and that the string is not empty.
- if( pPrefix != NULL && strlen( pPrefix) > 0 && pURI != NULL && strlen( pURI) > 0)
- {
- // Iterate through the namespaces checking that the prefix does not already exist.
- bool bNameFound = false;
- list<Namespace*>::iterator itCurrNamespaceDecl = m_namespaceDecls.begin();
-
- while( itCurrNamespaceDecl != m_namespaceDecls.end() && !bNameFound)
- {
- if( !(bNameFound = !strcmp( (*itCurrNamespaceDecl)->getPrefix(), pPrefix)))
- itCurrNamespaceDecl++;
- }
-
- // If the prefix is found in the declared namespace list, then update the uri
- // for the prefix and return a pointer to that namespace.
- // If the prefix was not found, then create a new namespace for the prefix/uri
- // pair and return the pointer to the new namespace.
- if( bNameFound)
- {
- (*itCurrNamespaceDecl)->setURI( pURI);
- returnPtr = (INamespace *) *itCurrNamespaceDecl;
- }
- else
- {
- Namespace * pNamespace = new Namespace( pPrefix, pURI);
- m_namespaceDecls.push_back( pNamespace);
- returnPtr = (INamespace *) pNamespace;
- }
- }
-
+ // Check that the prefix and uri are valid pointers and that the string is not empty.
+ if( pPrefix != NULL && strlen( pPrefix) > 0 && pURI != NULL && strlen( pURI) > 0)
+ {
+ // Iterate through the namespaces checking that the prefix does not already exist.
+ bool bNameFound = false;
+ list<Namespace*>::iterator itCurrNamespaceDecl = m_namespaceDecls.begin();
+
+ while( itCurrNamespaceDecl != m_namespaceDecls.end() && !bNameFound)
+ {
+ if( !(bNameFound = !strcmp( (*itCurrNamespaceDecl)->getPrefix(), pPrefix)))
+ itCurrNamespaceDecl++;
+ }
+
+ // If the prefix is found in the declared namespace list, then update the uri
+ // for the prefix and return a pointer to that namespace.
+ // If the prefix was not found, then create a new namespace for the prefix/uri
+ // pair and return the pointer to the new namespace.
+ if( bNameFound)
+ {
+ (*itCurrNamespaceDecl)->setURI( pURI);
+ returnPtr = (INamespace *) *itCurrNamespaceDecl;
+ }
+ else
+ {
+ Namespace * pNamespace = new Namespace( pPrefix, pURI);
+ m_namespaceDecls.push_back( pNamespace);
+ returnPtr = (INamespace *) pNamespace;
+ }
+ }
+
logExitWithPointer(returnPtr)
return returnPtr;
@@ -479,7 +479,7 @@
int HeaderBlock::
serializeNamespaceDecl(SoapSerializer &pSZ, std::list<AxisChar*>& lstTmpNameSpaceStack)
{
- logEntryEngine("HeaderBlock::serializeNamespaceDecl")
+ logEntryEngine("HeaderBlock::serializeNamespaceDecl")
list<Namespace*>::iterator itCurrNamespaceDecl= m_namespaceDecls.begin();
@@ -489,7 +489,7 @@
itCurrNamespaceDecl++;
}
- logExitWithReturnCode(AXIS_SUCCESS)
+ logExitWithReturnCode(AXIS_SUCCESS)
return AXIS_SUCCESS;
}
@@ -497,14 +497,14 @@
BasicNode* HeaderBlock::
getLastChild()
{
- logEntryEngine("HeaderBlock::getLastChild")
+ logEntryEngine("HeaderBlock::getLastChild")
BasicNode* returnPtr = NULL;
list<BasicNode*>::reverse_iterator ritCurrBasicNode= m_children.rbegin();
if (ritCurrBasicNode != m_children.rend())
- returnPtr = *ritCurrBasicNode;
+ returnPtr = *ritCurrBasicNode;
logExitWithPointer(returnPtr)
@@ -514,12 +514,12 @@
BasicNode* HeaderBlock::
getChild(int iChildPosition)
{
- logEntryEngine("HeaderBlock::getChild")
+ logEntryEngine("HeaderBlock::getChild")
BasicNode* returnPtr = NULL;
if ( (iChildPosition<=0) || (iChildPosition > iNoOFChildren) )
- returnPtr = NULL;
+ returnPtr = NULL;
else
{
list<BasicNode*>::iterator itCurrBasicNode= m_children.begin();
@@ -533,7 +533,7 @@
}
if (itCurrBasicNode != m_children.end())
- returnPtr = *itCurrBasicNode;
+ returnPtr = *itCurrBasicNode;
}
logExitWithPointer(returnPtr)
@@ -544,7 +544,7 @@
BasicNode* HeaderBlock::
createChild(NODE_TYPE eNODE_TYPE)
{
- logEntryEngine("HeaderBlock::createChild")
+ logEntryEngine("HeaderBlock::createChild")
BasicNode* pBasicNode = NULL;
@@ -569,7 +569,7 @@
BasicNode* HeaderBlock::createImmediateChild(NODE_TYPE eNODE_TYPE)
{
- return createImmediateChild(eNODE_TYPE, "", "", "", "");
+ return createImmediateChild(eNODE_TYPE, "", "", "", "");
}
/**
@@ -590,88 +590,88 @@
const AxisChar * pURI,
const AxisChar * pValue)
{
- logEntryEngine("HeaderBlock::createAttribute")
+ logEntryEngine("HeaderBlock::createAttribute")
// Check that the contents of the passed parameters are valid.
- if( NULL == pLocalName || 0 == strlen( pLocalName))
- {
- logExitWithPointer(NULL)
-
- return NULL;
- }
-
- if( !pPrefix)
- pPrefix = "";
-
- if( !pURI)
- pURI = "";
-
- if( !pValue)
- pValue = "";
-
- // Check that the local name and prefix have not already been defined. If
- // they have, then return NULL indicating that the prefix/localname pair have
- // already been defined.
- list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
-
- while( itCurrAttribute != m_attributes.end())
- {
- if( (strcmp( (*itCurrAttribute)->getLocalName(), pLocalName) == 0) &&
- (strcmp( (*itCurrAttribute)->getPrefix(), pPrefix) == 0))
- {
- logExitWithPointer(NULL)
-
- return NULL;
- }
- else
- {
- itCurrAttribute++;
- }
- }
-
- // Check that the prefix has not already been defined in the namespace
- // declarations. If it has, then return NULL indicating that the
- // prefix/localname pair has already been defined and 'copy down' the
- // namespace decl into the attribute list as this will help in the
- // serialisation.
- list<Namespace*>::iterator itCurrNamespaceDecls = m_namespaceDecls.begin();
-
- while( itCurrNamespaceDecls != m_namespaceDecls.end())
- {
- if( !strcmp( (*itCurrNamespaceDecls)->getPrefix(), pPrefix))
- {
- Attribute * pAttribute = new Attribute( m_attributes, pLocalName,
- pPrefix,
- (*itCurrNamespaceDecls)->getURI(),
- pValue);
-
- m_attributes.push_back( pAttribute);
-
- logExitWithPointer(pAttribute)
-
- return pAttribute;
- }
- else
- {
- itCurrNamespaceDecls++;
- }
- }
-
- // If the prefix/localname pair have not previously been defined, then create
- // and return the attribute.
- Attribute * pAttribute = new Attribute( m_attributes, pLocalName, pPrefix, pURI, pValue);
+ if( NULL == pLocalName || 0 == strlen( pLocalName))
+ {
+ logExitWithPointer(NULL)
+
+ return NULL;
+ }
+
+ if( !pPrefix)
+ pPrefix = "";
+
+ if( !pURI)
+ pURI = "";
+
+ if( !pValue)
+ pValue = "";
- m_attributes.push_back( pAttribute);
+ // Check that the local name and prefix have not already been defined. If
+ // they have, then return NULL indicating that the prefix/localname pair have
+ // already been defined.
+ list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
+
+ while( itCurrAttribute != m_attributes.end())
+ {
+ if( (strcmp( (*itCurrAttribute)->getLocalName(), pLocalName) == 0) &&
+ (strcmp( (*itCurrAttribute)->getPrefix(), pPrefix) == 0))
+ {
+ logExitWithPointer(NULL)
+
+ return NULL;
+ }
+ else
+ {
+ itCurrAttribute++;
+ }
+ }
+
+ // Check that the prefix has not already been defined in the namespace
+ // declarations. If it has, then return NULL indicating that the
+ // prefix/localname pair has already been defined and 'copy down' the
+ // namespace decl into the attribute list as this will help in the
+ // serialisation.
+ list<Namespace*>::iterator itCurrNamespaceDecls = m_namespaceDecls.begin();
+
+ while( itCurrNamespaceDecls != m_namespaceDecls.end())
+ {
+ if( !strcmp( (*itCurrNamespaceDecls)->getPrefix(), pPrefix))
+ {
+ Attribute * pAttribute = new Attribute( m_attributes, pLocalName,
+ pPrefix,
+ (*itCurrNamespaceDecls)->getURI(),
+ pValue);
+
+ m_attributes.push_back( pAttribute);
+
+ logExitWithPointer(pAttribute)
+
+ return pAttribute;
+ }
+ else
+ {
+ itCurrNamespaceDecls++;
+ }
+ }
+
+ // If the prefix/localname pair have not previously been defined, then create
+ // and return the attribute.
+ Attribute * pAttribute = new Attribute( m_attributes, pLocalName, pPrefix, pURI, pValue);
+
+ m_attributes.push_back( pAttribute);
logExitWithPointer(pAttribute)
- return pAttribute;
+ return pAttribute;
}
IAttribute* HeaderBlock::
createStdAttribute(HEADER_BLOCK_STD_ATTR_TYPE eStdAttrType, SOAP_VERSION eSOAP_VERSION)
{
- logEntryEngine("HeaderBlock::createStdAttribute")
+ logEntryEngine("HeaderBlock::createStdAttribute")
Attribute* pAttribute = NULL;
bool blnStatus = true;
@@ -788,7 +788,7 @@
const AxisChar* HeaderBlock::
getAttributeValue(const AxisChar *localname, const AxisChar *prefix)
{
- logEntryEngine("HeaderBlock::getAttributeValue")
+ logEntryEngine("HeaderBlock::getAttributeValue")
const AxisChar* returnValue = NULL;
@@ -798,19 +798,19 @@
if(!prefix)
prefix="";
- list<Attribute*>::iterator itAttr = m_attributes.begin();
- while (itAttr != m_attributes.end())
- {
- Attribute* pAttribute = *itAttr;
- if (!strcmp(pAttribute->getLocalName(),localname) &&
- !strcmp(pAttribute->getPrefix(),prefix))
- {
- returnValue = pAttribute->getValue();
- break;
- }
- itAttr++;
- }
-
+ list<Attribute*>::iterator itAttr = m_attributes.begin();
+ while (itAttr != m_attributes.end())
+ {
+ Attribute* pAttribute = *itAttr;
+ if (!strcmp(pAttribute->getLocalName(),localname) &&
+ !strcmp(pAttribute->getPrefix(),prefix))
+ {
+ returnValue = pAttribute->getValue();
+ break;
+ }
+ itAttr++;
+ }
+
logExitWithString(returnValue)
return returnValue;
@@ -819,31 +819,31 @@
const AxisChar * HeaderBlock::
getAttributeUri( const AxisChar * localname, const AxisChar * prefix)
{
- logEntryEngine("HeaderBlock::getAttributeUri")
+ logEntryEngine("HeaderBlock::getAttributeUri")
const AxisChar* returnValue = NULL;
-
- list<Attribute*>::iterator itAttr = m_attributes.begin();
+
+ list<Attribute*>::iterator itAttr = m_attributes.begin();
- while( itAttr != m_attributes.end())
- {
- Attribute * pAttribute = *itAttr;
-
- if( !strcmp( pAttribute->getLocalName(),localname) &&
- !strcmp( pAttribute->getPrefix(),prefix))
- {
- returnValue = pAttribute->getURI();
- break;
- }
-
- if( strlen( localname) == 0 && !strcmp( pAttribute->getPrefix(), prefix))
- {
- returnValue = pAttribute->getURI();
- break;
- }
+ while( itAttr != m_attributes.end())
+ {
+ Attribute * pAttribute = *itAttr;
- itAttr++;
- }
+ if( !strcmp( pAttribute->getLocalName(),localname) &&
+ !strcmp( pAttribute->getPrefix(),prefix))
+ {
+ returnValue = pAttribute->getURI();
+ break;
+ }
+
+ if( strlen( localname) == 0 && !strcmp( pAttribute->getPrefix(), prefix))
+ {
+ returnValue = pAttribute->getURI();
+ break;
+ }
+
+ itAttr++;
+ }
logExitWithString(returnValue)
@@ -853,7 +853,7 @@
BasicNode* HeaderBlock::
createImmediateChild(NODE_TYPE eNODE_TYPE, AxisChar *pachLocalName, AxisChar *pachPrefix, AxisChar *pachUri, AxisChar* pachValue)
{
- logEntryEngine("HeaderBlock::createImmediateChild")
+ logEntryEngine("HeaderBlock::createImmediateChild")
BasicNode* pBasicNode = NULL;
if(!pachLocalName)
@@ -899,7 +899,7 @@
createChild(NODE_TYPE eNODE_TYPE, AxisChar *pachLocalName,
AxisChar *pachPrefix, AxisChar *pachUri, AxisChar *pachValue)
{
- logEntryEngine("HeaderBlock::createChild")
+ logEntryEngine("HeaderBlock::createChild")
BasicNode* pBasicNode = NULL;
if(!pachLocalName)
@@ -938,15 +938,15 @@
BasicNode* HeaderBlock::
getFirstChild()
{
- logEntryEngine("HeaderBlock::getFirstChild")
+ logEntryEngine("HeaderBlock::getFirstChild")
BasicNode* returnValue = NULL;
-
+
list<BasicNode*>::iterator itCurrBasicNode= m_children.begin();
if (itCurrBasicNode != m_children.end())
{
- returnValue = (*itCurrBasicNode);
+ returnValue = (*itCurrBasicNode);
}
logExitWithPointer(returnValue)
Modified: webservices/axis/trunk/c/src/soap/HeaderBlock.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/HeaderBlock.h?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/HeaderBlock.h (original)
+++ webservices/axis/trunk/c/src/soap/HeaderBlock.h Tue Dec 2 21:29:56 2008
@@ -75,7 +75,7 @@
* Serializes the namespace decl.
*/
int serializeNamespaceDecl(SoapSerializer& pSZ,
- std::list<AxisChar*>& lstTmpNameSpaceStack);
+ std::list<AxisChar*>& lstTmpNameSpaceStack);
int serializeChildren(SoapSerializer& pSZ,
std::list<AxisChar*>& lstTmpNameSpaceStack);
@@ -94,9 +94,9 @@
AxisString m_sPrefix;
AxisString m_uri;
std::list<Attribute*> m_attributes;
- std::list<Namespace*> m_namespaceDecls;
+ std::list<Namespace*> m_namespaceDecls;
-public:
+public:
INamespace* createNamespaceDecl(const AxisChar *prefix,
const AxisChar *uri);
@@ -136,14 +136,14 @@
int setPrefix(const AxisChar* prefix);
- /**
+ /**
* The Constructor.
*
* @param pachLocalName The local name of this Header Block.
* @param pachPrefix The prefix of this Header Block.
* @param pachUri The namespace uri of this Header Block.
*/
- HeaderBlock(const AxisChar *pachLocalName, const AxisChar *pachUri, const AxisChar *pachPrefix);
+ HeaderBlock(const AxisChar *pachLocalName, const AxisChar *pachUri, const AxisChar *pachPrefix);
/**
* The Constructor.
Modified: webservices/axis/trunk/c/src/soap/Namespace.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/Namespace.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/Namespace.cpp (original)
+++ webservices/axis/trunk/c/src/soap/Namespace.cpp Tue Dec 2 21:29:56 2008
@@ -42,15 +42,15 @@
Namespace::Namespace(const AxisChar* achPrefix, const AxisChar* achURI)
{
- m_asPrefix = achPrefix;
- m_asURI = achURI;
+ m_asPrefix = achPrefix;
+ m_asURI = achURI;
}
int Namespace::setPrefix(const AxisChar* achPrefix)
{
if (achPrefix)
{
- m_asPrefix = achPrefix;
+ m_asPrefix = achPrefix;
return AXIS_SUCCESS;
}
return AXIS_FAIL;
@@ -68,27 +68,27 @@
const AxisChar* Namespace::getURI()
{
- return m_asURI.c_str();
+ return m_asURI.c_str();
}
const AxisChar* Namespace::getPrefix()
{
- return m_asPrefix.c_str();
+ return m_asPrefix.c_str();
}
int Namespace::serialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack)
{
- /*Adding the new namespace to the Serializer*/
- pSZ.addNamespaceToNamespaceList(m_asURI.c_str(), m_asPrefix.c_str());
- /*Adding the namespace to the temporary stack, so that it will be removed
- * at the end of the logical block. The logical block could be a HeaderBlock,
- * a Soap Method etc.
- */
- lstTmpNameSpaceStack.push_back((AxisChar*)m_asURI.c_str());
+ /*Adding the new namespace to the Serializer*/
+ pSZ.addNamespaceToNamespaceList(m_asURI.c_str(), m_asPrefix.c_str());
+ /*Adding the namespace to the temporary stack, so that it will be removed
+ * at the end of the logical block. The logical block could be a HeaderBlock,
+ * a Soap Method etc.
+ */
+ lstTmpNameSpaceStack.push_back((AxisChar*)m_asURI.c_str());
- pSZ.serialize(" xmlns:", m_asPrefix.c_str(), "=\"", m_asURI.c_str(), "\"", NULL);
+ pSZ.serialize(" xmlns:", m_asPrefix.c_str(), "=\"", m_asURI.c_str(), "\"", NULL);
- return AXIS_SUCCESS;
+ return AXIS_SUCCESS;
}
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/Namespace.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/Namespace.h?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/Namespace.h (original)
+++ webservices/axis/trunk/c/src/soap/Namespace.h Tue Dec 2 21:29:56 2008
@@ -46,18 +46,18 @@
class Namespace : public INamespace
{
public:
- int serialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack);
- const AxisChar* getPrefix();
- const AxisChar* getURI();
- int setURI(const AxisChar* achURI);
- int setPrefix(const AxisChar* achPrefix);
- Namespace(const AxisChar* achPrefix, const AxisChar* achURI);
- Namespace();
- virtual ~Namespace();
+ int serialize(SoapSerializer& pSZ, list<AxisChar*>& lstTmpNameSpaceStack);
+ const AxisChar* getPrefix();
+ const AxisChar* getURI();
+ int setURI(const AxisChar* achURI);
+ int setPrefix(const AxisChar* achPrefix);
+ Namespace(const AxisChar* achPrefix, const AxisChar* achURI);
+ Namespace();
+ virtual ~Namespace();
private:
- AxisString m_asPrefix;
- AxisString m_asURI;
+ AxisString m_asPrefix;
+ AxisString m_asURI;
};
Modified: webservices/axis/trunk/c/src/soap/SoapAttachment.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapAttachment.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapAttachment.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapAttachment.cpp Tue Dec 2 21:29:56 2008
@@ -31,23 +31,23 @@
SoapAttachment::
SoapAttachment(ContentIdSet *pContentIdSet)
-{
- m_AttachmentHeaders = new SoapAttachmentHeaders();
- m_AttachmentBody = NULL;
+{
+ m_AttachmentHeaders = new SoapAttachmentHeaders();
+ m_AttachmentBody = NULL;
m_binaryBody = NULL;
- m_pContentIdSet = pContentIdSet;
- if (NULL!=m_pContentIdSet)
- m_AttachmentHeaders->addHeader(AXIS_CONTENT_ID, pContentIdSet->generateId());
-
- // Set up some sensible default values for mandatory headers.
- m_AttachmentHeaders->addHeader(AXIS_CONTENT_TYPE,"text/plain");
- m_AttachmentHeaders->addHeader(AXIS_CONTENT_TRANSFER_ENCODING,"base64");
+ m_pContentIdSet = pContentIdSet;
+ if (NULL!=m_pContentIdSet)
+ m_AttachmentHeaders->addHeader(AXIS_CONTENT_ID, pContentIdSet->generateId());
+
+ // Set up some sensible default values for mandatory headers.
+ m_AttachmentHeaders->addHeader(AXIS_CONTENT_TYPE,"text/plain");
+ m_AttachmentHeaders->addHeader(AXIS_CONTENT_TRANSFER_ENCODING,"base64");
}
SoapAttachment::
~SoapAttachment()
{
- delete m_AttachmentHeaders;
+ delete m_AttachmentHeaders;
// client code generation does not assume this object will
// assume ownership of m_AttachmentBody!
// Need to revisit, maybe add boolean that can be
@@ -58,17 +58,17 @@
void SoapAttachment::
addHeader(const char* pchName, const char* pchValue)
{
- // Registering the contentid here ensures that it is unique within the mime message.
- if (NULL!=m_pContentIdSet && 0==strcmp(AXIS_CONTENT_ID,pchName))
- m_pContentIdSet->registerId(pchValue);
- m_AttachmentHeaders->addHeader(pchName, pchValue);
+ // Registering the contentid here ensures that it is unique within the mime message.
+ if (NULL!=m_pContentIdSet && 0==strcmp(AXIS_CONTENT_ID,pchName))
+ m_pContentIdSet->registerId(pchValue);
+ m_AttachmentHeaders->addHeader(pchName, pchValue);
}
void SoapAttachment::
addBody(xsd__base64Binary* objBody)
{
iEncodingStyle = AXIS_BASE64;
- m_AttachmentBody = objBody;
+ m_AttachmentBody = objBody;
}
void SoapAttachment::
@@ -86,18 +86,18 @@
void SoapAttachment::
serialize(SoapSerializer &pSZ)
{
- /* Serialize the Attachment Headers */
- pSZ.serialize("\r\n", NULL);
- m_AttachmentHeaders->serialize(pSZ);
+ /* Serialize the Attachment Headers */
+ pSZ.serialize("\r\n", NULL);
+ m_AttachmentHeaders->serialize(pSZ);
- /* Serialize the Attachment Body */
+ /* Serialize the Attachment Body */
if (iEncodingStyle == AXIS_BASE64)
{
- if (m_AttachmentBody)
+ if (m_AttachmentBody)
{
- pSZ.serialize("\r\n", NULL);
- pSZ.serializeAsChardata(m_AttachmentBody, XSD_BASE64BINARY);
- }
+ pSZ.serialize("\r\n", NULL);
+ pSZ.serializeAsChardata(m_AttachmentBody, XSD_BASE64BINARY);
+ }
}
else if (iEncodingStyle == AXIS_BINARY)
{
@@ -121,19 +121,19 @@
}
}
- pSZ.serialize("\r\n", NULL);
+ pSZ.serialize("\r\n", NULL);
}
xsd__base64Binary* SoapAttachment::
getBody()
{
- return m_AttachmentBody;
+ return m_AttachmentBody;
}
const char* SoapAttachment::
getHeader(const char *pchName)
{
- return m_AttachmentHeaders->getHeader(pchName);
+ return m_AttachmentHeaders->getHeader(pchName);
}
const char* SoapAttachment::
Modified: webservices/axis/trunk/c/src/soap/SoapAttachment.hpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapAttachment.hpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapAttachment.hpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapAttachment.hpp Tue Dec 2 21:29:56 2008
@@ -46,23 +46,23 @@
class STORAGE_CLASS_INFO SoapAttachment : public ISoapAttachment
{
-private:
- SoapAttachmentHeaders *m_AttachmentHeaders;
- xsd__base64Binary* m_AttachmentBody;
+private:
+ SoapAttachmentHeaders *m_AttachmentHeaders;
+ xsd__base64Binary* m_AttachmentBody;
char *m_binaryBody;
int iEncodingStyle;
ContentIdSet *m_pContentIdSet;
-public:
- SoapAttachment(ContentIdSet *pContentIdSet=NULL);
- virtual ~SoapAttachment();
+public:
+ SoapAttachment(ContentIdSet *pContentIdSet=NULL);
+ virtual ~SoapAttachment();
const char* getAttachmentId();
- const char* getHeader(const char* pchName);
- xsd__base64Binary* getBody();
- void serialize(SoapSerializer& pSZ);
- void addBody(xsd__base64Binary* objBody);
+ const char* getHeader(const char* pchName);
+ xsd__base64Binary* getBody();
+ void serialize(SoapSerializer& pSZ);
+ void addBody(xsd__base64Binary* objBody);
void addBody(char* pchBinaryBody);
- void addHeader(const char* pchName, const char* pchValue);
+ void addHeader(const char* pchName, const char* pchValue);
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.cpp Tue Dec 2 21:29:56 2008
@@ -44,48 +44,48 @@
void SoapAttachmentHeaders::addHeader(AxisString name, AxisString value)
{
- bool found = false;
- for (unsigned int i = 0; i < m_AttachHeaders.size (); i++)
- {
- if (m_AttachHeaders[i].first == name)
- {
- m_AttachHeaders[i] = make_pair(name, value);
- found = true;
- break;
- }
- }
+ bool found = false;
+ for (unsigned int i = 0; i < m_AttachHeaders.size (); i++)
+ {
+ if (m_AttachHeaders[i].first == name)
+ {
+ m_AttachHeaders[i] = make_pair(name, value);
+ found = true;
+ break;
+ }
+ }
- if (!found)
- m_AttachHeaders.push_back (make_pair (name, value));
+ if (!found)
+ m_AttachHeaders.push_back (make_pair (name, value));
}
void SoapAttachmentHeaders::serialize(SoapSerializer &pSZ)
{
- for (unsigned int i = 0; i < m_AttachHeaders.size (); i++)
- {
- if (m_AttachHeaders[i].first == AXIS_CONTENT_ID)
- {
- pSZ.serialize((m_AttachHeaders[i].first).c_str(), ": <", NULL);
- pSZ.serialize((m_AttachHeaders[i].second).c_str(), ">\r\n", NULL);
- } else {
- pSZ.serialize((m_AttachHeaders[i].first).c_str(), ": ", NULL);
- pSZ.serialize((m_AttachHeaders[i].second).c_str(), "\r\n", NULL);
- }
- }
+ for (unsigned int i = 0; i < m_AttachHeaders.size (); i++)
+ {
+ if (m_AttachHeaders[i].first == AXIS_CONTENT_ID)
+ {
+ pSZ.serialize((m_AttachHeaders[i].first).c_str(), ": <", NULL);
+ pSZ.serialize((m_AttachHeaders[i].second).c_str(), ">\r\n", NULL);
+ } else {
+ pSZ.serialize((m_AttachHeaders[i].first).c_str(), ": ", NULL);
+ pSZ.serialize((m_AttachHeaders[i].second).c_str(), "\r\n", NULL);
+ }
+ }
}
const char *SoapAttachmentHeaders::getHeader(AxisString sName)
{
- for (unsigned int i = 0; i < m_AttachHeaders.size (); i++)
- {
- if (m_AttachHeaders[i].first == AXIS_CONTENT_ID)
- {
- return m_AttachHeaders[i].second.c_str();
- }
- }
+ for (unsigned int i = 0; i < m_AttachHeaders.size (); i++)
+ {
+ if (m_AttachHeaders[i].first == AXIS_CONTENT_ID)
+ {
+ return m_AttachHeaders[i].second.c_str();
+ }
+ }
- return "";
+ return "";
}
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.hpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.hpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.hpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapAttachmentHeaders.hpp Tue Dec 2 21:29:56 2008
@@ -41,15 +41,15 @@
class SoapAttachmentHeaders
{
-private:
- vector < pair < AxisString, AxisString > > m_AttachHeaders;
+private:
+ vector < pair < AxisString, AxisString > > m_AttachHeaders;
public:
- const char *getHeader(AxisString sName);
- void serialize(SoapSerializer& pSZ);
- void addHeader(AxisString name, AxisString value);
- SoapAttachmentHeaders();
- virtual ~SoapAttachmentHeaders();
+ const char *getHeader(AxisString sName);
+ void serialize(SoapSerializer& pSZ);
+ void addHeader(AxisString name, AxisString value);
+ SoapAttachmentHeaders();
+ virtual ~SoapAttachmentHeaders();
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/SoapAttachmentReference.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapAttachmentReference.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapAttachmentReference.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapAttachmentReference.cpp Tue Dec 2 21:29:56 2008
@@ -26,44 +26,44 @@
AXIS_CPP_NAMESPACE_START
SoapAttachmentReference::SoapAttachmentReference(SoapAttachment *att)
-{
- m_attachment = att;
+{
+ m_attachment = att;
}
SoapAttachmentReference::~SoapAttachmentReference() {}
void SoapAttachmentReference::serialize(SoapSerializer& pSZ, const char *name)
{
- string data = "<";
- data += name;
- if (NULL==m_attachment->getBody())
- data += " xsi:nil=\"true\"";
- else
- {
- data += " href=\"cid:";
- data += m_attachment->getHeader(AXIS_CONTENT_ID);
- data += "\"";
- }
- pSZ.serialize(data.c_str(), NULL);
-
- list<Attribute*>::iterator it = m_attributes.begin();
- while (it != m_attributes.end())
- {
- pSZ.serialize("\r\n ",NULL);
- (*it)->serialize(pSZ);
- it++;
- }
- pSZ.serialize("/>\r\n",NULL);
+ string data = "<";
+ data += name;
+ if (NULL==m_attachment->getBody())
+ data += " xsi:nil=\"true\"";
+ else
+ {
+ data += " href=\"cid:";
+ data += m_attachment->getHeader(AXIS_CONTENT_ID);
+ data += "\"";
+ }
+ pSZ.serialize(data.c_str(), NULL);
+
+ list<Attribute*>::iterator it = m_attributes.begin();
+ while (it != m_attributes.end())
+ {
+ pSZ.serialize("\r\n ",NULL);
+ (*it)->serialize(pSZ);
+ it++;
+ }
+ pSZ.serialize("/>\r\n",NULL);
}
void SoapAttachmentReference::addAttributes(IAttribute **attributes, int nAttributes)
{
- if (0==nAttributes || NULL==attributes) return;
- for (int i=0; i<nAttributes; i++)
- if (NULL!=attributes[i])
- m_attributes.push_back(static_cast<Attribute*>(attributes[i]));
+ if (0==nAttributes || NULL==attributes) return;
+ for (int i=0; i<nAttributes; i++)
+ if (NULL!=attributes[i])
+ m_attributes.push_back(static_cast<Attribute*>(attributes[i]));
- return;
+ return;
}
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/SoapAttachmentReference.hpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapAttachmentReference.hpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapAttachmentReference.hpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapAttachmentReference.hpp Tue Dec 2 21:29:56 2008
@@ -31,16 +31,16 @@
class SoapAttachmentReference
{
-private:
- SoapAttachment *m_attachment;
- list<Attribute*> m_attributes;
+private:
+ SoapAttachment *m_attachment;
+ list<Attribute*> m_attributes;
-public:
- SoapAttachmentReference(SoapAttachment *att);
- virtual ~SoapAttachmentReference();
+public:
+ SoapAttachmentReference(SoapAttachment *att);
+ virtual ~SoapAttachmentReference();
SoapAttachment* getAttachment();
- void serialize(SoapSerializer& pSZ, const char *name);
- void addAttributes(IAttribute **attributes, int nAttributes);
+ void serialize(SoapSerializer& pSZ, const char *name);
+ void addAttributes(IAttribute **attributes, int nAttributes);
};
AXIS_CPP_NAMESPACE_END
Modified: webservices/axis/trunk/c/src/soap/SoapBody.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapBody.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapBody.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapBody.cpp Tue Dec 2 21:29:56 2008
@@ -32,49 +32,49 @@
SoapBody::
SoapBody()
{
- logEntryEngine("SoapBody::SoapBody")
+ logEntryEngine("SoapBody::SoapBody")
m_pSoapMethod= NULL;
m_pSoapFault= NULL;
- logExit()
+ logExit()
}
SoapBody::
~SoapBody()
{
- logEntryEngine("SoapBody::~SoapBody")
+ logEntryEngine("SoapBody::~SoapBody")
delete m_pSoapMethod;
delete m_pSoapFault;
- logExit()
+ logExit()
}
void SoapBody::
setSoapMethod(SoapMethod* ptrSoapMethod)
{
- logEntryEngine("SoapBody::setSoapMethod")
+ logEntryEngine("SoapBody::setSoapMethod")
m_pSoapMethod= ptrSoapMethod;
-
- logExit()
+
+ logExit()
}
void SoapBody::
setSoapFault(SoapFault *pSoapFault)
{
- logEntryEngine("SoapBody::setSoapFault")
+ logEntryEngine("SoapBody::setSoapFault")
m_pSoapFault= pSoapFault;
-
- logExit()
+
+ logExit()
}
int SoapBody::
serialize(SoapSerializer& pSZ, SOAP_VERSION eSoapVersion)
{
- logEntryEngine("SoapBody::serialize")
+ logEntryEngine("SoapBody::serialize")
int iStatus= AXIS_SUCCESS;
@@ -97,15 +97,15 @@
}
else if(NULL != m_pSoapMethod)
{
- // A null-string namespace means the operation does not have input parameters and
- // thus we skip this serialization step!
- AxisString prefix = m_pSoapMethod->getPrefix();
- if (prefix.length() != 0)
- {
- iStatus= m_pSoapMethod->serialize(pSZ);
- if(iStatus==AXIS_FAIL)
- break;
- }
+ // A null-string namespace means the operation does not have input parameters and
+ // thus we skip this serialization step!
+ AxisString prefix = m_pSoapMethod->getPrefix();
+ if (prefix.length() != 0)
+ {
+ iStatus= m_pSoapMethod->serialize(pSZ);
+ if(iStatus==AXIS_FAIL)
+ break;
+ }
}
else
{
@@ -124,7 +124,7 @@
}
while(0);
- logExitWithReturnCode(iStatus)
+ logExitWithReturnCode(iStatus)
return iStatus;
}
@@ -132,17 +132,17 @@
void SoapBody::
addAttribute(Attribute *attr)
{
- logEntryEngine("SoapBody::addAttribute")
+ logEntryEngine("SoapBody::addAttribute")
m_attributes.push_back(attr);
-
- logExit()
+
+ logExit()
}
int SoapBody::
serializeAttributes(SoapSerializer& pSZ)
{
- logEntryEngine("SoapBody::serializeAttributes")
+ logEntryEngine("SoapBody::serializeAttributes")
int iStatus= AXIS_SUCCESS;
@@ -156,7 +156,7 @@
itCurrAttribute++;
}
- logExitWithReturnCode(iStatus)
+ logExitWithReturnCode(iStatus)
return iStatus;
}