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 ni...@apache.org on 2005/01/21 13:40:19 UTC
cvs commit: ws-axis/c/src/soap SoapAttachment.cpp SoapAttachment.hpp SoapAttachementHeaders.cpp SoapAttachementHeaders.hpp
nithya 2005/01/21 04:40:19
Modified: c/src/soap SoapAttachment.cpp SoapAttachment.hpp
SoapAttachementHeaders.cpp
SoapAttachementHeaders.hpp
Log:
changes support ws-attachement
Revision Changes Path
1.3 +111 -101 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoapAttachment.cpp 7 Jan 2005 08:55:19 -0000 1.2
+++ SoapAttachment.cpp 21 Jan 2005 12:40:19 -0000 1.3
@@ -1,101 +1,111 @@
-/*
- * 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)
- *
- */
-
-// SoapAttachment.cpp: implementation of the SoapAttachment class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "SoapAttachment.hpp"
-#include "SoapSerializer.h"
-
-AXIS_CPP_NAMESPACE_START
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-SoapAttachment::SoapAttachment()
-{
- m_AttachementHeaders = new SoapAttachementHeaders();
-
- //Assigning to NULL
- m_AttachementBody = 0;
-}
-
-SoapAttachment::~SoapAttachment()
-{
- delete m_AttachementHeaders;
- m_AttachementHeaders =0;
-
- delete m_AttachementBody;
- m_AttachementBody =0;
-}
-
-void SoapAttachment::addHeader(const char* pchName, const char* pchValue)
-{
- m_AttachementHeaders->addHeader(pchName, pchValue);
-}
-
-/*
-void SoapAttachment::addBody(AxisString sBody)
-{
- m_AttachementBody = sBody;
-}
-*/
-
-void SoapAttachment::addBody(xsd__base64Binary* objBody)
-{
- m_AttachementBody = objBody;
-}
-
-void SoapAttachment::serialize(SoapSerializer &pSZ)
-{
- /* Serialize the Attachment Headers */
- pSZ.serialize("\n", NULL);
- m_AttachementHeaders->serialize(pSZ);
-
- /* Serialize the Attachment Body */
- //pSZ.serialize("\n", m_AttachementBody.c_str(), NULL);
-
- if (m_AttachementBody) {
- pSZ.serialize("\n", NULL);
- pSZ.serializeAsChardata(m_AttachementBody, XSD_BASE64BINARY);
- }
-
- pSZ.serialize("\n", NULL);
-}
-
-xsd__base64Binary* SoapAttachment::getBody()
-{
- return m_AttachementBody;
-}
-
-const char* SoapAttachment::getHeader(const char *pchName)
-{
- if (m_AttachementHeaders->getHeader(pchName).empty())
- return "";
- else
- return m_AttachementHeaders->getHeader(pchName).c_str();
-}
-
-AXIS_CPP_NAMESPACE_END
\ No newline at end of file
+/*
+ * 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)
+ *
+ */
+
+// SoapAttachment.cpp: implementation of the SoapAttachment class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SoapAttachment.hpp"
+#include "SoapSerializer.h"
+
+AXIS_CPP_NAMESPACE_START
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+SoapAttachment::SoapAttachment()
+{
+ m_AttachementHeaders = new SoapAttachementHeaders();
+
+ //Assigning to NULL
+ m_AttachementBody = 0;
+
+}
+
+SoapAttachment::~SoapAttachment()
+{
+ delete m_AttachementHeaders;
+ m_AttachementHeaders =0;
+
+ delete m_AttachementBody;
+ m_AttachementBody =0;
+}
+
+void SoapAttachment::addHeader(const char* pchName, const char* pchValue)
+{
+ m_AttachementHeaders->addHeader(pchName, pchValue);
+}
+
+/*
+void SoapAttachment::addBody(AxisString sBody)
+{
+ m_AttachementBody = sBody;
+}
+*/
+
+void SoapAttachment::addBody(xsd__base64Binary* objBody)
+{
+ m_AttachementBody = objBody;
+}
+
+void SoapAttachment::serialize(SoapSerializer &pSZ)
+{
+
+ /* Serialize the Attachment Headers */
+ pSZ.serialize("\n", NULL);
+ m_AttachementHeaders->serialize(pSZ);
+
+ /* Serialize the Attachment Body */
+ //pSZ.serialize("\n", m_AttachementBody.c_str(), NULL);
+
+ if (m_AttachementBody) {
+ pSZ.serialize("\n", NULL);
+ pSZ.serializeAsChardata(m_AttachementBody, XSD_BASE64BINARY);
+ }
+
+ pSZ.serialize("\n", NULL);
+}
+
+xsd__base64Binary* SoapAttachment::getBody()
+{
+ return m_AttachementBody;
+}
+
+const char* SoapAttachment::getHeader(const char *pchName)
+{
+ if (m_AttachementHeaders->getHeader(pchName).empty())
+ return "";
+ else
+ return m_AttachementHeaders->getHeader(pchName).c_str();
+}
+
+
+
+
+
+AXIS_CPP_NAMESPACE_END
+
+
+
+
1.3 +66 -65 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoapAttachment.hpp 7 Jan 2005 08:55:19 -0000 1.2
+++ SoapAttachment.hpp 21 Jan 2005 12:40:19 -0000 1.3
@@ -1,65 +1,66 @@
-/*
- * 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)
- *
- */
-
-
-// SoapAttachment.h: interface for the SoapAttachment class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_SOAPATTACHMENT_H__7E7B50DC_21AF_4C6E_83E0_F77985A38E43__INCLUDED_)
-#define AFX_SOAPATTACHMENT_H__7E7B50DC_21AF_4C6E_83E0_F77985A38E43__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include <axis/GDefine.hpp>
-#include <axis/AxisUserAPI.hpp>
-#include <axis/ISoapAttachment.hpp>
-#include "SoapAttachementHeaders.hpp"
-
-#include <string>
-using namespace std;
-
-AXIS_CPP_NAMESPACE_START
-
-class SoapSerializer;
-
-class SoapAttachment : public ISoapAttachment
-{
-private:
- SoapAttachementHeaders* m_AttachementHeaders;
- xsd__base64Binary* m_AttachementBody;
-public:
- const char* getHeader(const char* pchName);
- xsd__base64Binary* getBody();
-
- void serialize(SoapSerializer& pSZ);
- void addBody(xsd__base64Binary* objBody);
- void addHeader(const char* pchName, const char* pchValue);
- SoapAttachment();
- virtual ~SoapAttachment();
-};
-
-AXIS_CPP_NAMESPACE_END
-#endif // !defined(AFX_SOAPATTACHMENT_H__7E7B50DC_21AF_4C6E_83E0_F77985A38E43__INCLUDED_)
+/*
+ * 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)
+ *
+ */
+
+
+// SoapAttachment.h: interface for the SoapAttachment class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_SOAPATTACHMENT_H__7E7B50DC_21AF_4C6E_83E0_F77985A38E43__INCLUDED_)
+#define AFX_SOAPATTACHMENT_H__7E7B50DC_21AF_4C6E_83E0_F77985A38E43__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include <axis/GDefine.hpp>
+#include <axis/AxisUserAPI.hpp>
+#include <axis/ISoapAttachment.hpp>
+#include "SoapAttachementHeaders.hpp"
+
+#include <string>
+using namespace std;
+
+AXIS_CPP_NAMESPACE_START
+
+class SoapSerializer;
+
+class STORAGE_CLASS_INFO SoapAttachment : public ISoapAttachment
+{
+private:
+
+ SoapAttachementHeaders* m_AttachementHeaders;
+ xsd__base64Binary* m_AttachementBody;
+public:
+
+ const char* getHeader(const char* pchName);
+ xsd__base64Binary* getBody();
+ void serialize(SoapSerializer& pSZ);
+ void addBody(xsd__base64Binary* objBody);
+ void addHeader(const char* pchName, const char* pchValue);
+ SoapAttachment();
+ virtual ~SoapAttachment();
+};
+
+AXIS_CPP_NAMESPACE_END
+#endif // !defined(AFX_SOAPATTACHMENT_H__7E7B50DC_21AF_4C6E_83E0_F77985A38E43__INCLUDED_)
1.3 +120 -73 ws-axis/c/src/soap/SoapAttachementHeaders.cpp
Index: SoapAttachementHeaders.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapAttachementHeaders.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoapAttachementHeaders.cpp 7 Jan 2005 08:55:19 -0000 1.2
+++ SoapAttachementHeaders.cpp 21 Jan 2005 12:40:19 -0000 1.3
@@ -1,74 +1,121 @@
-/*
- * 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)
- *
- */
-
-
-// SoapAttachementHeaders.cpp: implementation of the SoapAttachementHeaders class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#include "SoapAttachementHeaders.hpp"
-#include "SoapSerializer.h"
-
-AXIS_CPP_NAMESPACE_START
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-SoapAttachementHeaders::SoapAttachementHeaders()
-{
-
-}
-
-SoapAttachementHeaders::~SoapAttachementHeaders()
-{
-
-}
-
-void SoapAttachementHeaders::addHeader(AxisString name, AxisString value)
-{
- m_AttachHeaders[name] = value;
-}
-
-void SoapAttachementHeaders::serialize(SoapSerializer &pSZ)
-{
- map<AxisString, AxisString>::iterator itCurrAttchHeader= m_AttachHeaders.begin();
-
- while(itCurrAttchHeader != m_AttachHeaders.end())
- {
- pSZ.serialize(((*itCurrAttchHeader).first).c_str(), ": ", NULL);
- pSZ.serialize(((*itCurrAttchHeader).second).c_str(), "\n", NULL);
-
- itCurrAttchHeader++;
- }
-}
-
-AxisString SoapAttachementHeaders::getHeader(AxisString sName)
-{
- if (m_AttachHeaders.find(sName) == m_AttachHeaders.end())
- return "";
- else
- return m_AttachHeaders[sName];
-}
-
+/*
+ * 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)
+ *
+ */
+
+
+// SoapAttachementHeaders.cpp: implementation of the SoapAttachementHeaders class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#include "SoapAttachementHeaders.hpp"
+#include "SoapSerializer.h"
+
+AXIS_CPP_NAMESPACE_START
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+SoapAttachementHeaders::SoapAttachementHeaders()
+{
+
+}
+
+SoapAttachementHeaders::~SoapAttachementHeaders()
+{
+
+}
+
+void SoapAttachementHeaders::addHeader(AxisString name, AxisString value)
+{
+ //m_AttachHeaders[name] = value;
+ m_AttachHeaders.push_back (make_pair (name, value));
+}
+
+void SoapAttachementHeaders::serialize(SoapSerializer &pSZ)
+{
+ /*
+ map<AxisString, AxisString>::iterator itCurrAttchHeader= m_AttachHeaders.begin();
+
+ while(itCurrAttchHeader != m_AttachHeaders.end())
+ {
+ if (strcmp(((*itCurrAttchHeader).first).c_str(), "Content-Id")==0)
+ {
+ pSZ.serialize(((*itCurrAttchHeader).first).c_str(), ": <", NULL);
+ pSZ.serialize(((*itCurrAttchHeader).second).c_str(), ">\n", NULL);
+
+ itCurrAttchHeader++;
+ }
+ else
+ {
+ pSZ.serialize(((*itCurrAttchHeader).first).c_str(), ":", NULL);
+ pSZ.serialize(((*itCurrAttchHeader).second).c_str(), "\n", NULL);
+
+ itCurrAttchHeader++;
+ }
+ }
+ */
+
+ for (unsigned int i = 0; i < m_AttachHeaders.size (); i++)
+ {
+ if (m_AttachHeaders[i].first == "Content-Id")
+ {
+ /*
+ m_vHTTPHeaders[i].second = (string) pcValue;
+
+ b_KeyFound = true;
+
+ break;
+ */
+
+ 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 SoapAttachementHeaders::getHeader(AxisString sName)
+{
+ /*
+ if (m_AttachHeaders.find(sName) == m_AttachHeaders.end())
+ return "";
+ else
+ return m_AttachHeaders[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.4 +63 -63 ws-axis/c/src/soap/SoapAttachementHeaders.hpp
Index: SoapAttachementHeaders.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapAttachementHeaders.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SoapAttachementHeaders.hpp 19 Jan 2005 15:43:48 -0000 1.3
+++ SoapAttachementHeaders.hpp 21 Jan 2005 12:40:19 -0000 1.4
@@ -1,63 +1,63 @@
-/*
- * 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)
- *
- */
-
-// SoapAttachementHeaders.h: interface for the SoapAttachementHeaders class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_SOAPATTACHEMENTHEADERS_H__88A54506_DC18_41D4_B484_AB877ADC42D4__INCLUDED_)
-#define AFX_SOAPATTACHEMENTHEADERS_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 <map>
-#include <string>
-#include <axis/GDefine.hpp>
-
-AXIS_CPP_NAMESPACE_START
-using namespace std;
-
-class SoapSerializer;
-
-class SoapAttachementHeaders
-{
-private:
- map<AxisString, AxisString> m_AttachHeaders;
-public:
- AxisString getHeader(AxisString sName);
-
- void serialize(SoapSerializer& pSZ);
- void addHeader(AxisString name, AxisString value);
- SoapAttachementHeaders();
- virtual ~SoapAttachementHeaders();
-
-};
-
-AXIS_CPP_NAMESPACE_END
-#endif // !defined(AFX_SOAPATTACHEMENTHEADERS_H__88A54506_DC18_41D4_B484_AB877ADC42D4__INCLUDED_)
+/*
+ * 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)
+ *
+ */
+
+// SoapAttachementHeaders.h: interface for the SoapAttachementHeaders class.
+//
+//////////////////////////////////////////////////////////////////////
+
+#if !defined(AFX_SOAPATTACHEMENTHEADERS_H__88A54506_DC18_41D4_B484_AB877ADC42D4__INCLUDED_)
+#define AFX_SOAPATTACHEMENTHEADERS_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 SoapAttachementHeaders
+{
+private:
+ vector < pair < AxisString, AxisString > > m_AttachHeaders;
+public:
+ AxisString getHeader(AxisString sName);
+
+ void serialize(SoapSerializer& pSZ);
+ void addHeader(AxisString name, AxisString value);
+ SoapAttachementHeaders();
+ virtual ~SoapAttachementHeaders();
+
+};
+
+AXIS_CPP_NAMESPACE_END
+#endif // !defined(AFX_SOAPATTACHEMENTHEADERS_H__88A54506_DC18_41D4_B484_AB877ADC42D4__INCLUDED_)