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 wh...@apache.org on 2005/06/15 15:37:32 UTC
cvs commit: ws-axis/c/vc AxisClientDLL.dsp AxisServerDLL.dsp
whitlock 2005/06/15 06:37:32
Modified: c/include/axis ISoapAttachment.hpp
IWrapperSoapSerializer.hpp
c/src/cbindings IWrapperSoapSerializerC.cpp
c/src/soap Makefile.am SoapAttachment.cpp SoapAttachment.hpp
SoapSerializer.cpp SoapSerializer.h
c/vc AxisClientDLL.dsp AxisServerDLL.dsp
Added: c/src/soap ContentIdSet.cpp ContentIdSet.hpp
SoapAttachmentHeaders.cpp SoapAttachmentHeaders.hpp
Removed: c/src/soap SoapAttachementHeaders.cpp
SoapAttachementHeaders.hpp
Log:
Correct misspelling of attachment (attachement)
Revision Changes Path
1.6 +1 -1 ws-axis/c/include/axis/ISoapAttachment.hpp
Index: ISoapAttachment.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/ISoapAttachment.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ISoapAttachment.hpp 15 Jun 2005 13:16:44 -0000 1.5
+++ ISoapAttachment.hpp 15 Jun 2005 13:37:31 -0000 1.6
@@ -69,7 +69,7 @@
/**
* Allows the user to get the required Attachment Header
*
- * @param pchName The name of the required Attachement Header
+ * @param pchName The name of the required Attachment Header
*/
virtual const char* getHeader(const char* pchName)=0;
1.12 +1 -1 ws-axis/c/include/axis/IWrapperSoapSerializer.hpp
Index: IWrapperSoapSerializer.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/IWrapperSoapSerializer.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- IWrapperSoapSerializer.hpp 8 Jun 2005 04:25:08 -0000 1.11
+++ IWrapperSoapSerializer.hpp 15 Jun 2005 13:37:31 -0000 1.12
@@ -174,7 +174,7 @@
* method of the IWrapperSoapSerializer interface
*
*/
- virtual ISoapAttachment* createSoapAttachement()=0;
+ virtual ISoapAttachment* createSoapAttachment()=0;
/**
* This methos will clear up all the current out params in preperation of a
1.8 +2 -2 ws-axis/c/src/cbindings/IWrapperSoapSerializerC.cpp
Index: IWrapperSoapSerializerC.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/cbindings/IWrapperSoapSerializerC.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IWrapperSoapSerializerC.cpp 23 Mar 2005 15:44:58 -0000 1.7
+++ IWrapperSoapSerializerC.cpp 15 Jun 2005 13:37:31 -0000 1.8
@@ -183,9 +183,9 @@
sz->addAttachmentHeader(achId,achHeaderName,achHeaderValue);
}
-AXISC_STORAGE_CLASS_INFO AXISCHANDLE axiscCreateSoapAttachementSoapAttachment(AXISCHANDLE wrapperSoapSerializer) {
+AXISC_STORAGE_CLASS_INFO AXISCHANDLE axiscCreateSoapAttachmentSoapAttachment(AXISCHANDLE wrapperSoapSerializer) {
IWrapperSoapSerializer *sz = (IWrapperSoapSerializer*)wrapperSoapSerializer;
- return (AXISCHANDLE)(sz->createSoapAttachement());
+ return (AXISCHANDLE)(sz->createSoapAttachment());
}
AXISC_STORAGE_CLASS_INFO void axiscSerializeIWrapperSoapSerializer(
1.39 +1 -1 ws-axis/c/src/soap/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.am 23 Feb 2005 15:12:06 -0000 1.38
+++ Makefile.am 15 Jun 2005 13:37:31 -0000 1.39
@@ -20,7 +20,7 @@
HexCoder.cpp \
AxisSoapException.cpp \
SoapAttachment.cpp \
- SoapAttachementHeaders.cpp \
+ SoapAttachmentHeaders.cpp \
SoapFaultException.cpp \
OtherFaultException.cpp \
xsd/Int.cpp \
1.9 +14 -14 ws-axis/c/src/soap/SoapAttachment.cpp
Index: SoapAttachment.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapAttachment.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SoapAttachment.cpp 11 May 2005 11:05:00 -0000 1.8
+++ SoapAttachment.cpp 15 Jun 2005 13:37:31 -0000 1.9
@@ -43,28 +43,28 @@
SoapAttachment::SoapAttachment()
{
- m_AttachementHeaders = new SoapAttachementHeaders();
- m_AttachementBody = 0;
+ m_AttachmentHeaders = new SoapAttachmentHeaders();
+ m_AttachmentBody = 0;
}
SoapAttachment::~SoapAttachment()
{
- delete m_AttachementHeaders;
- m_AttachementHeaders =0;
+ delete m_AttachmentHeaders;
+ m_AttachmentHeaders =0;
- delete m_AttachementBody;
- m_AttachementBody =0;
+ delete m_AttachmentBody;
+ m_AttachmentBody =0;
}
void SoapAttachment::addHeader(const char* pchName, const char* pchValue)
{
- m_AttachementHeaders->addHeader(pchName, pchValue);
+ m_AttachmentHeaders->addHeader(pchName, pchValue);
}
void SoapAttachment::addBody(xsd__base64Binary* objBody)
{
iEncodingStyle = AXIS_BASE64;
- m_AttachementBody = objBody;
+ m_AttachmentBody = objBody;
}
void SoapAttachment::addBody(char* pchBinaryBody)
@@ -79,14 +79,14 @@
{
/* Serialize the Attachment Headers */
pSZ.serialize("\n", NULL);
- m_AttachementHeaders->serialize(pSZ);
+ m_AttachmentHeaders->serialize(pSZ);
/* Serialize the Attachment Body */
if (iEncodingStyle == AXIS_BASE64)
{
- if (m_AttachementBody) {
+ if (m_AttachmentBody) {
pSZ.serialize("\n", NULL);
- pSZ.serializeAsChardata(m_AttachementBody, XSD_BASE64BINARY);
+ pSZ.serializeAsChardata(m_AttachmentBody, XSD_BASE64BINARY);
}
}
else if (iEncodingStyle == AXIS_BINARY)
@@ -114,15 +114,15 @@
xsd__base64Binary* SoapAttachment::getBody()
{
- return m_AttachementBody;
+ return m_AttachmentBody;
}
const char* SoapAttachment::getHeader(const char *pchName)
{
- if (m_AttachementHeaders->getHeader(pchName).empty())
+ if (m_AttachmentHeaders->getHeader(pchName).empty())
return "";
else
- return m_AttachementHeaders->getHeader(pchName).c_str();
+ return m_AttachmentHeaders->getHeader(pchName).c_str();
}
const char* SoapAttachment::getAttachmentId()
1.7 +3 -3 ws-axis/c/src/soap/SoapAttachment.hpp
Index: SoapAttachment.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapAttachment.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SoapAttachment.hpp 5 May 2005 08:56:13 -0000 1.6
+++ SoapAttachment.hpp 15 Jun 2005 13:37:31 -0000 1.7
@@ -40,7 +40,7 @@
#include <axis/GDefine.hpp>
#include <axis/AxisUserAPI.hpp>
#include <axis/ISoapAttachment.hpp>
-#include "SoapAttachementHeaders.hpp"
+#include "SoapAttachmentHeaders.hpp"
#include <string>
using namespace std;
@@ -52,8 +52,8 @@
class STORAGE_CLASS_INFO SoapAttachment : public ISoapAttachment
{
private:
- SoapAttachementHeaders* m_AttachementHeaders;
- xsd__base64Binary* m_AttachementBody;
+ SoapAttachmentHeaders* m_AttachmentHeaders;
+ xsd__base64Binary* m_AttachmentBody;
char *m_binaryBody;
int iEncodingStyle;
1.123 +2 -2 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.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- SoapSerializer.cpp 15 Jun 2005 13:16:44 -0000 1.122
+++ SoapSerializer.cpp 15 Jun 2005 13:37:31 -0000 1.123
@@ -1128,7 +1128,7 @@
void SoapSerializer::serializeAttachments( SoapSerializer &pSZ)
{
- /*serializing the attachements*/
+ /*serializing the attachments*/
map<AxisXMLString, ISoapAttachment*>::iterator itCurrAttach= m_SoapAttachments.begin();
@@ -1202,7 +1202,7 @@
m_NsStack[pachNamespaceURI] = pachPrefix;
}
-ISoapAttachment* SoapSerializer::createSoapAttachement()
+ISoapAttachment* SoapSerializer::createSoapAttachment()
{
SoapAttachment * pSAttch = new SoapAttachment();
1.49 +1 -1 ws-axis/c/src/soap/SoapSerializer.h
Index: SoapSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- SoapSerializer.h 8 Jun 2005 04:25:08 -0000 1.48
+++ SoapSerializer.h 15 Jun 2005 13:37:31 -0000 1.49
@@ -174,7 +174,7 @@
public:
IHeaderBlock* getCurrentHeaderBlock();
- ISoapAttachment* createSoapAttachement();
+ ISoapAttachment* createSoapAttachment();
void addNamespaceToNamespaceList(const AxisChar *pachNamespaceURI, const AxisChar* pachPrefix);
void addNamespaceToEnvelope(AxisChar *pachNamespaceURI, AxisChar* pachPrefix);
void addAttachmentBody(const AxisChar* achId, xsd__base64Binary* pAttchBody);
1.1 ws-axis/c/src/soap/ContentIdSet.cpp
Index: ContentIdSet.cpp
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @author Mark Whitlock
*/
#include "ContentIdSet.hpp"
AXIS_CPP_NAMESPACE_START
ContentIdSet::ContentIdSet()
{
}
ContentIdSet::~ContentIdSet()
{
}
AXIS_CPP_NAMESPACE_END
1.1 ws-axis/c/src/soap/ContentIdSet.hpp
Index: ContentIdSet.hpp
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* @author Mark Whitlock
*/
#if !defined(CONTENTIDSET_H_INCLUDED_)
#define CONTENTIDSET_H_INCLUDED_
#include <list>
#include <string>
#include <axis/GDefine.hpp>
AXIS_CPP_NAMESPACE_START
using namespace std;
class ContentIdSet
{
public:
ContentIdSet();
virtual ~ContentIdSet();
void registerId(const char* id);
const char *generateId();
void clearAll();
private:
list<char*> m_set;
};
AXIS_CPP_NAMESPACE_END
#endif // !defined(CONTENTIDSET_H_INCLUDED_)
1.1 ws-axis/c/src/soap/SoapAttachmentHeaders.cpp
Index: SoapAttachmentHeaders.cpp
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* @author Rangika Mendis (rangika@opensource.lk)
* @author Nithyakala Thangarajah (nithya@opensource.lk)
* @author Roshan Weerasuriya (roshan@opensource.lk, roshan@jkcsworld.com)
*
*/
// SoapAttachmentHeaders.cpp: implementation of the SoapAttachmentHeaders class.
//
//////////////////////////////////////////////////////////////////////
#include "SoapAttachmentHeaders.hpp"
#include "SoapSerializer.h"
AXIS_CPP_NAMESPACE_START
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
SoapAttachmentHeaders::SoapAttachmentHeaders()
{
}
SoapAttachmentHeaders::~SoapAttachmentHeaders()
{
}
void SoapAttachmentHeaders::addHeader(AxisString name, AxisString value)
{
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 == "Content-Id")
{
pSZ.serialize((m_AttachHeaders[i].first).c_str(), ": <", NULL);
pSZ.serialize((m_AttachHeaders[i].second).c_str(), ">\n", NULL);
} else {
pSZ.serialize((m_AttachHeaders[i].first).c_str(), ":", NULL);
pSZ.serialize((m_AttachHeaders[i].second).c_str(), "\n", NULL);
}
}
}
AxisString SoapAttachmentHeaders::getHeader(AxisString sName)
{
for (unsigned int i = 0; i < m_AttachHeaders.size (); i++)
{
if (m_AttachHeaders[i].first == "Content-Id")
{
return m_AttachHeaders[i].second;
}
}
return "";
}
AXIS_CPP_NAMESPACE_END
1.1 ws-axis/c/src/soap/SoapAttachmentHeaders.hpp
Index: SoapAttachmentHeaders.hpp
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* @author Rangika Mendis (rangika@opensource.lk)
* @author Nithyakala Thangarajah (nithya@opensource.lk)
* @author Roshan Weerasuriya (roshan@opensource.lk, roshan@jkcsworld.com)
*
*/
// SoapAttachmentHeaders.h: interface for the SoapAttachmentHeaders class.
//
//////////////////////////////////////////////////////////////////////
#if !defined(AFX_SOAPATTACHMENTHEADERS_H__88A54506_DC18_41D4_B484_AB877ADC42D4__INCLUDED_)
#define AFX_SOAPATTACHMENTHEADERS_H__88A54506_DC18_41D4_B484_AB877ADC42D4__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
#ifdef WIN32
#pragma warning( disable : 4786 )
#endif
#include <vector>
#include <string>
#include <axis/GDefine.hpp>
AXIS_CPP_NAMESPACE_START
using namespace std;
class SoapSerializer;
class SoapAttachmentHeaders
{
private:
vector < pair < AxisString, AxisString > > m_AttachHeaders;
public:
AxisString getHeader(AxisString sName);
void serialize(SoapSerializer& pSZ);
void addHeader(AxisString name, AxisString value);
SoapAttachmentHeaders();
virtual ~SoapAttachmentHeaders();
};
AXIS_CPP_NAMESPACE_END
#endif // !defined(AFX_SOAPATTACHMENTHEADERS_H__88A54506_DC18_41D4_B484_AB877ADC42D4__INCLUDED_)
1.52 +1 -1 ws-axis/c/vc/AxisClientDLL.dsp
Index: AxisClientDLL.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/AxisClientDLL.dsp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- AxisClientDLL.dsp 25 May 2005 16:03:19 -0000 1.51
+++ AxisClientDLL.dsp 15 Jun 2005 13:37:31 -0000 1.52
@@ -458,7 +458,7 @@
# End Source File
# Begin Source File
-SOURCE=..\src\soap\SoapAttachementHeaders.cpp
+SOURCE=..\src\soap\SoapAttachmentHeaders.cpp
# End Source File
# Begin Source File
1.48 +2 -2 ws-axis/c/vc/AxisServerDLL.dsp
Index: AxisServerDLL.dsp
===================================================================
RCS file: /home/cvs/ws-axis/c/vc/AxisServerDLL.dsp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- AxisServerDLL.dsp 25 May 2005 16:03:19 -0000 1.47
+++ AxisServerDLL.dsp 15 Jun 2005 13:37:31 -0000 1.48
@@ -458,7 +458,7 @@
# End Source File
# Begin Source File
-SOURCE=..\src\soap\SoapAttachementHeaders.cpp
+SOURCE=..\src\soap\SoapAttachmentHeaders.cpp
# End Source File
# Begin Source File
@@ -614,7 +614,7 @@
# End Source File
# Begin Source File
-SOURCE=..\src\soap\SoapAttachementHeaders.hpp
+SOURCE=..\src\soap\SoapAttachmentHeaders.hpp
# End Source File
# Begin Source File