svn commit: r1136156 - /axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt
Author: veithen Date: Wed Jun 15 19:29:41 2011 New Revision: 1136156 URL: http://svn.apache.org/viewvc?rev=1136156&view=rev Log: Minor fix to the README of the quickstartadb sample. Modified: axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt Modified: axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt?rev=1136156&r1=1136155&r2=1136156&view=diff == --- axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt (original) +++ axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt Wed Jun 15 19:29:41 2011 @@ -1,7 +1,7 @@ Axis2 Quick Start Guide- Sample 2 (ADB) == -This sample contains source code for the xdocs/1_1/quickstartguide.html document found in +This sample contains source code for the site/docs/quickstartguide.html document found in the extracted Axis2 Documents Distribution. For a more detailed description on the source code kindly see this 'Axis2 Quick Start Guide' document.
svn commit: r1136159 - in /axis/axis2/java/core/trunk/modules/samples: quickstartadb/build.xml quickstartaxiom/build.xml
Author: veithen Date: Wed Jun 15 19:44:34 2011 New Revision: 1136159 URL: http://svn.apache.org/viewvc?rev=1136159&view=rev Log: Fixed the quickstart samples. If the client code is run inside the same VM as ant, then it will inherit the system properties but not all classpath entries from ant. This is a problem for certain ant versions that explicitly set the JAXP factory classes to Xerces (which is not on the classpath of the client code). To avoid this, use fork="true". Modified: axis/axis2/java/core/trunk/modules/samples/quickstartadb/build.xml axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml Modified: axis/axis2/java/core/trunk/modules/samples/quickstartadb/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartadb/build.xml?rev=1136159&r1=1136158&r2=1136159&view=diff == --- axis/axis2/java/core/trunk/modules/samples/quickstartadb/build.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/quickstartadb/build.xml Wed Jun 15 19:44:34 2011 @@ -109,7 +109,7 @@ - + Modified: axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml?rev=1136159&r1=1136158&r2=1136159&view=diff == --- axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/build.xml Wed Jun 15 19:44:34 2011 @@ -67,7 +67,7 @@ - +
svn commit: r1136161 - in /axis/axis2/java/core/branches/1_6: ./ modules/samples/quickstartadb/README.txt modules/samples/quickstartadb/build.xml modules/samples/quickstartaxiom/build.xml
Author: veithen Date: Wed Jun 15 19:52:07 2011 New Revision: 1136161 URL: http://svn.apache.org/viewvc?rev=1136161&view=rev Log: Merged some fixes for the samples to the 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml Propchange: axis/axis2/java/core/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 15 19:52:07 2011 @@ -1 +1 @@ -/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616 +/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159 Modified: axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt?rev=1136161&r1=1136160&r2=1136161&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/README.txt Wed Jun 15 19:52:07 2011 @@ -1,7 +1,7 @@ Axis2 Quick Start Guide- Sample 2 (ADB) == -This sample contains source code for the xdocs/1_1/quickstartguide.html document found in +This sample contains source code for the site/docs/quickstartguide.html document found in the extracted Axis2 Documents Distribution. For a more detailed description on the source code kindly see this 'Axis2 Quick Start Guide' document. Modified: axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml?rev=1136161&r1=1136160&r2=1136161&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/quickstartadb/build.xml Wed Jun 15 19:52:07 2011 @@ -109,7 +109,7 @@ - + Modified: axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml?rev=1136161&r1=1136160&r2=1136161&view=diff == --- axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml (original) +++ axis/axis2/java/core/branches/1_6/modules/samples/quickstartaxiom/build.xml Wed Jun 15 19:52:07 2011 @@ -67,7 +67,7 @@ - +
svn commit: r1136177 - in /axis/axis2/java/core/trunk/modules/saaj: src/org/apache/axis2/saaj/SOAPMessageImpl.java src/org/apache/axis2/saaj/SOAPPartImpl.java test/org/apache/axis2/saaj/SOAPMessageTes
Author: veithen
Date: Wed Jun 15 20:25:14 2011
New Revision: 1136177
URL: http://svn.apache.org/viewvc?rev=1136177&view=rev
Log:
AXIS2-5067: Committed patch provided by Ivan (xuhaihong), with minor changes.
This implements the saveChanges method and calculates the correct content type
for a SOAPMessage.
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/SOAPMessageTest.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java?rev=1136177&r1=1136176&r2=1136177&view=diff
==
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
Wed Jun 15 20:25:14 2011
@@ -26,9 +26,12 @@ import org.apache.axiom.om.impl.OMMultip
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory;
import org.apache.axiom.soap.impl.dom.soap12.SOAP12Factory;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.saaj.util.SAAJUtil;
import org.apache.axis2.transport.http.HTTPConstants;
+import javax.mail.internet.ContentType;
+import javax.mail.internet.ParseException;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MimeHeader;
import javax.xml.soap.MimeHeaders;
@@ -73,13 +76,13 @@ public class SOAPMessageImpl extends SOA
String contentType = null;
String tmpContentType = "";
if (mimeHeaders != null) {
-String contentTypes[] =
mimeHeaders.getHeader(HTTPConstants.CONTENT_TYPE);
+String contentTypes[] =
mimeHeaders.getHeader(HTTPConstants.HEADER_CONTENT_TYPE);
if (contentTypes != null && contentTypes.length > 0) {
tmpContentType = contentTypes[0];
contentType = SAAJUtil.normalizeContentType(tmpContentType);
}
}
-if ("multipart/related".equals(contentType)) {
+if (HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED.equals(contentType)) {
try {
Attachments attachments =
new Attachments(inputstream, tmpContentType, false,
"", "");
@@ -88,7 +91,7 @@ public class SOAPMessageImpl extends SOA
// parts of the SOAP message package. We need to reconstruct
them from
// the available information.
MimeHeaders soapPartHeaders = new MimeHeaders();
-soapPartHeaders.addHeader(HTTPConstants.CONTENT_TYPE,
+soapPartHeaders.addHeader(HTTPConstants.HEADER_CONTENT_TYPE,
attachments.getSOAPPartContentType());
String soapPartContentId = attachments.getSOAPPartContentID();
soapPartHeaders.addHeader("Content-ID", "<" +
soapPartContentId + ">");
@@ -164,6 +167,7 @@ public class SOAPMessageImpl extends SOA
*/
public void removeAllAttachments() {
attachmentParts.clear();
+saveRequired = true;
}
/**
@@ -223,7 +227,8 @@ public class SOAPMessageImpl extends SOA
public void addAttachmentPart(AttachmentPart attachmentPart) {
if (attachmentPart != null) {
attachmentParts.add(attachmentPart);
-mimeHeaders.setHeader(HTTPConstants.CONTENT_TYPE,
"multipart/related");
+mimeHeaders.setHeader(HTTPConstants.HEADER_CONTENT_TYPE,
"multipart/related");
+saveRequired = true;
}
}
@@ -267,8 +272,70 @@ public class SOAPMessageImpl extends SOA
* @throws SOAPException if there was a problem saving changes to this
message.
*/
public void saveChanges() throws SOAPException {
+try {
+String contentTypeValue =
getSingleHeaderValue(HTTPConstants.HEADER_CONTENT_TYPE);
+ContentType contentType = null;
+if (isEmptyString(contentTypeValue)) {
+if (attachmentParts.size() > 0) {
+contentTypeValue =
HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED;
+} else {
+contentTypeValue = getBaseType();
+}
+}
+contentType = new ContentType(contentTypeValue);
+
+//Use configures the baseType with multipart/related while no
attachment exists or all the attachments are removed
+
if(contentType.getBaseType().equals(HTTPConstants.MEDIA_TYPE_MULTIPART_RELATED)
&& attachmentParts.size() == 0) {
+contentType = new ContentType(getBaseType());
+}
+
+//If it is of
