dims 02/05/29 07:30:02
Modified: java/samples/security LogHandler.java
java/samples/transport FileReader.java FileSender.java
java/samples/transport/tcp TCPListener.java TCPSender.java
java/src/org/apache/axis Message.java
java/src/org/apache/axis/client Call.java
java/src/org/apache/axis/encoding
DeserializationContextImpl.java
SerializationContextImpl.java
java/src/org/apache/axis/encoding/ser
JAFDataHandlerSerializer.java
java/src/org/apache/axis/handlers LogHandler.java
MD5AttachHandler.java
java/src/org/apache/axis/transport/http AxisServlet.java
HTTPSender.java SimpleAxisServer.java
java/src/org/apache/axis/transport/local LocalResponder.java
LocalSender.java
java/test put.java
java/test/RPCDispatch Service.java TestRPC.java
TestSerializedRPC.java
java/test/concurrency TestApplicationScope.java
java/test/encoding TestAttributes.java TestBeanDeser.java
TestBody.java TestDOM.java TestDeser.java
TestHrefs.java TestOutputter.java
TestRoundTrip.java
java/test/faults FaultDecode.java FaultEncode.java
java/test/md5attach MD5AttachTest.java
java/test/wsdl/qualify Qualify_BindingImpl.java
Qualify_ServiceTestCase.java
Log:
- org.apache.axis.Message now extends javax.xml.soap.SOAPMessage
- org.apache.axis.Message's getSOAPPart return now returns javax.xml.soap.SOAPPart
- added two convenience methods getSOAPPartAsString, getSOAPPartAsBytes to reduce
typecasting.
- renamed old getAttachments to getAttachmentsImpl to prevent clash with method of
same name in javax.xml.soap.SOAPMessage
TODO:
- Cleanup methods and implement the new methods in org.apache.axis.Message
- Should we move org.apache.axis.Message into org.apache.axis.soap.Message?
Revision Changes Path
1.7 +1 -1 xml-axis/java/samples/security/LogHandler.java
Index: LogHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/security/LogHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogHandler.java 20 Feb 2002 18:59:20 -0000 1.6
+++ LogHandler.java 29 May 2002 14:30:00 -0000 1.7
@@ -85,7 +85,7 @@
// verify signed message
- Document doc = inMsg.getSOAPPart().getAsSOAPEnvelope().getAsDocument();
+ Document doc = inMsg.getSOAPEnvelope().getAsDocument();
String BaseURI = "http://xml-security";;
CachedXPathAPI xpathAPI = new CachedXPathAPI();
1.20 +2 -2 xml-axis/java/samples/transport/FileReader.java
Index: FileReader.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/FileReader.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FileReader.java 2 Nov 2001 03:07:40 -0000 1.19
+++ FileReader.java 29 May 2002 14:30:00 -0000 1.20
@@ -96,7 +96,7 @@
int thisNum = nextNum++; // increment early to avoid infinite loops
Message msg = new Message( fis );
- msg.getSOAPPart().getAsBytes();
+ msg.getSOAPPartAsBytes();
fis.close();
file.delete();
@@ -115,7 +115,7 @@
msg.setMessageContext(msgContext);
}
- byte[] buf = (byte[]) msg.getSOAPPart().getAsBytes();
+ byte[] buf = (byte[]) msg.getSOAPPartAsBytes();
FileOutputStream fos = new FileOutputStream( "xml" + thisNum + ".res" );
fos.write( buf );
fos.close();
1.13 +2 -2 xml-axis/java/samples/transport/FileSender.java
Index: FileSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/FileSender.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FileSender.java 10 Jan 2002 20:00:58 -0000 1.12
+++ FileSender.java 29 May 2002 14:30:00 -0000 1.13
@@ -81,7 +81,7 @@
public void invoke(MessageContext msgContext) throws AxisFault {
Message msg = msgContext.getRequestMessage();
- byte[] buf = (byte[]) msg.getSOAPPart().getAsBytes();
+ byte[] buf = (byte[]) msg.getSOAPPartAsBytes();
boolean timedOut = false;
try {
FileOutputStream fos = new FileOutputStream( "xml" + nextNum + ".req" );
@@ -109,7 +109,7 @@
Thread.sleep( 100 ); // let the other side finish writing
FileInputStream fis = new FileInputStream( "xml" + nextNum + ".res" );
msg = new Message( fis );
- msg.getSOAPPart().getAsBytes(); // just flush the buffer
+ msg.getSOAPPartAsBytes(); // just flush the buffer
fis.close();
Thread.sleep( 100 );
(new File("xml" + nextNum + ".res")).delete();
1.18 +2 -2 xml-axis/java/samples/transport/tcp/TCPListener.java
Index: TCPListener.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/tcp/TCPListener.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TCPListener.java 12 Mar 2002 19:04:21 -0000 1.17
+++ TCPListener.java 29 May 2002 14:30:00 -0000 1.18
@@ -270,11 +270,11 @@
response="No data";
} else {
try {
- response = (String) msg.getSOAPPart().getAsString();
+ response = (String) msg.getSOAPPartAsString();
} catch (AxisFault fault) {
msg = new Message(fault);
try {
- response = (String)msg.getSOAPPart().getAsString();
+ response = (String)msg.getSOAPPartAsString();
} catch (AxisFault fault2) {
response = fault2.dumpToString();
}
1.16 +2 -2 xml-axis/java/samples/transport/tcp/TCPSender.java
Index: TCPSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/samples/transport/tcp/TCPSender.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TCPSender.java 27 Feb 2002 13:41:27 -0000 1.15
+++ TCPSender.java 29 May 2002 14:30:00 -0000 1.16
@@ -97,7 +97,7 @@
sock = new Socket( host, port );
log.info( "Created an insecure HTTP connection");
- reqEnv = (String)
msgContext.getRequestMessage().getSOAPPart().getAsString();
+ reqEnv = (String) msgContext.getRequestMessage().getSOAPPartAsString();
//System.out.println("Msg: " + reqEnv);
@@ -129,7 +129,7 @@
log.debug( "\nNo Content-Length" );
log.debug( "\nXML received:" );
log.debug( "-----------------------------------------------");
- log.debug( (String) outMsg.getSOAPPart().getAsString() );
+ log.debug( (String) outMsg.getSOAPPartAsString() );
}
msgContext.setResponseMessage( outMsg );
1.67 +223 -42 xml-axis/java/src/org/apache/axis/Message.java
Index: Message.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/Message.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- Message.java 17 May 2002 19:09:34 -0000 1.66
+++ Message.java 29 May 2002 14:30:00 -0000 1.67
@@ -62,8 +62,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.AttachmentPart;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.io.IOException;
+import java.util.Iterator;
/**
* A complete SOAP (and/or XML-RPC, eventually) message.
@@ -76,29 +82,29 @@
* @author Rob Jellinghaus ([EMAIL PROTECTED])
* @author Doug Davis ([EMAIL PROTECTED])
* @author Glen Daniels ([EMAIL PROTECTED])
- * @author Rick Rineholt
+ * @author Rick Rineholt
*/
-public class Message {
+public class Message extends javax.xml.soap.SOAPMessage {
protected static Log log =
LogFactory.getLog(Message.class.getName());
public static final String REQUEST = "request";
public static final String RESPONSE = "response";
-
+
// MIME parts defined for messages.
public static final String MIME_MULTIPART_RELATED = "multipart/related";
-
+
// NOT SUPPORTED NOW
public static final String MIME_APPLICATION_DIME = "application/dime";
-
- /** Default Attachments Implementation class */
- public static final String
DEFAULT_ATTACHMNET_IMPL="org.apache.axis.attachments.AttachmentsImpl";
- /** Current Attachment implementation */
- private static String mAttachmentsImplClassName=DEFAULT_ATTACHMNET_IMPL;
+ /** Default Attachments Implementation class */
+ public static final String
DEFAULT_ATTACHMNET_IMPL="org.apache.axis.attachments.AttachmentsImpl";
+
+ /** Current Attachment implementation */
+ private static String mAttachmentsImplClassName=DEFAULT_ATTACHMNET_IMPL;
// look at the input stream to find the headers to decide.
- public static final String MIME_UNKNOWN = " ";
+ public static final String MIME_UNKNOWN = " ";
/**
* The messageType indicates whether this is request or response.
@@ -116,14 +122,13 @@
*/
private Attachments mAttachments = null;
- /**
- * Returns name of the class prividing Attachment Implementation
- * @returns class Name
- */
- public static String getAttachmentImplClassName(){
- return mAttachmentsImplClassName;
- }
-
+ /**
+ * Returns name of the class prividing Attachment Implementation
+ * @returns class Name
+ */
+ public static String getAttachmentImplClassName(){
+ return mAttachmentsImplClassName;
+ }
private MessageContext msgContext;
@@ -172,14 +177,14 @@
*
* @param initialContents may be String, byte[], InputStream, SOAPEnvelope,
* or AxisFault.
- * @param bodyInStream is true if initialContents is an InputStream
+ * @param bodyInStream is true if initialContents is an InputStream
* containing just the SOAP body (no SOAP-ENV).
* @param contentType this if the contentType has been already determined.
- * (as in the case of servlets);
+ * (as in the case of servlets);
*/
- public Message(Object initialContents,
- boolean bodyInStream,
- String contentType,
+ public Message(Object initialContents,
+ boolean bodyInStream,
+ String contentType,
String contentLocation) {
setup(initialContents, bodyInStream, contentType, contentLocation);
}
@@ -208,7 +213,7 @@
MessageContext mc= getMessageContext();
if(null != mc){
AxisEngine ae= mc.getAxisEngine();
- if(null != ae){
+ if(null != ae){
attachImpName= (String)ae.getOption(
AxisEngine.PROP_ATTACHMENT_IMPLEMENTATION);
}
@@ -216,16 +221,16 @@
if(null == attachImpName){
attachImpName=AxisEngine.DEFAULT_ATTACHMENT_IMPL;
}
-
+
/**
* Attempt to resolve class name, verify that these are present...
*/
Class.forName("javax.activation.DataHandler");
Class.forName("javax.mail.internet.MimeMultipart");
-
- attachImpl =
+
+ attachImpl =
Class.forName(attachImpName);
-
+
attachmentSupportEnabled = true;
} catch (ClassNotFoundException ex) {
// no support for it, leave mAttachments null.
@@ -246,14 +251,14 @@
private void setup(Object initialContents, boolean bodyInStream,
String contentType, String contentLocation) {
- // Try to construct an AttachmentsImpl object for attachment
+ // Try to construct an AttachmentsImpl object for attachment
// functionality.
// If there is no org.apache.axis.attachments.AttachmentsImpl class,
// it must mean activation.jar is not present and attachments are not
// supported.
if (isAttachmentSupportEnabled()) {
// Construct one, and cast to Attachments.
- // There must be exactly one constructor of AttachmentsImpl, which
+ // There must be exactly one constructor of AttachmentsImpl, which
// must take an org.apache.axis.Message!
Constructor attachImplConstr = attachImpl.getConstructors()[0];
try {
@@ -262,7 +267,7 @@
contentType, contentLocation});
//If it can't support it, it wont have a root part.
- mSOAPPart = (SOAPPart) mAttachments.getRootPart();
+ mSOAPPart = (SOAPPart) mAttachments.getRootPart();
} catch (InvocationTargetException ex) {
log.fatal(JavaUtils.getMessage("invocationTargetException00"),
ex);
@@ -279,13 +284,13 @@
}
// text/xml
- if (null == mSOAPPart) {
+ if (null == mSOAPPart) {
mSOAPPart = new SOAPPart(this, initialContents, bodyInStream);
}
else
mSOAPPart.setMessage(this);
- // The stream was not determined by a more complex type so default to
+ // The stream was not determined by a more complex type so default to
if(mAttachments!=null) mAttachments.setRootPart(mSOAPPart);
}
@@ -297,31 +302,39 @@
* a lot of casts in client code. Refactoring keeps getting
* easier anyhow.
*/
- public SOAPPart getSOAPPart() {
+ public javax.xml.soap.SOAPPart getSOAPPart() {
return mSOAPPart;
}
+ public String getSOAPPartAsString() throws org.apache.axis.AxisFault {
+ return mSOAPPart.getAsString();
+ }
+
+ public byte[] getSOAPPartAsBytes() throws org.apache.axis.AxisFault {
+ return mSOAPPart.getAsBytes();
+ }
+
/**
- * Get this message's SOAPPart as a SOAPEnvelope
+ * Get this message's SOAPPart as a SOAPEnvelope
*/
public SOAPEnvelope getSOAPEnvelope() throws AxisFault {
return mSOAPPart.getAsSOAPEnvelope();
}
-
+
/**
* Get the Attachments of this Message.
* If this returns null, then NO ATTACHMENT SUPPORT EXISTS in this
* configuration of Axis, and no attachment operations may be
* performed.
*/
- public Attachments getAttachments() {
+ public Attachments getAttachmentsImpl() {
return mAttachments;
}
public String getContentType() throws org.apache.axis.AxisFault {
//Force serialization if it hasn't happend it.
//Rick Rineholt fix this later.
- mSOAPPart.getAsBytes();
+ mSOAPPart.getAsBytes();
String ret = "text/xml; charset=utf-8";
if (mAttachments != null && 0 != mAttachments.getAttachmentCount()) {
ret = mAttachments.getContentType();
@@ -331,17 +344,32 @@
//This will have to give way someday to HTTP Chunking but for now kludge.
public int getContentLength() throws org.apache.axis.AxisFault {
- //Force serialization if it hasn't happend it.
+ //Force serialization if it hasn't happend it.
//Rick Rineholt fix this later.
- int ret = mSOAPPart.getAsBytes().length;
+ int ret = mSOAPPart.getAsBytes().length;
if (mAttachments != null && 0 < mAttachments.getAttachmentCount()) {
ret = mAttachments.getContentLength();
}
return ret;
}
-
- public void writeContentToStream(java.io.OutputStream os) {
+ /**
+ * Writes this <CODE>SOAPMessage</CODE> object to the given
+ * output stream. The externalization format is as defined by
+ * the SOAP 1.1 with Attachments specification.
+ *
+ * <P>If there are no attachments, just an XML stream is
+ * written out. For those messages that have attachments,
+ * <CODE>writeTo</CODE> writes a MIME-encoded byte stream.</P>
+ * @param out the <CODE>OutputStream</CODE>
+ * object to which this <CODE>SOAPMessage</CODE> object will
+ * be written
+ * @throws SOAPException if there was a problem in
+ * externalizing this SOAP message
+ * @throws IOException if an I/O error
+ * occurs
+ */
+ public void writeTo(java.io.OutputStream os) throws SOAPException, IOException {
//Do it the old fashion way.
if (mAttachments == null || 0 == mAttachments.getAttachmentCount()) {
try {
@@ -358,4 +386,157 @@
}
}
+ /**
+ * Retrieves a description of this <CODE>SOAPMessage</CODE>
+ * object's content.
+ * @return a <CODE>String</CODE> describing the content of this
+ * message or <CODE>null</CODE> if no description has been
+ * set
+ * @see #setContentDescription(java.lang.String)
setContentDescription(java.lang.String)
+ */
+ public String getContentDescription() {
+ //TODO: Flesh this out.
+ return null;
+ }
+
+ /**
+ * Sets the description of this <CODE>SOAPMessage</CODE>
+ * object's content with the given description.
+ * @param description a <CODE>String</CODE>
+ * describing the content of this message
+ * @see #getContentDescription() getContentDescription()
+ */
+ public void setContentDescription(String description) {
+ //TODO: Flesh this out.
+ }
+
+ /**
+ * Updates this <CODE>SOAPMessage</CODE> object with all the
+ * changes that have been made to it. This method is called
+ * automatically when a message is sent or written to by the
+ * methods <CODE>ProviderConnection.send</CODE>, <CODE>
+ * SOAPConnection.call</CODE>, or <CODE>
+ * SOAPMessage.writeTo</CODE>. However, if changes are made to
+ * a message that was received or to one that has already been
+ * sent, the method <CODE>saveChanges</CODE> needs to be
+ * called explicitly in order to save the changes. The method
+ * <CODE>saveChanges</CODE> also generates any changes that
+ * can be read back (for example, a MessageId in profiles that
+ * support a message id). All MIME headers in a message that
+ * is created for sending purposes are guaranteed to have
+ * valid values only after <CODE>saveChanges</CODE> has been
+ * called.
+ *
+ * <P>In addition, this method marks the point at which the
+ * data from all constituent <CODE>AttachmentPart</CODE>
+ * objects are pulled into the message.</P>
+ * @throws SOAPException if there
+ * was a problem saving changes to this message.
+ */
+ public void saveChanges() throws SOAPException {
+ //TODO: Flesh it out.
+ }
+
+ /**
+ * Indicates whether this <CODE>SOAPMessage</CODE> object
+ * has had the method <CODE>saveChanges</CODE> called on
+ * it.
+ * @return <CODE>true</CODE> if <CODE>saveChanges</CODE> has
+ * been called on this message at least once; <CODE>
+ * false</CODE> otherwise.
+ */
+ public boolean saveRequired() {
+ //TODO: Flesh it out.
+ return false;
+ }
+
+ /**
+ * Returns all the transport-specific MIME headers for this
+ * <CODE>SOAPMessage</CODE> object in a transport-independent
+ * fashion.
+ * @return a <CODE>MimeHeaders</CODE> object containing the
+ * <CODE>MimeHeader</CODE> objects
+ */
+ public MimeHeaders getMimeHeaders() {
+ //TODO: Flesh it out.
+ return null;
+ }
+
+ /**
+ * Removes all <CODE>AttachmentPart</CODE> objects that have
+ * been added to this <CODE>SOAPMessage</CODE> object.
+ *
+ * <P>This method does not touch the SOAP part.</P>
+ */
+ public void removeAllAttachments(){
+ //TODO: Flesh it out.
+ }
+
+ /**
+ * Gets a count of the number of attachments in this
+ * message. This count does not include the SOAP part.
+ * @return the number of <CODE>AttachmentPart</CODE> objects
+ * that are part of this <CODE>SOAPMessage</CODE>
+ * object
+ */
+ public int countAttachments(){
+ //TODO: Flesh it out.
+ return -1;
+ }
+
+ /**
+ * Retrieves all the <CODE>AttachmentPart</CODE> objects
+ * that are part of this <CODE>SOAPMessage</CODE> object.
+ * @return an iterator over all the attachments in this
+ * message
+ */
+ public Iterator getAttachments(){
+ //TODO: Flesh it out.
+ return null;
+ }
+
+ /**
+ * Retrieves all the <CODE>AttachmentPart</CODE> objects
+ * that have header entries that match the specified headers.
+ * Note that a returned attachment could have headers in
+ * addition to those specified.
+ * @param headers a <CODE>MimeHeaders</CODE>
+ * object containing the MIME headers for which to
+ * search
+ * @return an iterator over all attachments that have a header
+ * that matches one of the given headers
+ */
+ public Iterator getAttachments(MimeHeaders headers){
+ //TODO: Flesh it out.
+ return null;
+ }
+
+ /**
+ * Adds the given <CODE>AttachmentPart</CODE> object to this
+ * <CODE>SOAPMessage</CODE> object. An <CODE>
+ * AttachmentPart</CODE> object must be created before it can be
+ * added to a message.
+ * @param attachmentpart an <CODE>
+ * AttachmentPart</CODE> object that is to become part of
+ * this <CODE>SOAPMessage</CODE> object
+ * @throws java.lang.IllegalArgumentException
+ */
+ public void addAttachmentPart(AttachmentPart attachmentpart){
+ //TODO: Flesh it out.
+ }
+
+ /**
+ * Creates a new empty <CODE>AttachmentPart</CODE> object.
+ * Note that the method <CODE>addAttachmentPart</CODE> must be
+ * called with this new <CODE>AttachmentPart</CODE> object as
+ * the parameter in order for it to become an attachment to this
+ * <CODE>SOAPMessage</CODE> object.
+ * @return a new <CODE>AttachmentPart</CODE> object that can be
+ * populated and added to this <CODE>SOAPMessage</CODE>
+ * object
+ */
+ public AttachmentPart createAttachmentPart() {
+ //TODO: Flesh it out.
+ return null;
+ }
}
1.124 +2 -3 xml-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- Call.java 23 May 2002 19:57:54 -0000 1.123
+++ Call.java 29 May 2002 14:30:00 -0000 1.124
@@ -1422,7 +1422,7 @@
if(null != attachmentParts && !attachmentParts.isEmpty()){
try{
- org.apache.axis.attachments.Attachments attachments=
msg.getAttachments();
+ org.apache.axis.attachments.Attachments attachments=
msg.getAttachmentsImpl();
if(null == attachments) {
throw new RuntimeException(
JavaUtils.getMessage("noAttachments"));
@@ -1914,8 +1914,7 @@
*/
resMsg.setMessageType(Message.RESPONSE);
- SOAPEnvelope resEnv = (SOAPEnvelope)resMsg.getSOAPPart().
- getAsSOAPEnvelope();
+ SOAPEnvelope resEnv = (SOAPEnvelope)resMsg.getSOAPEnvelope();
SOAPBodyElement respBody = resEnv.getFirstBody();
if (respBody instanceof SOAPFaultElement) {
1.30 +1 -1
xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java
Index: DeserializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContextImpl.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DeserializationContextImpl.java 24 May 2002 18:20:42 -0000 1.29
+++ DeserializationContextImpl.java 29 May 2002 14:30:01 -0000 1.30
@@ -506,7 +506,7 @@
Message msg= null;
if(null != (msg=msgContext.getCurrentMessage())){
Attachments attch= null;
- if( null != (attch= msg.getAttachments())){
+ if( null != (attch= msg.getAttachmentsImpl())){
try{
ret= attch.getAttachmentByReference(href);
}catch(AxisFault e){
1.27 +1 -1
xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java
Index: SerializationContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/SerializationContextImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SerializationContextImpl.java 24 May 2002 12:53:17 -0000 1.26
+++ SerializationContextImpl.java 29 May 2002 14:30:01 -0000 1.27
@@ -566,7 +566,7 @@
Message msg= getCurrentMessage();
if(null != msg){
//Get attachments. returns null if no attachment support.
- Attachments attachments= getCurrentMessage().getAttachments();
+ Attachments attachments= getCurrentMessage().getAttachmentsImpl();
if( null != attachments && attachments.isAttachment(value)){
//Attachment support and this is an object that should be treated
as an attachment.
1.7 +1 -1
xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
Index: JAFDataHandlerSerializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JAFDataHandlerSerializer.java 24 May 2002 18:20:42 -0000 1.6
+++ JAFDataHandlerSerializer.java 29 May 2002 14:30:01 -0000 1.7
@@ -108,7 +108,7 @@
{
DataHandler dh= (DataHandler)value;
//Add the attachment content to the message.
- Attachments attachments= context.getCurrentMessage().getAttachments();
+ Attachments attachments= context.getCurrentMessage().getAttachmentsImpl();
Part attachmentPart= attachments.createAttachmentPart(dh);
String href= attachmentPart.getContentId();
1.28 +2 -2 xml-axis/java/src/org/apache/axis/handlers/LogHandler.java
Index: LogHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/LogHandler.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- LogHandler.java 9 May 2002 18:25:17 -0000 1.27
+++ LogHandler.java 29 May 2002 14:30:01 -0000 1.28
@@ -93,9 +93,9 @@
pw.println( "= " + JavaUtils.getMessage("elapsed00",
"" + (System.currentTimeMillis() - start)));
pw.println( "= " + JavaUtils.getMessage("inMsg00",
- (inMsg == null ? "null" :
inMsg.getSOAPPart().getAsString())));
+ (inMsg == null ? "null" : inMsg.getSOAPPartAsString())));
pw.println( "= " + JavaUtils.getMessage("outMsg00",
- (outMsg == null ? "null" :
outMsg.getSOAPPart().getAsString())));
+ (outMsg == null ? "null" : outMsg.getSOAPPartAsString())));
pw.println(
"=======================================================" );
pw.close();
1.11 +2 -3 xml-axis/java/src/org/apache/axis/handlers/MD5AttachHandler.java
Index: MD5AttachHandler.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/MD5AttachHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MD5AttachHandler.java 29 May 2002 13:05:54 -0000 1.10
+++ MD5AttachHandler.java 29 May 2002 14:30:01 -0000 1.11
@@ -81,8 +81,7 @@
try {
// log.debug("IN MD5");
Message msg = msgContext.getRequestMessage();
- org.apache.axis.SOAPPart soapPart = (org.apache.axis.SOAPPart)
msg.getSOAPPart();
- org.apache.axis.message.SOAPEnvelope env =
(org.apache.axis.message.SOAPEnvelope) soapPart.getAsSOAPEnvelope();
+ org.apache.axis.message.SOAPEnvelope env =
(org.apache.axis.message.SOAPEnvelope) msg.getSOAPEnvelope();
org.apache.axis.message.SOAPBodyElement sbe =
env.getFirstBody();//env.getBodyByName("ns1", "addedfile");
org.w3c.dom.Element sbElement = sbe.getAsDOM();
//get the first level accessor ie parameter
@@ -92,7 +91,7 @@
org.w3c.dom.Element paramElement = (org.w3c.dom.Element) n;
//Get the href associated with the attachment.
String href =
paramElement.getAttribute(org.apache.axis.Constants.ATTR_HREF);
- org.apache.axis.Part ap =
msg.getAttachments().getAttachmentByReference(href);
+ org.apache.axis.Part ap =
msg.getAttachmentsImpl().getAttachmentByReference(href);
javax.activation.DataHandler dh =
org.apache.axis.attachments.AttachmentUtils.getActivationDataHandler(ap);
org.w3c.dom.Node timeNode = paramElement.getFirstChild();
long startTime = -1;
1.103 +12 -3
xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
Index: AxisServlet.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- AxisServlet.java 17 May 2002 18:19:39 -0000 1.102
+++ AxisServlet.java 29 May 2002 14:30:01 -0000 1.103
@@ -82,6 +82,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpUtils;
+import javax.xml.soap.SOAPException;
import java.io.File;
import java.io.ByteArrayInputStream;
@@ -416,7 +417,7 @@
writer.println("<p>" +
JavaUtils.getMessage("gotResponse00") +
"</p>");
- writer.println(respMsg.getSOAPPart().getAsString());
+ writer.println(respMsg.getSOAPPartAsString());
} else {
writer.println("<p>" +
JavaUtils.getMessage("noResponse01") +
"</p>");
@@ -481,7 +482,11 @@
Message msg = new Message(fault);
res.setContentType( msg.getContentType() );
res.setContentLength( msg.getContentLength() );
- msg.writeContentToStream(res.getOutputStream());
+ try {
+ msg.writeTo(res.getOutputStream());
+ } catch (SOAPException e){
+ log.error(JavaUtils.getMessage("exception00"), e);
+ }
return;
}
}
@@ -669,7 +674,11 @@
res.setContentType( msg.getContentType() );
res.setContentLength(respContentlength= msg.getContentLength() );
if(isDebug) log.debug("Returned Content-Length:" + respContentlength);
- msg.writeContentToStream(res.getOutputStream());
+ try {
+ msg.writeTo(res.getOutputStream());
+ } catch (SOAPException e){
+ log.error(JavaUtils.getMessage("exception00"), e);
+ }
}
if(!res.isCommitted()) {
res.flushBuffer(); //Force it right now.
1.62 +7 -2 xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java
Index: HTTPSender.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- HTTPSender.java 28 May 2002 23:34:10 -0000 1.61
+++ HTTPSender.java 29 May 2002 14:30:01 -0000 1.62
@@ -63,6 +63,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.xml.soap.SOAPException;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
@@ -528,7 +529,11 @@
header.append("\r\n");
out.write(header.toString()
.getBytes(HTTPConstants.HEADER_DEFAULT_CHAR_ENCODING));
- reqMessage.writeContentToStream(out);
+ try {
+ reqMessage.writeTo(out);
+ } catch (SOAPException e){
+ log.error(JavaUtils.getMessage("exception00"), e);
+ }
out.flush();
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("xmlSent00"));
@@ -695,7 +700,7 @@
}
log.debug("\n" + JavaUtils.getMessage("xmlRecd00"));
log.debug("-----------------------------------------------");
- log.debug((String) outMsg.getSOAPPart().getAsString());
+ log.debug((String) outMsg.getSOAPPartAsString());
}
}
1.58 +3 -5
xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java
Index: SimpleAxisServer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- SimpleAxisServer.java 17 May 2002 19:09:35 -0000 1.57
+++ SimpleAxisServer.java 29 May 2002 14:30:01 -0000 1.58
@@ -421,9 +421,7 @@
responseMsg = new Message(af);
} else {
try {
- SOAPEnvelope env = responseMsg.
- getSOAPPart().
- getAsSOAPEnvelope();
+ SOAPEnvelope env = responseMsg.getSOAPEnvelope();
env.clearBody();
env.addBodyElement(new SOAPFaultElement((AxisFault)e));
} catch (AxisFault fault) {
@@ -432,7 +430,7 @@
}
}
-// byte[] response = (byte[]) responseMsg.getSOAPPart().getAsBytes();
+// byte[] response = (byte[]) responseMsg.getSOAPPartAsBytes();
// Send it on its way...
OutputStream out = socket.getOutputStream();
@@ -457,7 +455,7 @@
}
out.write(SEPARATOR);
- responseMsg.writeContentToStream(out);
+ responseMsg.writeTo(out);
// out.write(response);
out.flush();
1.15 +1 -1
xml-axis/java/src/org/apache/axis/transport/local/LocalResponder.java
Index: LocalResponder.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/local/LocalResponder.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LocalResponder.java 9 May 2002 18:28:57 -0000 1.14
+++ LocalResponder.java 29 May 2002 14:30:01 -0000 1.15
@@ -77,7 +77,7 @@
log.debug("Enter: LocalResponder::invoke");
}
- msgContext.getResponseMessage().getSOAPPart().getAsString();
+ msgContext.getResponseMessage().getSOAPPartAsString();
if (log.isDebugEnabled()) {
log.debug("Exit: LocalResponder::invoke");
1.31 +1 -1
xml-axis/java/src/org/apache/axis/transport/local/LocalSender.java
Index: LocalSender.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/transport/local/LocalSender.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- LocalSender.java 9 May 2002 18:28:57 -0000 1.30
+++ LocalSender.java 29 May 2002 14:30:01 -0000 1.31
@@ -112,7 +112,7 @@
// copy the request, and force its format to String in order to
// exercise the serializers.
- String msgStr =
clientContext.getRequestMessage().getSOAPPart().getAsString();
+ String msgStr = clientContext.getRequestMessage().getSOAPPartAsString();
if (log.isDebugEnabled()) {
log.debug(JavaUtils.getMessage("sendingXML00", "LocalSender"));
1.10 +1 -1 xml-axis/java/test/put.java
Index: put.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/put.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- put.java 8 Feb 2002 22:14:12 -0000 1.9
+++ put.java 29 May 2002 14:30:01 -0000 1.10
@@ -37,7 +37,7 @@
call.invoke();
-
System.out.println(call.getResponseMessage().getSOAPPart().getAsString());
+ System.out.println(call.getResponseMessage().getSOAPPartAsString());
}
}
}
1.12 +1 -1 xml-axis/java/test/RPCDispatch/Service.java
Index: Service.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/RPCDispatch/Service.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Service.java 22 Mar 2002 16:08:32 -0000 1.11
+++ Service.java 29 May 2002 14:30:01 -0000 1.12
@@ -55,7 +55,7 @@
// get the first parameter
Message message = MessageContext.getCurrentContext().getRequestMessage();
- RPCElement body =
(RPCElement)message.getSOAPPart().getAsSOAPEnvelope().getFirstBody();
+ RPCElement body = (RPCElement)message.getSOAPEnvelope().getFirstBody();
NodeList parms = body.getAsDOM().getChildNodes();
Node parm1 = null;
for (int i=0; i<parms.getLength(); i++) {
1.37 +1 -1 xml-axis/java/test/RPCDispatch/TestRPC.java
Index: TestRPC.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/RPCDispatch/TestRPC.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- TestRPC.java 12 Apr 2002 09:46:36 -0000 1.36
+++ TestRPC.java 29 May 2002 14:30:01 -0000 1.37
@@ -82,7 +82,7 @@
// Extract the response Envelope
Message message = msgContext.getResponseMessage();
- envelope = (SOAPEnvelope)message.getSOAPPart().getAsSOAPEnvelope();
+ envelope = (SOAPEnvelope)message.getSOAPEnvelope();
assertNotNull("SOAP envelope was null", envelope);
// Extract the body from the envelope
1.32 +1 -1 xml-axis/java/test/RPCDispatch/TestSerializedRPC.java
Index: TestSerializedRPC.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/RPCDispatch/TestSerializedRPC.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TestSerializedRPC.java 27 Mar 2002 17:53:07 -0000 1.31
+++ TestSerializedRPC.java 29 May 2002 14:30:01 -0000 1.32
@@ -131,7 +131,7 @@
// Extract the response Envelope
Message message = msgContext.getResponseMessage();
assertNotNull("Response message was null!", message);
- SOAPEnvelope envelope =
(SOAPEnvelope)message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope = (SOAPEnvelope)message.getSOAPEnvelope();
assertNotNull("SOAP envelope was null", envelope);
// Extract the body from the envelope
1.4 +2 -2 xml-axis/java/test/concurrency/TestApplicationScope.java
Index: TestApplicationScope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/concurrency/TestApplicationScope.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestApplicationScope.java 1 May 2002 20:54:04 -0000 1.3
+++ TestApplicationScope.java 29 May 2002 14:30:01 -0000 1.4
@@ -122,9 +122,9 @@
String ret = (String)call.invoke("hello", null);
if (ret == null) {
MessageContext msgContext = call.getMessageContext();
- String respStr =
msgContext.getResponseMessage().getSOAPPart().getAsString();
+ String respStr =
msgContext.getResponseMessage().getSOAPPartAsString();
- String reqStr =
msgContext.getRequestMessage().getSOAPPart().getAsString();
+ String reqStr =
msgContext.getRequestMessage().getSOAPPartAsString();
String nullStr = "Got null response! Request message:\r\n"
+ reqStr + "\r\n\r\n" +
"Response message:\r\n" + respStr;
log.fatal(nullStr);
1.8 +2 -2 xml-axis/java/test/encoding/TestAttributes.java
Index: TestAttributes.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestAttributes.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestAttributes.java 13 May 2002 13:11:34 -0000 1.7
+++ TestAttributes.java 29 May 2002 14:30:02 -0000 1.8
@@ -95,7 +95,7 @@
Message message = new Message(msgString);
message.setMessageContext(msgContext);
- SOAPEnvelope env = message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope env = message.getSOAPEnvelope();
RPCElement rpcEl = (RPCElement)env.getFirstBody();
Vector params = rpcEl.getParams();
assertEquals("Wrong # of params in deserialized message!",
@@ -147,7 +147,7 @@
Message message = new Message(msgString);
message.setMessageContext(msgContext);
- SOAPEnvelope env = message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope env = message.getSOAPEnvelope();
RPCElement rpcEl = (RPCElement)env.getFirstBody();
Vector params = rpcEl.getParams();
assertEquals("Wrong # of params in deserialized message!",
1.4 +1 -1 xml-axis/java/test/encoding/TestBeanDeser.java
Index: TestBeanDeser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestBeanDeser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestBeanDeser.java 13 May 2002 13:11:34 -0000 1.3
+++ TestBeanDeser.java 29 May 2002 14:30:02 -0000 1.4
@@ -88,7 +88,7 @@
Message message = new Message(header + data + footer);
message.setMessageContext(new MessageContext(server));
- SOAPEnvelope envelope = (SOAPEnvelope)
message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope = (SOAPEnvelope) message.getSOAPEnvelope();
assertNotNull("SOAP envelope should not be null", envelope);
RPCElement body = (RPCElement) envelope.getFirstBody();
1.11 +1 -1 xml-axis/java/test/encoding/TestBody.java
Index: TestBody.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestBody.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestBody.java 20 Feb 2002 18:59:22 -0000 1.10
+++ TestBody.java 29 May 2002 14:30:02 -0000 1.11
@@ -45,7 +45,7 @@
message.setMessageContext(msgContext);
// ensure that the message is parsed
- SOAPEnvelope envelope = message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope = message.getSOAPEnvelope();
RPCElement body = (RPCElement) envelope.getFirstBody();
// This is not necessarily true anymore...
1.11 +2 -2 xml-axis/java/test/encoding/TestDOM.java
Index: TestDOM.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDOM.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TestDOM.java 24 May 2002 18:20:44 -0000 1.10
+++ TestDOM.java 29 May 2002 14:30:02 -0000 1.11
@@ -58,9 +58,9 @@
message.setMessageContext(msgContext);
// Now completely round trip it
- SOAPEnvelope envelope = message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope = message.getSOAPEnvelope();
// Element dom = message.getAsDOM();
- String result = message.getSOAPPart().getAsString();
+ String result = message.getSOAPPartAsString();
assertEquals("Request is not the same as the result.", request, result);
}
1.34 +1 -1 xml-axis/java/test/encoding/TestDeser.java
Index: TestDeser.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestDeser.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TestDeser.java 24 May 2002 18:20:44 -0000 1.33
+++ TestDeser.java 29 May 2002 14:30:02 -0000 1.34
@@ -146,7 +146,7 @@
Message message = new Message(header + data + footer);
message.setMessageContext(new MessageContext(server));
- SOAPEnvelope envelope =
(SOAPEnvelope)message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope = (SOAPEnvelope)message.getSOAPEnvelope();
assertNotNull("SOAP envelope should not be null", envelope);
RPCElement body = (RPCElement)envelope.getFirstBody();
1.17 +1 -1 xml-axis/java/test/encoding/TestHrefs.java
Index: TestHrefs.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestHrefs.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TestHrefs.java 24 May 2002 18:20:44 -0000 1.16
+++ TestHrefs.java 29 May 2002 14:30:02 -0000 1.17
@@ -62,7 +62,7 @@
Message message = new Message(msgString);
message.setMessageContext(new MessageContext(new AxisServer()));
- SOAPEnvelope envelope =
(SOAPEnvelope)message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope = (SOAPEnvelope)message.getSOAPEnvelope();
assertNotNull("SOAP envelope should not be null", envelope);
RPCElement body = (RPCElement)envelope.getFirstBody();
1.2 +2 -2 xml-axis/java/test/encoding/TestOutputter.java
Index: TestOutputter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestOutputter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestOutputter.java 1 Dec 2001 03:39:49 -0000 1.1
+++ TestOutputter.java 29 May 2002 14:30:02 -0000 1.2
@@ -51,9 +51,9 @@
Message message = new Message(header + data + footer);
message.setMessageContext(new MessageContext(server));
- message.getSOAPPart().getAsSOAPEnvelope();
+ message.getSOAPEnvelope();
- assertEquals(header+data+footer, message.getSOAPPart().getAsString());
+ assertEquals(header+data+footer, message.getSOAPPartAsString());
}
public void testString() throws Exception {
1.3 +3 -3 xml-axis/java/test/encoding/TestRoundTrip.java
Index: TestRoundTrip.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/encoding/TestRoundTrip.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestRoundTrip.java 13 May 2002 13:11:34 -0000 1.2
+++ TestRoundTrip.java 29 May 2002 14:30:02 -0000 1.3
@@ -86,16 +86,16 @@
Message message = new Message(xml1);
message.setMessageContext(new MessageContext(server));
- SOAPEnvelope envelope = (SOAPEnvelope)
message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope = (SOAPEnvelope) message.getSOAPEnvelope();
RPCElement body = (RPCElement) envelope.getFirstBody();
Vector arglist = body.getParams();
Object ret1 = ((RPCParam) arglist.get(0)).getValue();
- String xml2 = message.getSOAPPart().getAsString();
+ String xml2 = message.getSOAPPartAsString();
Message message2 = new Message(xml2);
message2.setMessageContext(new MessageContext(server));
- SOAPEnvelope envelope2 = (SOAPEnvelope)
message2.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope2 = (SOAPEnvelope) message2.getSOAPEnvelope();
RPCElement body2 = (RPCElement) envelope2.getFirstBody();
Vector arglist2 = body2.getParams();
Object ret2 = ((RPCParam) arglist2.get(0)).getValue();
1.10 +1 -1 xml-axis/java/test/faults/FaultDecode.java
Index: FaultDecode.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/faults/FaultDecode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FaultDecode.java 2 Apr 2002 22:05:19 -0000 1.9
+++ FaultDecode.java 29 May 2002 14:30:02 -0000 1.10
@@ -109,7 +109,7 @@
Message message = new Message(messageText);
message.setMessageContext(new MessageContext(server));
- SOAPEnvelope envelope = (SOAPEnvelope)
message.getSOAPPart().getAsSOAPEnvelope();
+ SOAPEnvelope envelope = (SOAPEnvelope) message.getSOAPEnvelope();
assertNotNull("envelope", envelope);
SOAPBodyElement respBody = envelope.getFirstBody();
1.4 +1 -1 xml-axis/java/test/faults/FaultEncode.java
Index: FaultEncode.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/faults/FaultEncode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FaultEncode.java 2 Apr 2002 22:05:19 -0000 1.3
+++ FaultEncode.java 29 May 2002 14:30:02 -0000 1.4
@@ -90,7 +90,7 @@
Message message = new Message(fault);
message.setMessageContext(new MessageContext(server));
- String data = message.getSOAPPart().getAsString();
+ String data = message.getSOAPPartAsString();
assertTrue("Fault code not encoded correctly",
data.indexOf("<code>")>=0);
assertTrue("Fault string not encoded correctly",
1.4 +3 -3 xml-axis/java/test/md5attach/MD5AttachTest.java
Index: MD5AttachTest.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/md5attach/MD5AttachTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MD5AttachTest.java 15 Feb 2002 21:25:27 -0000 1.3
+++ MD5AttachTest.java 29 May 2002 14:30:02 -0000 1.4
@@ -52,7 +52,7 @@
org.apache.axis.Message msg = new org.apache.axis.Message(env);
//Add the attachment content to the message.
- org.apache.axis.attachments.Attachments attachments = msg.getAttachments();
+ org.apache.axis.attachments.Attachments attachments =
msg.getAttachmentsImpl();
org.apache.axis.Part attachmentPart = attachments.createAttachmentPart(dh);
String href = attachmentPart.getContentId();
//Have the parameter element set an href attribute to the attachment.
@@ -60,7 +60,7 @@
env.clearBody();
env.addBodyElement(sbe);
- msg.getSOAPPart().setSOAPEnvelope(env);
+ ((org.apache.axis.SOAPPart)msg.getSOAPPart()).setSOAPEnvelope(env);
call.setRequestMessage(msg);
//go on now....
@@ -69,7 +69,7 @@
MessageContext mc = call.getMessageContext();
// System.out.println(mc.getResponseMessage().getAsString());
- env = mc.getResponseMessage().getSOAPPart().getAsSOAPEnvelope();
+ env = mc.getResponseMessage().getSOAPEnvelope();
sbe = env.getFirstBody();
org.w3c.dom.Element sbElement = sbe.getAsDOM();
//get the first level accessor ie parameter
1.3 +4 -4 xml-axis/java/test/wsdl/qualify/Qualify_BindingImpl.java
Index: Qualify_BindingImpl.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify/Qualify_BindingImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Qualify_BindingImpl.java 9 May 2002 20:17:57 -0000 1.2
+++ Qualify_BindingImpl.java 29 May 2002 14:30:02 -0000 1.3
@@ -82,8 +82,8 @@
// or not per the WSDL
MessageContext mc = MessageContext.getCurrentContext();
Message request = mc.getRequestMessage();
- SOAPEnvelope env = request.getSOAPPart().getAsSOAPEnvelope();
- String requestString = request.getSOAPPart().getAsString();
+ SOAPEnvelope env = request.getSOAPEnvelope();
+ String requestString = request.getSOAPPartAsString();
Element body;
try {
@@ -124,8 +124,8 @@
// or not per the WSDL
MessageContext mc = MessageContext.getCurrentContext();
Message request = mc.getRequestMessage();
- SOAPEnvelope env = request.getSOAPPart().getAsSOAPEnvelope();
- String requestString = request.getSOAPPart().getAsString();
+ SOAPEnvelope env = request.getSOAPEnvelope();
+ String requestString = request.getSOAPPartAsString();
Element body;
try {
1.3 +4 -4 xml-axis/java/test/wsdl/qualify/Qualify_ServiceTestCase.java
Index: Qualify_ServiceTestCase.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/wsdl/qualify/Qualify_ServiceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Qualify_ServiceTestCase.java 9 May 2002 20:17:57 -0000 1.2
+++ Qualify_ServiceTestCase.java 29 May 2002 14:30:02 -0000 1.3
@@ -110,8 +110,8 @@
throw new AssertionFailedError("Unable to get call object from
service");
}
Message response = mc.getResponseMessage();
- SOAPEnvelope env = response.getSOAPPart().getAsSOAPEnvelope();
- String responseString = response.getSOAPPart().getAsString();
+ SOAPEnvelope env = response.getSOAPEnvelope();
+ String responseString = response.getSOAPPartAsString();
Element body;
try {
@@ -172,8 +172,8 @@
throw new AssertionFailedError("Unable to get call object from
service");
}
Message response = mc.getResponseMessage();
- SOAPEnvelope env = response.getSOAPPart().getAsSOAPEnvelope();
- String responseString = response.getSOAPPart().getAsString();
+ SOAPEnvelope env = response.getSOAPEnvelope();
+ String responseString = response.getSOAPPartAsString();
Element body;
try {
