You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/04/27 21:56:53 UTC
svn commit: r1331561 - in /axis/axis2/java/core/trunk/modules:
adb-codegen/test/org/apache/axis2/schema/
integration/test/org/apache/axis2/swa/
jaxws/src/org/apache/axis2/jaxws/message/impl/
kernel/src/org/apache/axis2/builder/ kernel/src/org/apache/ax...
Author: veithen
Date: Fri Apr 27 19:56:52 2012
New Revision: 1331561
URL: http://svn.apache.org/viewvc?rev=1331561&view=rev
Log:
Eliminated deprecated method usage.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
axis/axis2/java/core/trunk/modules/transport/local/test/org/apache/axis2/transport/local/EchoMessageReceiver.java
Modified: axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java Fri Apr 27 19:56:52 2012
@@ -378,7 +378,7 @@ public abstract class AbstractTestCase e
String contentType = format.getContentTypeForMTOM("text/xml");
Attachments attachments = new Attachments(new ByteArrayInputStream(buffer.toByteArray()), contentType);
assertEquals(countDataHandlers(bean) + 1, attachments.getAllContentIDs().length);
- MTOMStAXSOAPModelBuilder builder = new MTOMStAXSOAPModelBuilder(StAXUtils.createXMLStreamReader(attachments.getSOAPPartInputStream()), attachments);
+ MTOMStAXSOAPModelBuilder builder = new MTOMStAXSOAPModelBuilder(StAXUtils.createXMLStreamReader(attachments.getRootPartInputStream()), attachments);
OMElement bodyElement = builder.getSOAPEnvelope().getBody().getFirstElement();
assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(), cache ? bodyElement.getXMLStreamReader() : bodyElement.getXMLStreamReaderWithoutCaching()));
}
@@ -398,7 +398,7 @@ public abstract class AbstractTestCase e
// System.out.write(buffer.toByteArray());
String contentType = format.getContentTypeForMTOM("text/xml");
Attachments attachments = new Attachments(new ByteArrayInputStream(buffer.toByteArray()), contentType);
- MTOMStAXSOAPModelBuilder builder = new MTOMStAXSOAPModelBuilder(StAXUtils.createXMLStreamReader(attachments.getSOAPPartInputStream()), attachments);
+ MTOMStAXSOAPModelBuilder builder = new MTOMStAXSOAPModelBuilder(StAXUtils.createXMLStreamReader(attachments.getRootPartInputStream()), attachments);
OMElement bodyElement = builder.getSOAPEnvelope().getBody().getFirstElement();
assertBeanEquals(expectedResult, ADBBeanUtil.parse(bean.getClass(), bodyElement.getXMLStreamReaderWithoutCaching()));
}
Modified: axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/swa/EchoSwA.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/swa/EchoSwA.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/swa/EchoSwA.java (original)
+++ axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/swa/EchoSwA.java Fri Apr 27 19:56:52 2012
@@ -62,7 +62,7 @@ public class EchoSwA {
OMElement child = (OMElement)omEle.getFirstOMChild();
MessageContext msgCtx = MessageContext.getCurrentMessageContext();
Attachments attachment = (msgCtx).getAttachmentMap();
- msgCtx.removeAttachment(attachment.getSOAPPartContentID());
+ msgCtx.removeAttachment(attachment.getRootPartContentID());
msgCtx.getOperationContext().getMessageContext(
WSDLConstants.MESSAGE_LABEL_OUT_VALUE).setAttachmentMap(attachment);
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java Fri Apr 27 19:56:52 2012
@@ -382,7 +382,7 @@ public class MessageImpl implements Mess
return null; // Attachments set up programmatically...so there is no SOAPPart
}
try {
- contentID = attachments.getSOAPPartContentID();
+ contentID = attachments.getRootPartContentID();
} catch (RuntimeException e) {
// OM will kindly throw an OMException or NPE if the attachments is set up
// programmatically.
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java Fri Apr 27 19:56:52 2012
@@ -438,7 +438,7 @@ public class BuilderUtil {
XMLStreamReader streamReader;
Attachments attachments = createAttachmentsMap(msgContext, inStream, contentTypeString);
- String charSetEncoding = getCharSetEncoding(attachments.getSOAPPartContentType());
+ String charSetEncoding = getCharSetEncoding(attachments.getRootPartContentType());
if ((charSetEncoding == null)
|| "null".equalsIgnoreCase(charSetEncoding)) {
@@ -447,7 +447,7 @@ public class BuilderUtil {
msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
charSetEncoding);
- streamReader = StAXUtils.createXMLStreamReader(attachments.getSOAPPartInputStream(), charSetEncoding);
+ streamReader = StAXUtils.createXMLStreamReader(attachments.getRootPartInputStream(), charSetEncoding);
// Setting the Attachments map to new SwA API
msgContext.setAttachmentMap(attachments);
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java Fri Apr 27 19:56:52 2012
@@ -39,7 +39,7 @@ public class MIMEBuilder implements Buil
Attachments attachments =
BuilderUtil.createAttachmentsMap(msgContext, inputStream, contentType);
String charSetEncoding =
- BuilderUtil.getCharSetEncoding(attachments.getSOAPPartContentType());
+ BuilderUtil.getCharSetEncoding(attachments.getRootPartContentType());
if ((charSetEncoding == null)
|| "null".equalsIgnoreCase(charSetEncoding)) {
@@ -71,7 +71,7 @@ public class MIMEBuilder implements Buil
type = startInfo;
}
}
- return builder.processDocument(attachments.getSOAPPartInputStream(),
+ return builder.processDocument(attachments.getRootPartInputStream(),
type, msgContext);
}
}
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/unknowncontent/UnknownContentBuilder.java Fri Apr 27 19:56:52 2012
@@ -38,7 +38,7 @@ public class UnknownContentBuilder imple
// using this to figure out whether the received is a MIME message
if (messageContext.isDoingSwA()) {
String rootPartContentID = messageContext.attachments
- .getSOAPPartContentID();
+ .getRootPartContentID();
DataHandler rootPartDataHandler = messageContext.attachments
.getDataHandler(rootPartContentID);
UnknownContentOMDataSource unknownContentDataSource = new UnknownContentOMDataSource(
Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java Fri Apr 27 19:56:52 2012
@@ -212,7 +212,7 @@ public class SOAPConnectionImpl extends
SOAPMessage response = getSOAPMessage(responseMsgCtx.getEnvelope());
Attachments attachments = responseMsgCtx.getAttachmentMap();
for (String contentId : attachments.getAllContentIDs()) {
- if (!contentId.equals(attachments.getSOAPPartContentID())) {
+ if (!contentId.equals(attachments.getRootPartContentID())) {
AttachmentPart ap = response.createAttachmentPart(
attachments.getDataHandler(contentId));
ap.setContentId(contentId);
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=1331561&r1=1331560&r2=1331561&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 Fri Apr 27 19:56:52 2012
@@ -92,11 +92,11 @@ public class SOAPMessageImpl extends SOA
// the available information.
MimeHeaders soapPartHeaders = new MimeHeaders();
soapPartHeaders.addHeader(HTTPConstants.HEADER_CONTENT_TYPE,
- attachments.getSOAPPartContentType());
- String soapPartContentId = attachments.getSOAPPartContentID();
+ attachments.getRootPartContentType());
+ String soapPartContentId = attachments.getRootPartContentID();
soapPartHeaders.addHeader("Content-ID", "<" + soapPartContentId + ">");
- soapPart = new SOAPPartImpl(this, attachments.getSOAPPartInputStream(),
+ soapPart = new SOAPPartImpl(this, attachments.getRootPartInputStream(),
soapPartHeaders, processMTOM ? attachments : null);
for (String contentId : attachments.getAllContentIDs()) {
Modified: axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Fri Apr 27 19:56:52 2012
@@ -116,7 +116,7 @@ public class IntegrationTest extends Ass
Attachments inAttachments = inMessage.getAttachmentMap();
Attachments outAttachments = outMessage.getAttachmentMap();
for (String contentId : inAttachments.getAllContentIDs()) {
- if (!contentId.equals(inAttachments.getSOAPPartContentID())) {
+ if (!contentId.equals(inAttachments.getRootPartContentID())) {
outAttachments.addDataHandler(contentId,
inAttachments.getDataHandler(contentId));
}
Modified: axis/axis2/java/core/trunk/modules/transport/local/test/org/apache/axis2/transport/local/EchoMessageReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/test/org/apache/axis2/transport/local/EchoMessageReceiver.java?rev=1331561&r1=1331560&r2=1331561&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/test/org/apache/axis2/transport/local/EchoMessageReceiver.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/test/org/apache/axis2/transport/local/EchoMessageReceiver.java Fri Apr 27 19:56:52 2012
@@ -32,7 +32,7 @@ public class EchoMessageReceiver extends
Attachments inAttachments = inMessage.getAttachmentMap();
Attachments outAttachments = outMessage.getAttachmentMap();
for (String contentId : inAttachments.getAllContentIDs()) {
- if (!contentId.equals(inAttachments.getSOAPPartContentID())) {
+ if (!contentId.equals(inAttachments.getRootPartContentID())) {
outAttachments.addDataHandler(contentId,
inAttachments.getDataHandler(contentId));
}