You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ga...@apache.org on 2007/03/13 20:50:20 UTC
svn commit: r517832 - in /webservices/axis/branches/AXIS_1_4_SAAJ_1_3: lib/
lib/endorsed/ src/javax/xml/soap/ src/org/apache/axis/
src/org/apache/axis/attachments/ src/org/apache/axis/message/
src/org/apache/axis/soap/
Author: gawor
Date: Tue Mar 13 12:50:18 2007
New Revision: 517832
URL: http://svn.apache.org/viewvc?view=rev&rev=517832
Log:
just an experiment. defined saaj 1.3 methods, using axis2 saaj api
Added:
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar (with props)
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java
Removed:
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xercesImpl-2.6.2.LICENSE
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xercesImpl-2.6.2.jar
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xml-apis-2.6.2.LICENSE
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xml-apis-2.6.2.jar
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/javax/xml/soap/
Modified:
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java
webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java
Added: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar?view=auto&rev=517832
==============================================================================
Binary file - no diff available.
Propchange: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java Tue Mar 13 12:50:18 2007
@@ -18,8 +18,8 @@
import org.apache.axis.attachments.Attachments;
import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.MimeHeaders;
+import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.soap.SOAPConstants;
import org.apache.axis.transport.http.HTTPConstants;
import org.apache.axis.utils.ClassUtils;
@@ -28,6 +28,7 @@
import org.apache.commons.logging.Log;
import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPHeader;
@@ -759,4 +760,15 @@
mAttachments.dispose();
}
}
+
+ // SAAJ 1.3 API
+
+ public AttachmentPart getAttachment(SOAPElement element) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public void removeAttachments(javax.xml.soap.MimeHeaders headers) {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java Tue Mar 13 12:50:18 2007
@@ -34,6 +34,7 @@
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
+import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
@@ -46,9 +47,11 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
+import org.w3c.dom.UserDataHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
@@ -1279,6 +1282,126 @@
public boolean isBodyStream() {
return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM);
+ }
+
+ // DOM 3 API
+
+ public String getDocumentURI() {
+ return document.getDocumentURI();
+ }
+
+ public DOMConfiguration getDomConfig() {
+ return document.getDomConfig();
+ }
+
+ public String getInputEncoding() {
+ return document.getInputEncoding();
+ }
+
+ public String getXmlEncoding() {
+ return document.getXmlEncoding();
+ }
+
+ public boolean getXmlStandalone() {
+ return document.getXmlStandalone();
+ }
+
+ public String getXmlVersion() {
+ return document.getXmlVersion();
+ }
+
+ public void normalizeDocument() {
+ document.normalizeDocument();
+ }
+
+ public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
+ return document.renameNode(n, namespaceURI, qualifiedName);
+ }
+
+ public void setDocumentURI(String documentURI) {
+ document.setDocumentURI(documentURI);
+ }
+
+ public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
+ document.setXmlStandalone(xmlStandalone);
+ }
+
+ public void setXmlVersion(String xmlVersion) throws DOMException {
+ document.setXmlVersion(xmlVersion);
+ }
+
+ public short compareDocumentPosition(Node other) throws DOMException {
+ return document.compareDocumentPosition(other);
+ }
+
+ public String getBaseURI() {
+ return document.getBaseURI();
+ }
+
+ public Object getFeature(String feature, String version) {
+ return document.getFeature(feature, version);
+ }
+
+ public String getTextContent() throws DOMException {
+ return document.getTextContent();
+ }
+
+ public Object getUserData(String key) {
+ return document.getUserData(key);
+ }
+
+ public boolean isDefaultNamespace(String namespaceURI) {
+ return document.isDefaultNamespace(namespaceURI);
+ }
+
+ public boolean isEqualNode(Node arg) {
+ return document.isEqualNode(arg);
+ }
+
+ public boolean isSameNode(Node other) {
+ return document.isSameNode(other);
+ }
+
+ public String lookupNamespaceURI(String prefix) {
+ return document.lookupNamespaceURI(prefix);
+ }
+
+ public String lookupPrefix(String namespaceURI) {
+ return document.lookupPrefix(namespaceURI);
+ }
+
+ public void setTextContent(String textContent) throws DOMException {
+ document.setTextContent(textContent);
+ }
+
+ public Object setUserData(String key, Object data, UserDataHandler handler) {
+ return document.setUserData(key, data, handler);
+ }
+
+ // SOAP Node methods (since SOAPPart now implements SOAP Node)
+
+ public void detachNode() {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public SOAPElement getParentElement() {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public String getValue() {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public void recycleNode() {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public void setParentElement(SOAPElement arg0) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public void setValue(String arg0) {
+ throw new UnsupportedOperationException("Not implemented.");
}
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java Tue Mar 13 12:50:18 2007
@@ -18,6 +18,7 @@
import org.apache.axis.Part;
import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.components.image.ImageIOFactory;
+import org.apache.axis.encoding.Base64;
import org.apache.axis.transport.http.HTTPConstants;
import org.apache.axis.utils.Messages;
import org.apache.axis.utils.SessionUtils;
@@ -28,8 +29,10 @@
import javax.xml.soap.SOAPException;
import javax.xml.transform.stream.StreamSource;
import java.util.Iterator;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
/**
@@ -546,4 +549,68 @@
//we get to release memory anyway
datahandler = null;
}
+
+ // SAAJ 1.3 API
+
+ public InputStream getRawContent() throws SOAPException {
+ if (datahandler == null) {
+ throw new SOAPException(Messages.getMessage("noContent"));
+ }
+
+ try {
+ return datahandler.getDataSource().getInputStream();
+ } catch (IOException ex) {
+ throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
+ }
+ }
+
+ public byte[] getRawContentBytes() throws SOAPException {
+ if (datahandler == null) {
+ throw new SOAPException(Messages.getMessage("noContent"));
+ }
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ try {
+ datahandler.writeTo(bout);
+ } catch (IOException ex) {
+ throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
+ }
+ return bout.toByteArray();
+ }
+
+ public InputStream getBase64Content() throws SOAPException {
+ byte[] rawBytes = getRawContentBytes();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ try {
+ Base64.encode(rawBytes, 0, rawBytes.length, out);
+ } catch (IOException ex) {
+ throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
+ }
+ byte[] encodedBytes = out.toByteArray();
+ return new ByteArrayInputStream(encodedBytes);
+ }
+
+ public void setBase64Content(InputStream content, String contentType) throws SOAPException {
+ byte[] buf = new byte[1024];
+ int read = 0;
+ ByteArrayOutputStream encoded = new ByteArrayOutputStream();
+ try {
+ while ((read = content.read(buf, 0, buf.length)) != -1) {
+ encoded.write(buf, 0, read);
+ }
+ } catch (IOException ex) {
+ throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
+ }
+ byte[] rawData = Base64.decode(encoded.toString());
+ setRawContentBytes(rawData, 0, rawData.length, contentType);
+ }
+
+ public void setRawContent(InputStream content, String contentType) throws SOAPException {
+ setContent(content, contentType);
+ }
+
+ public void setRawContentBytes(byte[] content, int offset, int len, String contentType) throws SOAPException {
+ ByteArrayInputStream in = new ByteArrayInputStream(content, offset, len);
+ setContent(in, contentType);
+ }
+
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java Tue Mar 13 12:50:18 2007
@@ -16,6 +16,7 @@
package org.apache.axis.message;
+import javax.xml.namespace.QName;
import javax.xml.soap.DetailEntry;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPException;
@@ -51,5 +52,11 @@
*/
public Iterator getDetailEntries() {
return this.getChildElements();
+ }
+
+ // SAAJ 1.3 API
+
+ public DetailEntry addDetailEntry(QName name) throws SOAPException {
+ return addDetailEntry(new PrefixedQName(name));
}
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java Tue Mar 13 12:50:18 2007
@@ -41,6 +41,7 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.TypeInfo;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -2142,5 +2143,75 @@
doc = new SOAPDocumentImpl(null);
}
return doc;
+ }
+
+ // SAAJ 1.3 API
+
+ public SOAPElement addChildElement(QName qname) throws SOAPException {
+ return addChildElement(new PrefixedQName(qname));
+ }
+
+ public SOAPElement addAttribute(QName qname, String value) throws SOAPException {
+ return addAttribute(new PrefixedQName(qname), value);
+ }
+
+ public String getAttributeValue(QName qname) {
+ return getAttributeValue(new PrefixedQName(qname));
+ }
+
+ public Iterator getAllAttributesAsQNames() {
+ int num = attributes.getLength();
+ Vector attrs = new Vector(num);
+ for (int i = 0; i < num; i++) {
+ String q = attributes.getQName(i);
+ String prefix = "";
+ if (q != null) {
+ int idx = q.indexOf(":");
+ if (idx > 0) {
+ prefix = q.substring(0, idx);
+ } else {
+ prefix= "";
+ }
+ }
+
+ attrs.add(new QName(attributes.getURI(i),
+ attributes.getLocalName(i),
+ prefix));
+ }
+ return attrs.iterator();
+ }
+
+ public QName createQName(String localName, String prefix) throws SOAPException {
+ return new QName(getNamespaceURI(prefix), localName, prefix);
+ }
+
+ public QName getElementQName() {
+ return new QName(getNamespaceURI(), getName(), getPrefix());
+ }
+
+ public SOAPElement setElementQName(QName newName) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public boolean removeAttribute(QName qname) {
+ return removeAttribute(new PrefixedQName(qname));
+ }
+
+ // DOM 3 API
+
+ public TypeInfo getSchemaTypeInfo() {
+ return null;
+ }
+
+ public void setIdAttribute(String name, boolean isId) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
}
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java Tue Mar 13 12:50:18 2007
@@ -30,6 +30,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
+import org.w3c.dom.UserDataHandler;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
@@ -857,4 +858,55 @@
}
this._isDirty = false;
}
+
+ // DOM 1.3 API
+
+ public short compareDocumentPosition(Node other) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getBaseURI() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public Object getFeature(String feature, String version) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getTextContent() throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public Object getUserData(String key) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean isDefaultNamespace(String namespaceURI) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean isEqualNode(Node arg) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean isSameNode(Node other) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String lookupNamespaceURI(String prefix) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String lookupPrefix(String namespaceURI) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void setTextContent(String textContent) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public Object setUserData(String key, Object data, UserDataHandler handler) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java Tue Mar 13 12:50:18 2007
@@ -306,4 +306,22 @@
public void setSAAJEncodingCompliance(boolean comply) {
this.doSAAJEncodingCompliance = true;
}
+
+ // SAAJ 1.3 API
+
+ public javax.xml.soap.SOAPBodyElement addBodyElement(QName name) throws SOAPException {
+ return addBodyElement(new PrefixedQName(name));
+ }
+
+ public javax.xml.soap.SOAPFault addFault(QName name, String s) throws SOAPException {
+ return addFault(new PrefixedQName(name), s);
+ }
+
+ public javax.xml.soap.SOAPFault addFault(QName name, String s, Locale locale) throws SOAPException {
+ return addFault(new PrefixedQName(name), s, locale);
+ }
+
+ public Document extractContentAsDocument() throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java Tue Mar 13 12:50:18 2007
@@ -25,6 +25,7 @@
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
+import org.w3c.dom.DOMConfiguration;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
@@ -36,6 +37,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.UserDataHandler;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.soap.SOAPException;
@@ -679,6 +681,112 @@
}
public boolean hasAttributes() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ // DOM 3 API
+
+ public Node adoptNode(Node source) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getDocumentURI() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public DOMConfiguration getDomConfig() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getInputEncoding() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean getStrictErrorChecking() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getXmlEncoding() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean getXmlStandalone() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getXmlVersion() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void normalizeDocument() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void setDocumentURI(String documentURI) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void setStrictErrorChecking(boolean strictErrorChecking) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void setXmlVersion(String xmlVersion) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public short compareDocumentPosition(Node other) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getBaseURI() {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public Object getFeature(String feature, String version) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getTextContent() throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public Object getUserData(String key) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean isDefaultNamespace(String namespaceURI) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean isEqualNode(Node arg) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean isSameNode(Node other) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String lookupNamespaceURI(String prefix) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String lookupPrefix(String namespaceURI) {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public void setTextContent(String textContent) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public Object setUserData(String key, Object data, UserDataHandler handler) {
throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
}
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java Tue Mar 13 12:50:18 2007
@@ -423,4 +423,62 @@
}
}
}
+
+ // SAAJ 1.3 API
+
+ public void setFaultCode(QName faultCode) throws SOAPException {
+ fault.setFaultCode(faultCode);
+ }
+
+ public QName getFaultCodeAsQName() {
+ return fault.getFaultCode();
+ }
+
+ public Iterator getFaultSubcodes() {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public void removeAllFaultSubcodes() {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public void appendFaultSubcode(QName subcode) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public boolean hasDetail() {
+ return (getDetail() != null);
+ }
+
+ public void addFaultReasonText(String text, Locale locale) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public String getFaultReasonText(Locale locale) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public Iterator getFaultReasonTexts() throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public Iterator getFaultReasonLocales() throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public String getFaultRole() {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public void setFaultRole(String uri) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public String getFaultNode() {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public void setFaultNode(String uri) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java Tue Mar 13 12:50:18 2007
@@ -400,4 +400,26 @@
}
return headerElement;
}
+
+ // SAAJ 1.3 API
+
+ public javax.xml.soap.SOAPHeaderElement addHeaderElement(QName name) throws SOAPException {
+ return addHeaderElement(new PrefixedQName(name));
+ }
+
+ public javax.xml.soap.SOAPHeaderElement addNotUnderstoodHeaderElement(QName name) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(Iterator supportedSOAPURIs) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(String[] supportedSoapUris) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
+
+ public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(String supportedSoapUri) throws SOAPException {
+ throw new UnsupportedOperationException("Not implemented.");
+ }
}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java Tue Mar 13 12:50:18 2007
@@ -212,5 +212,19 @@
}
return ( textRep.getData() != null ? textRep.getData().hashCode() : 0 );
}
+
+ // DOM 1.3 API
+
+ public String getWholeText() {
+ return textRep.getData();
+ }
+
+ public org.w3c.dom.Text replaceWholeText(String text) throws DOMException {
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public boolean isElementContentWhitespace() {
+ return (toString().trim().length() == 0);
+ }
}
Added: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java?view=auto&rev=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java (added)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java Tue Mar 13 12:50:18 2007
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2002-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.
+ */
+package org.apache.axis.soap;
+
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SAAJMetaFactory;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+
+public class SAAJMetaFactoryImpl extends SAAJMetaFactory {
+
+ protected MessageFactory newMessageFactory(String arg0) throws SOAPException {
+ return new MessageFactoryImpl();
+ }
+
+ protected SOAPFactory newSOAPFactory(String arg0) throws SOAPException {
+ return new SOAPFactoryImpl();
+ }
+
+}
Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java?view=diff&rev=517832&r1=517831&r2=517832
==============================================================================
--- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java (original)
+++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java Tue Mar 13 12:50:18 2007
@@ -19,9 +19,11 @@
import org.apache.axis.message.MessageElement;
import org.apache.axis.message.PrefixedQName;
+import javax.xml.namespace.QName;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFault;
/**
* SOAP Element Factory implementation
@@ -90,5 +92,18 @@
public Name createName(String localName)
throws SOAPException {
return new PrefixedQName("",localName,"");
+ }
+
+ // SAAJ 1.3 API
+
+ public SOAPFault createFault() throws SOAPException {
+ return new org.apache.axis.message.SOAPFault(null);
+ }
+
+ public SOAPFault createFault(String reason, QName faultCode) throws SOAPException {
+ org.apache.axis.message.SOAPFault fault = new org.apache.axis.message.SOAPFault(null);
+ fault.setFaultString(reason);
+ fault.setFaultCode(faultCode);
+ return fault;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r517832 - in /webservices/axis/branches/AXIS_1_4_SAAJ_1_3: lib/ lib/endorsed/ src/javax/xml/soap/ src/org/apache/axis/ src/org/apache/axis/attachments/ src/org/apache/axis/message/ src/org/apache/axis/soap/
Posted by Jarek Gawor <jg...@gmail.com>.
Yes, of course.
Apache Geronimo project is working on implementing the Java EE 5 spec.
One of the things that's required by Java EE 5 is support for both
JAX-RPC and JAX-WS web services. Currently, Geronimo uses Axis1 as its
JAX-RPC engine and Axis2/CXF as its JAX-WS engines. The Java EE 5 spec
also requires SAAJ 1.3 API. Since Axis1 only currently supports SAAJ
1.2 I created a branch (of AXIS_1_4 branch) in which I extended the
code to define the missing 1.3 methods. Some methods are implemented
properly but majority of them just throw
UnsupportedOperationException(). This should allow Axis1 to at least
compile and work ok in an environment with SAAJ 1.3 API (assuming of
course the developer continues to use the 1.2 methods :))
Now, the hard part is to make the different SAAJ implementations work
in the same container.
Jarek
On 3/13/07, Davanum Srinivas <da...@gmail.com> wrote:
> Jarek,
>
> Please inform everyone on what you are planning to do.
>
> thanks,
> dims
>
> On 3/13/07, gawor@apache.org <ga...@apache.org> wrote:
> > Author: gawor
> > Date: Tue Mar 13 12:50:18 2007
> > New Revision: 517832
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=517832
> > Log:
> > just an experiment. defined saaj 1.3 methods, using axis2 saaj api
> >
> > Added:
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar (with props)
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java
> > Removed:
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xercesImpl-2.6.2.LICENSE
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xercesImpl-2.6.2.jar
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xml-apis-2.6.2.LICENSE
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xml-apis-2.6.2.jar
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/javax/xml/soap/
> > Modified:
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java
> > webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java
> >
> > Added: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar?view=auto&rev=517832
> > ==============================================================================
> > Binary file - no diff available.
> >
> > Propchange: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar
> > ------------------------------------------------------------------------------
> > svn:mime-type = application/octet-stream
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java Tue Mar 13 12:50:18 2007
> > @@ -18,8 +18,8 @@
> >
> > import org.apache.axis.attachments.Attachments;
> > import org.apache.axis.components.logger.LogFactory;
> > -import org.apache.axis.message.SOAPEnvelope;
> > import org.apache.axis.message.MimeHeaders;
> > +import org.apache.axis.message.SOAPEnvelope;
> > import org.apache.axis.soap.SOAPConstants;
> > import org.apache.axis.transport.http.HTTPConstants;
> > import org.apache.axis.utils.ClassUtils;
> > @@ -28,6 +28,7 @@
> > import org.apache.commons.logging.Log;
> >
> > import javax.xml.soap.AttachmentPart;
> > +import javax.xml.soap.SOAPElement;
> > import javax.xml.soap.SOAPException;
> > import javax.xml.soap.SOAPBody;
> > import javax.xml.soap.SOAPHeader;
> > @@ -759,4 +760,15 @@
> > mAttachments.dispose();
> > }
> > }
> > +
> > + // SAAJ 1.3 API
> > +
> > + public AttachmentPart getAttachment(SOAPElement element) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public void removeAttachments(javax.xml.soap.MimeHeaders headers) {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java Tue Mar 13 12:50:18 2007
> > @@ -34,6 +34,7 @@
> > import org.w3c.dom.Attr;
> > import org.w3c.dom.CDATASection;
> > import org.w3c.dom.Comment;
> > +import org.w3c.dom.DOMConfiguration;
> > import org.w3c.dom.DOMException;
> > import org.w3c.dom.DOMImplementation;
> > import org.w3c.dom.Document;
> > @@ -46,9 +47,11 @@
> > import org.w3c.dom.NodeList;
> > import org.w3c.dom.ProcessingInstruction;
> > import org.w3c.dom.Text;
> > +import org.w3c.dom.UserDataHandler;
> > import org.xml.sax.InputSource;
> > import org.xml.sax.SAXException;
> >
> > +import javax.xml.soap.SOAPElement;
> > import javax.xml.soap.SOAPException;
> > import javax.xml.soap.SOAPMessage;
> > import javax.xml.transform.Source;
> > @@ -1279,6 +1282,126 @@
> >
> > public boolean isBodyStream() {
> > return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM);
> > + }
> > +
> > + // DOM 3 API
> > +
> > + public String getDocumentURI() {
> > + return document.getDocumentURI();
> > + }
> > +
> > + public DOMConfiguration getDomConfig() {
> > + return document.getDomConfig();
> > + }
> > +
> > + public String getInputEncoding() {
> > + return document.getInputEncoding();
> > + }
> > +
> > + public String getXmlEncoding() {
> > + return document.getXmlEncoding();
> > + }
> > +
> > + public boolean getXmlStandalone() {
> > + return document.getXmlStandalone();
> > + }
> > +
> > + public String getXmlVersion() {
> > + return document.getXmlVersion();
> > + }
> > +
> > + public void normalizeDocument() {
> > + document.normalizeDocument();
> > + }
> > +
> > + public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
> > + return document.renameNode(n, namespaceURI, qualifiedName);
> > + }
> > +
> > + public void setDocumentURI(String documentURI) {
> > + document.setDocumentURI(documentURI);
> > + }
> > +
> > + public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
> > + document.setXmlStandalone(xmlStandalone);
> > + }
> > +
> > + public void setXmlVersion(String xmlVersion) throws DOMException {
> > + document.setXmlVersion(xmlVersion);
> > + }
> > +
> > + public short compareDocumentPosition(Node other) throws DOMException {
> > + return document.compareDocumentPosition(other);
> > + }
> > +
> > + public String getBaseURI() {
> > + return document.getBaseURI();
> > + }
> > +
> > + public Object getFeature(String feature, String version) {
> > + return document.getFeature(feature, version);
> > + }
> > +
> > + public String getTextContent() throws DOMException {
> > + return document.getTextContent();
> > + }
> > +
> > + public Object getUserData(String key) {
> > + return document.getUserData(key);
> > + }
> > +
> > + public boolean isDefaultNamespace(String namespaceURI) {
> > + return document.isDefaultNamespace(namespaceURI);
> > + }
> > +
> > + public boolean isEqualNode(Node arg) {
> > + return document.isEqualNode(arg);
> > + }
> > +
> > + public boolean isSameNode(Node other) {
> > + return document.isSameNode(other);
> > + }
> > +
> > + public String lookupNamespaceURI(String prefix) {
> > + return document.lookupNamespaceURI(prefix);
> > + }
> > +
> > + public String lookupPrefix(String namespaceURI) {
> > + return document.lookupPrefix(namespaceURI);
> > + }
> > +
> > + public void setTextContent(String textContent) throws DOMException {
> > + document.setTextContent(textContent);
> > + }
> > +
> > + public Object setUserData(String key, Object data, UserDataHandler handler) {
> > + return document.setUserData(key, data, handler);
> > + }
> > +
> > + // SOAP Node methods (since SOAPPart now implements SOAP Node)
> > +
> > + public void detachNode() {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public SOAPElement getParentElement() {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public String getValue() {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public void recycleNode() {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public void setParentElement(SOAPElement arg0) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public void setValue(String arg0) {
> > + throw new UnsupportedOperationException("Not implemented.");
> > }
> > }
> >
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java Tue Mar 13 12:50:18 2007
> > @@ -18,6 +18,7 @@
> > import org.apache.axis.Part;
> > import org.apache.axis.components.logger.LogFactory;
> > import org.apache.axis.components.image.ImageIOFactory;
> > +import org.apache.axis.encoding.Base64;
> > import org.apache.axis.transport.http.HTTPConstants;
> > import org.apache.axis.utils.Messages;
> > import org.apache.axis.utils.SessionUtils;
> > @@ -28,8 +29,10 @@
> > import javax.xml.soap.SOAPException;
> > import javax.xml.transform.stream.StreamSource;
> > import java.util.Iterator;
> > +import java.io.ByteArrayInputStream;
> > import java.io.ByteArrayOutputStream;
> > import java.io.File;
> > +import java.io.IOException;
> > import java.io.InputStream;
> >
> > /**
> > @@ -546,4 +549,68 @@
> > //we get to release memory anyway
> > datahandler = null;
> > }
> > +
> > + // SAAJ 1.3 API
> > +
> > + public InputStream getRawContent() throws SOAPException {
> > + if (datahandler == null) {
> > + throw new SOAPException(Messages.getMessage("noContent"));
> > + }
> > +
> > + try {
> > + return datahandler.getDataSource().getInputStream();
> > + } catch (IOException ex) {
> > + throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
> > + }
> > + }
> > +
> > + public byte[] getRawContentBytes() throws SOAPException {
> > + if (datahandler == null) {
> > + throw new SOAPException(Messages.getMessage("noContent"));
> > + }
> > + ByteArrayOutputStream bout = new ByteArrayOutputStream();
> > + try {
> > + datahandler.writeTo(bout);
> > + } catch (IOException ex) {
> > + throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
> > + }
> > + return bout.toByteArray();
> > + }
> > +
> > + public InputStream getBase64Content() throws SOAPException {
> > + byte[] rawBytes = getRawContentBytes();
> > + ByteArrayOutputStream out = new ByteArrayOutputStream();
> > + try {
> > + Base64.encode(rawBytes, 0, rawBytes.length, out);
> > + } catch (IOException ex) {
> > + throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
> > + }
> > + byte[] encodedBytes = out.toByteArray();
> > + return new ByteArrayInputStream(encodedBytes);
> > + }
> > +
> > + public void setBase64Content(InputStream content, String contentType) throws SOAPException {
> > + byte[] buf = new byte[1024];
> > + int read = 0;
> > + ByteArrayOutputStream encoded = new ByteArrayOutputStream();
> > + try {
> > + while ((read = content.read(buf, 0, buf.length)) != -1) {
> > + encoded.write(buf, 0, read);
> > + }
> > + } catch (IOException ex) {
> > + throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
> > + }
> > + byte[] rawData = Base64.decode(encoded.toString());
> > + setRawContentBytes(rawData, 0, rawData.length, contentType);
> > + }
> > +
> > + public void setRawContent(InputStream content, String contentType) throws SOAPException {
> > + setContent(content, contentType);
> > + }
> > +
> > + public void setRawContentBytes(byte[] content, int offset, int len, String contentType) throws SOAPException {
> > + ByteArrayInputStream in = new ByteArrayInputStream(content, offset, len);
> > + setContent(in, contentType);
> > + }
> > +
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java Tue Mar 13 12:50:18 2007
> > @@ -16,6 +16,7 @@
> >
> > package org.apache.axis.message;
> >
> > +import javax.xml.namespace.QName;
> > import javax.xml.soap.DetailEntry;
> > import javax.xml.soap.Name;
> > import javax.xml.soap.SOAPException;
> > @@ -51,5 +52,11 @@
> > */
> > public Iterator getDetailEntries() {
> > return this.getChildElements();
> > + }
> > +
> > + // SAAJ 1.3 API
> > +
> > + public DetailEntry addDetailEntry(QName name) throws SOAPException {
> > + return addDetailEntry(new PrefixedQName(name));
> > }
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java Tue Mar 13 12:50:18 2007
> > @@ -41,6 +41,7 @@
> > import org.w3c.dom.NodeList;
> > import org.w3c.dom.Text;
> > import org.w3c.dom.NamedNodeMap;
> > +import org.w3c.dom.TypeInfo;
> > import org.xml.sax.Attributes;
> > import org.xml.sax.ContentHandler;
> > import org.xml.sax.InputSource;
> > @@ -2142,5 +2143,75 @@
> > doc = new SOAPDocumentImpl(null);
> > }
> > return doc;
> > + }
> > +
> > + // SAAJ 1.3 API
> > +
> > + public SOAPElement addChildElement(QName qname) throws SOAPException {
> > + return addChildElement(new PrefixedQName(qname));
> > + }
> > +
> > + public SOAPElement addAttribute(QName qname, String value) throws SOAPException {
> > + return addAttribute(new PrefixedQName(qname), value);
> > + }
> > +
> > + public String getAttributeValue(QName qname) {
> > + return getAttributeValue(new PrefixedQName(qname));
> > + }
> > +
> > + public Iterator getAllAttributesAsQNames() {
> > + int num = attributes.getLength();
> > + Vector attrs = new Vector(num);
> > + for (int i = 0; i < num; i++) {
> > + String q = attributes.getQName(i);
> > + String prefix = "";
> > + if (q != null) {
> > + int idx = q.indexOf(":");
> > + if (idx > 0) {
> > + prefix = q.substring(0, idx);
> > + } else {
> > + prefix= "";
> > + }
> > + }
> > +
> > + attrs.add(new QName(attributes.getURI(i),
> > + attributes.getLocalName(i),
> > + prefix));
> > + }
> > + return attrs.iterator();
> > + }
> > +
> > + public QName createQName(String localName, String prefix) throws SOAPException {
> > + return new QName(getNamespaceURI(prefix), localName, prefix);
> > + }
> > +
> > + public QName getElementQName() {
> > + return new QName(getNamespaceURI(), getName(), getPrefix());
> > + }
> > +
> > + public SOAPElement setElementQName(QName newName) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public boolean removeAttribute(QName qname) {
> > + return removeAttribute(new PrefixedQName(qname));
> > + }
> > +
> > + // DOM 3 API
> > +
> > + public TypeInfo getSchemaTypeInfo() {
> > + return null;
> > + }
> > +
> > + public void setIdAttribute(String name, boolean isId) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > }
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java Tue Mar 13 12:50:18 2007
> > @@ -30,6 +30,7 @@
> > import org.w3c.dom.Node;
> > import org.w3c.dom.NodeList;
> > import org.w3c.dom.Text;
> > +import org.w3c.dom.UserDataHandler;
> > import org.xml.sax.Attributes;
> > import org.xml.sax.helpers.AttributesImpl;
> >
> > @@ -857,4 +858,55 @@
> > }
> > this._isDirty = false;
> > }
> > +
> > + // DOM 1.3 API
> > +
> > + public short compareDocumentPosition(Node other) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String getBaseURI() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public Object getFeature(String feature, String version) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String getTextContent() throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public Object getUserData(String key) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean isDefaultNamespace(String namespaceURI) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean isEqualNode(Node arg) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean isSameNode(Node other) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String lookupNamespaceURI(String prefix) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String lookupPrefix(String namespaceURI) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void setTextContent(String textContent) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public Object setUserData(String key, Object data, UserDataHandler handler) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java Tue Mar 13 12:50:18 2007
> > @@ -306,4 +306,22 @@
> > public void setSAAJEncodingCompliance(boolean comply) {
> > this.doSAAJEncodingCompliance = true;
> > }
> > +
> > + // SAAJ 1.3 API
> > +
> > + public javax.xml.soap.SOAPBodyElement addBodyElement(QName name) throws SOAPException {
> > + return addBodyElement(new PrefixedQName(name));
> > + }
> > +
> > + public javax.xml.soap.SOAPFault addFault(QName name, String s) throws SOAPException {
> > + return addFault(new PrefixedQName(name), s);
> > + }
> > +
> > + public javax.xml.soap.SOAPFault addFault(QName name, String s, Locale locale) throws SOAPException {
> > + return addFault(new PrefixedQName(name), s, locale);
> > + }
> > +
> > + public Document extractContentAsDocument() throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java Tue Mar 13 12:50:18 2007
> > @@ -25,6 +25,7 @@
> > import org.w3c.dom.Attr;
> > import org.w3c.dom.CDATASection;
> > import org.w3c.dom.Comment;
> > +import org.w3c.dom.DOMConfiguration;
> > import org.w3c.dom.DOMException;
> > import org.w3c.dom.DOMImplementation;
> > import org.w3c.dom.Document;
> > @@ -36,6 +37,7 @@
> > import org.w3c.dom.Node;
> > import org.w3c.dom.NodeList;
> > import org.w3c.dom.ProcessingInstruction;
> > +import org.w3c.dom.UserDataHandler;
> >
> > import javax.xml.parsers.ParserConfigurationException;
> > import javax.xml.soap.SOAPException;
> > @@ -679,6 +681,112 @@
> > }
> >
> > public boolean hasAttributes() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + // DOM 3 API
> > +
> > + public Node adoptNode(Node source) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String getDocumentURI() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public DOMConfiguration getDomConfig() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String getInputEncoding() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean getStrictErrorChecking() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String getXmlEncoding() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean getXmlStandalone() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String getXmlVersion() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void normalizeDocument() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void setDocumentURI(String documentURI) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void setStrictErrorChecking(boolean strictErrorChecking) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void setXmlVersion(String xmlVersion) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public short compareDocumentPosition(Node other) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String getBaseURI() {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public Object getFeature(String feature, String version) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String getTextContent() throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public Object getUserData(String key) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean isDefaultNamespace(String namespaceURI) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean isEqualNode(Node arg) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean isSameNode(Node other) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String lookupNamespaceURI(String prefix) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public String lookupPrefix(String namespaceURI) {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public void setTextContent(String textContent) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public Object setUserData(String key, Object data, UserDataHandler handler) {
> > throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > }
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java Tue Mar 13 12:50:18 2007
> > @@ -423,4 +423,62 @@
> > }
> > }
> > }
> > +
> > + // SAAJ 1.3 API
> > +
> > + public void setFaultCode(QName faultCode) throws SOAPException {
> > + fault.setFaultCode(faultCode);
> > + }
> > +
> > + public QName getFaultCodeAsQName() {
> > + return fault.getFaultCode();
> > + }
> > +
> > + public Iterator getFaultSubcodes() {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public void removeAllFaultSubcodes() {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public void appendFaultSubcode(QName subcode) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public boolean hasDetail() {
> > + return (getDetail() != null);
> > + }
> > +
> > + public void addFaultReasonText(String text, Locale locale) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public String getFaultReasonText(Locale locale) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public Iterator getFaultReasonTexts() throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public Iterator getFaultReasonLocales() throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public String getFaultRole() {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public void setFaultRole(String uri) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public String getFaultNode() {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public void setFaultNode(String uri) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java Tue Mar 13 12:50:18 2007
> > @@ -400,4 +400,26 @@
> > }
> > return headerElement;
> > }
> > +
> > + // SAAJ 1.3 API
> > +
> > + public javax.xml.soap.SOAPHeaderElement addHeaderElement(QName name) throws SOAPException {
> > + return addHeaderElement(new PrefixedQName(name));
> > + }
> > +
> > + public javax.xml.soap.SOAPHeaderElement addNotUnderstoodHeaderElement(QName name) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(Iterator supportedSOAPURIs) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(String[] supportedSoapUris) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > +
> > + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(String supportedSoapUri) throws SOAPException {
> > + throw new UnsupportedOperationException("Not implemented.");
> > + }
> > }
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java Tue Mar 13 12:50:18 2007
> > @@ -212,5 +212,19 @@
> > }
> > return ( textRep.getData() != null ? textRep.getData().hashCode() : 0 );
> > }
> > +
> > + // DOM 1.3 API
> > +
> > + public String getWholeText() {
> > + return textRep.getData();
> > + }
> > +
> > + public org.w3c.dom.Text replaceWholeText(String text) throws DOMException {
> > + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> > + }
> > +
> > + public boolean isElementContentWhitespace() {
> > + return (toString().trim().length() == 0);
> > + }
> >
> > }
> >
> > Added: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java?view=auto&rev=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java (added)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java Tue Mar 13 12:50:18 2007
> > @@ -0,0 +1,33 @@
> > +/*
> > + * Copyright 2002-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.
> > + */
> > +package org.apache.axis.soap;
> > +
> > +import javax.xml.soap.MessageFactory;
> > +import javax.xml.soap.SAAJMetaFactory;
> > +import javax.xml.soap.SOAPException;
> > +import javax.xml.soap.SOAPFactory;
> > +
> > +public class SAAJMetaFactoryImpl extends SAAJMetaFactory {
> > +
> > + protected MessageFactory newMessageFactory(String arg0) throws SOAPException {
> > + return new MessageFactoryImpl();
> > + }
> > +
> > + protected SOAPFactory newSOAPFactory(String arg0) throws SOAPException {
> > + return new SOAPFactoryImpl();
> > + }
> > +
> > +}
> >
> > Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java
> > URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java?view=diff&rev=517832&r1=517831&r2=517832
> > ==============================================================================
> > --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java (original)
> > +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java Tue Mar 13 12:50:18 2007
> > @@ -19,9 +19,11 @@
> > import org.apache.axis.message.MessageElement;
> > import org.apache.axis.message.PrefixedQName;
> >
> > +import javax.xml.namespace.QName;
> > import javax.xml.soap.Name;
> > import javax.xml.soap.SOAPElement;
> > import javax.xml.soap.SOAPException;
> > +import javax.xml.soap.SOAPFault;
> >
> > /**
> > * SOAP Element Factory implementation
> > @@ -90,5 +92,18 @@
> > public Name createName(String localName)
> > throws SOAPException {
> > return new PrefixedQName("",localName,"");
> > + }
> > +
> > + // SAAJ 1.3 API
> > +
> > + public SOAPFault createFault() throws SOAPException {
> > + return new org.apache.axis.message.SOAPFault(null);
> > + }
> > +
> > + public SOAPFault createFault(String reason, QName faultCode) throws SOAPException {
> > + org.apache.axis.message.SOAPFault fault = new org.apache.axis.message.SOAPFault(null);
> > + fault.setFaultString(reason);
> > + fault.setFaultCode(faultCode);
> > + return fault;
> > }
> > }
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> > For additional commands, e-mail: axis-cvs-help@ws.apache.org
> >
> >
>
>
> --
> Davanum Srinivas :: http://wso2.org/ :: Oxygen for Web Services Developers
>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org
Re: svn commit: r517832 - in /webservices/axis/branches/AXIS_1_4_SAAJ_1_3: lib/ lib/endorsed/ src/javax/xml/soap/ src/org/apache/axis/ src/org/apache/axis/attachments/ src/org/apache/axis/message/ src/org/apache/axis/soap/
Posted by Davanum Srinivas <da...@gmail.com>.
Jarek,
Please inform everyone on what you are planning to do.
thanks,
dims
On 3/13/07, gawor@apache.org <ga...@apache.org> wrote:
> Author: gawor
> Date: Tue Mar 13 12:50:18 2007
> New Revision: 517832
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=517832
> Log:
> just an experiment. defined saaj 1.3 methods, using axis2 saaj api
>
> Added:
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar (with props)
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java
> Removed:
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xercesImpl-2.6.2.LICENSE
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xercesImpl-2.6.2.jar
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xml-apis-2.6.2.LICENSE
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/endorsed/xml-apis-2.6.2.jar
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/javax/xml/soap/
> Modified:
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java
> webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java
>
> Added: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar?view=auto&rev=517832
> ==============================================================================
> Binary file - no diff available.
>
> Propchange: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/lib/saaj-api-1.3.jar
> ------------------------------------------------------------------------------
> svn:mime-type = application/octet-stream
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/Message.java Tue Mar 13 12:50:18 2007
> @@ -18,8 +18,8 @@
>
> import org.apache.axis.attachments.Attachments;
> import org.apache.axis.components.logger.LogFactory;
> -import org.apache.axis.message.SOAPEnvelope;
> import org.apache.axis.message.MimeHeaders;
> +import org.apache.axis.message.SOAPEnvelope;
> import org.apache.axis.soap.SOAPConstants;
> import org.apache.axis.transport.http.HTTPConstants;
> import org.apache.axis.utils.ClassUtils;
> @@ -28,6 +28,7 @@
> import org.apache.commons.logging.Log;
>
> import javax.xml.soap.AttachmentPart;
> +import javax.xml.soap.SOAPElement;
> import javax.xml.soap.SOAPException;
> import javax.xml.soap.SOAPBody;
> import javax.xml.soap.SOAPHeader;
> @@ -759,4 +760,15 @@
> mAttachments.dispose();
> }
> }
> +
> + // SAAJ 1.3 API
> +
> + public AttachmentPart getAttachment(SOAPElement element) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public void removeAttachments(javax.xml.soap.MimeHeaders headers) {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/SOAPPart.java Tue Mar 13 12:50:18 2007
> @@ -34,6 +34,7 @@
> import org.w3c.dom.Attr;
> import org.w3c.dom.CDATASection;
> import org.w3c.dom.Comment;
> +import org.w3c.dom.DOMConfiguration;
> import org.w3c.dom.DOMException;
> import org.w3c.dom.DOMImplementation;
> import org.w3c.dom.Document;
> @@ -46,9 +47,11 @@
> import org.w3c.dom.NodeList;
> import org.w3c.dom.ProcessingInstruction;
> import org.w3c.dom.Text;
> +import org.w3c.dom.UserDataHandler;
> import org.xml.sax.InputSource;
> import org.xml.sax.SAXException;
>
> +import javax.xml.soap.SOAPElement;
> import javax.xml.soap.SOAPException;
> import javax.xml.soap.SOAPMessage;
> import javax.xml.transform.Source;
> @@ -1279,6 +1282,126 @@
>
> public boolean isBodyStream() {
> return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM);
> + }
> +
> + // DOM 3 API
> +
> + public String getDocumentURI() {
> + return document.getDocumentURI();
> + }
> +
> + public DOMConfiguration getDomConfig() {
> + return document.getDomConfig();
> + }
> +
> + public String getInputEncoding() {
> + return document.getInputEncoding();
> + }
> +
> + public String getXmlEncoding() {
> + return document.getXmlEncoding();
> + }
> +
> + public boolean getXmlStandalone() {
> + return document.getXmlStandalone();
> + }
> +
> + public String getXmlVersion() {
> + return document.getXmlVersion();
> + }
> +
> + public void normalizeDocument() {
> + document.normalizeDocument();
> + }
> +
> + public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
> + return document.renameNode(n, namespaceURI, qualifiedName);
> + }
> +
> + public void setDocumentURI(String documentURI) {
> + document.setDocumentURI(documentURI);
> + }
> +
> + public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
> + document.setXmlStandalone(xmlStandalone);
> + }
> +
> + public void setXmlVersion(String xmlVersion) throws DOMException {
> + document.setXmlVersion(xmlVersion);
> + }
> +
> + public short compareDocumentPosition(Node other) throws DOMException {
> + return document.compareDocumentPosition(other);
> + }
> +
> + public String getBaseURI() {
> + return document.getBaseURI();
> + }
> +
> + public Object getFeature(String feature, String version) {
> + return document.getFeature(feature, version);
> + }
> +
> + public String getTextContent() throws DOMException {
> + return document.getTextContent();
> + }
> +
> + public Object getUserData(String key) {
> + return document.getUserData(key);
> + }
> +
> + public boolean isDefaultNamespace(String namespaceURI) {
> + return document.isDefaultNamespace(namespaceURI);
> + }
> +
> + public boolean isEqualNode(Node arg) {
> + return document.isEqualNode(arg);
> + }
> +
> + public boolean isSameNode(Node other) {
> + return document.isSameNode(other);
> + }
> +
> + public String lookupNamespaceURI(String prefix) {
> + return document.lookupNamespaceURI(prefix);
> + }
> +
> + public String lookupPrefix(String namespaceURI) {
> + return document.lookupPrefix(namespaceURI);
> + }
> +
> + public void setTextContent(String textContent) throws DOMException {
> + document.setTextContent(textContent);
> + }
> +
> + public Object setUserData(String key, Object data, UserDataHandler handler) {
> + return document.setUserData(key, data, handler);
> + }
> +
> + // SOAP Node methods (since SOAPPart now implements SOAP Node)
> +
> + public void detachNode() {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public SOAPElement getParentElement() {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public String getValue() {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public void recycleNode() {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public void setParentElement(SOAPElement arg0) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public void setValue(String arg0) {
> + throw new UnsupportedOperationException("Not implemented.");
> }
> }
>
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/attachments/AttachmentPart.java Tue Mar 13 12:50:18 2007
> @@ -18,6 +18,7 @@
> import org.apache.axis.Part;
> import org.apache.axis.components.logger.LogFactory;
> import org.apache.axis.components.image.ImageIOFactory;
> +import org.apache.axis.encoding.Base64;
> import org.apache.axis.transport.http.HTTPConstants;
> import org.apache.axis.utils.Messages;
> import org.apache.axis.utils.SessionUtils;
> @@ -28,8 +29,10 @@
> import javax.xml.soap.SOAPException;
> import javax.xml.transform.stream.StreamSource;
> import java.util.Iterator;
> +import java.io.ByteArrayInputStream;
> import java.io.ByteArrayOutputStream;
> import java.io.File;
> +import java.io.IOException;
> import java.io.InputStream;
>
> /**
> @@ -546,4 +549,68 @@
> //we get to release memory anyway
> datahandler = null;
> }
> +
> + // SAAJ 1.3 API
> +
> + public InputStream getRawContent() throws SOAPException {
> + if (datahandler == null) {
> + throw new SOAPException(Messages.getMessage("noContent"));
> + }
> +
> + try {
> + return datahandler.getDataSource().getInputStream();
> + } catch (IOException ex) {
> + throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
> + }
> + }
> +
> + public byte[] getRawContentBytes() throws SOAPException {
> + if (datahandler == null) {
> + throw new SOAPException(Messages.getMessage("noContent"));
> + }
> + ByteArrayOutputStream bout = new ByteArrayOutputStream();
> + try {
> + datahandler.writeTo(bout);
> + } catch (IOException ex) {
> + throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
> + }
> + return bout.toByteArray();
> + }
> +
> + public InputStream getBase64Content() throws SOAPException {
> + byte[] rawBytes = getRawContentBytes();
> + ByteArrayOutputStream out = new ByteArrayOutputStream();
> + try {
> + Base64.encode(rawBytes, 0, rawBytes.length, out);
> + } catch (IOException ex) {
> + throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
> + }
> + byte[] encodedBytes = out.toByteArray();
> + return new ByteArrayInputStream(encodedBytes);
> + }
> +
> + public void setBase64Content(InputStream content, String contentType) throws SOAPException {
> + byte[] buf = new byte[1024];
> + int read = 0;
> + ByteArrayOutputStream encoded = new ByteArrayOutputStream();
> + try {
> + while ((read = content.read(buf, 0, buf.length)) != -1) {
> + encoded.write(buf, 0, read);
> + }
> + } catch (IOException ex) {
> + throw new SOAPException(Messages.getMessage("javaIOException01", ex.getMessage()), ex);
> + }
> + byte[] rawData = Base64.decode(encoded.toString());
> + setRawContentBytes(rawData, 0, rawData.length, contentType);
> + }
> +
> + public void setRawContent(InputStream content, String contentType) throws SOAPException {
> + setContent(content, contentType);
> + }
> +
> + public void setRawContentBytes(byte[] content, int offset, int len, String contentType) throws SOAPException {
> + ByteArrayInputStream in = new ByteArrayInputStream(content, offset, len);
> + setContent(in, contentType);
> + }
> +
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Detail.java Tue Mar 13 12:50:18 2007
> @@ -16,6 +16,7 @@
>
> package org.apache.axis.message;
>
> +import javax.xml.namespace.QName;
> import javax.xml.soap.DetailEntry;
> import javax.xml.soap.Name;
> import javax.xml.soap.SOAPException;
> @@ -51,5 +52,11 @@
> */
> public Iterator getDetailEntries() {
> return this.getChildElements();
> + }
> +
> + // SAAJ 1.3 API
> +
> + public DetailEntry addDetailEntry(QName name) throws SOAPException {
> + return addDetailEntry(new PrefixedQName(name));
> }
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/MessageElement.java Tue Mar 13 12:50:18 2007
> @@ -41,6 +41,7 @@
> import org.w3c.dom.NodeList;
> import org.w3c.dom.Text;
> import org.w3c.dom.NamedNodeMap;
> +import org.w3c.dom.TypeInfo;
> import org.xml.sax.Attributes;
> import org.xml.sax.ContentHandler;
> import org.xml.sax.InputSource;
> @@ -2142,5 +2143,75 @@
> doc = new SOAPDocumentImpl(null);
> }
> return doc;
> + }
> +
> + // SAAJ 1.3 API
> +
> + public SOAPElement addChildElement(QName qname) throws SOAPException {
> + return addChildElement(new PrefixedQName(qname));
> + }
> +
> + public SOAPElement addAttribute(QName qname, String value) throws SOAPException {
> + return addAttribute(new PrefixedQName(qname), value);
> + }
> +
> + public String getAttributeValue(QName qname) {
> + return getAttributeValue(new PrefixedQName(qname));
> + }
> +
> + public Iterator getAllAttributesAsQNames() {
> + int num = attributes.getLength();
> + Vector attrs = new Vector(num);
> + for (int i = 0; i < num; i++) {
> + String q = attributes.getQName(i);
> + String prefix = "";
> + if (q != null) {
> + int idx = q.indexOf(":");
> + if (idx > 0) {
> + prefix = q.substring(0, idx);
> + } else {
> + prefix= "";
> + }
> + }
> +
> + attrs.add(new QName(attributes.getURI(i),
> + attributes.getLocalName(i),
> + prefix));
> + }
> + return attrs.iterator();
> + }
> +
> + public QName createQName(String localName, String prefix) throws SOAPException {
> + return new QName(getNamespaceURI(prefix), localName, prefix);
> + }
> +
> + public QName getElementQName() {
> + return new QName(getNamespaceURI(), getName(), getPrefix());
> + }
> +
> + public SOAPElement setElementQName(QName newName) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public boolean removeAttribute(QName qname) {
> + return removeAttribute(new PrefixedQName(qname));
> + }
> +
> + // DOM 3 API
> +
> + public TypeInfo getSchemaTypeInfo() {
> + return null;
> + }
> +
> + public void setIdAttribute(String name, boolean isId) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> }
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/NodeImpl.java Tue Mar 13 12:50:18 2007
> @@ -30,6 +30,7 @@
> import org.w3c.dom.Node;
> import org.w3c.dom.NodeList;
> import org.w3c.dom.Text;
> +import org.w3c.dom.UserDataHandler;
> import org.xml.sax.Attributes;
> import org.xml.sax.helpers.AttributesImpl;
>
> @@ -857,4 +858,55 @@
> }
> this._isDirty = false;
> }
> +
> + // DOM 1.3 API
> +
> + public short compareDocumentPosition(Node other) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String getBaseURI() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public Object getFeature(String feature, String version) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String getTextContent() throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public Object getUserData(String key) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean isDefaultNamespace(String namespaceURI) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean isEqualNode(Node arg) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean isSameNode(Node other) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String lookupNamespaceURI(String prefix) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String lookupPrefix(String namespaceURI) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void setTextContent(String textContent) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public Object setUserData(String key, Object data, UserDataHandler handler) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPBody.java Tue Mar 13 12:50:18 2007
> @@ -306,4 +306,22 @@
> public void setSAAJEncodingCompliance(boolean comply) {
> this.doSAAJEncodingCompliance = true;
> }
> +
> + // SAAJ 1.3 API
> +
> + public javax.xml.soap.SOAPBodyElement addBodyElement(QName name) throws SOAPException {
> + return addBodyElement(new PrefixedQName(name));
> + }
> +
> + public javax.xml.soap.SOAPFault addFault(QName name, String s) throws SOAPException {
> + return addFault(new PrefixedQName(name), s);
> + }
> +
> + public javax.xml.soap.SOAPFault addFault(QName name, String s, Locale locale) throws SOAPException {
> + return addFault(new PrefixedQName(name), s, locale);
> + }
> +
> + public Document extractContentAsDocument() throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPDocumentImpl.java Tue Mar 13 12:50:18 2007
> @@ -25,6 +25,7 @@
> import org.w3c.dom.Attr;
> import org.w3c.dom.CDATASection;
> import org.w3c.dom.Comment;
> +import org.w3c.dom.DOMConfiguration;
> import org.w3c.dom.DOMException;
> import org.w3c.dom.DOMImplementation;
> import org.w3c.dom.Document;
> @@ -36,6 +37,7 @@
> import org.w3c.dom.Node;
> import org.w3c.dom.NodeList;
> import org.w3c.dom.ProcessingInstruction;
> +import org.w3c.dom.UserDataHandler;
>
> import javax.xml.parsers.ParserConfigurationException;
> import javax.xml.soap.SOAPException;
> @@ -679,6 +681,112 @@
> }
>
> public boolean hasAttributes() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + // DOM 3 API
> +
> + public Node adoptNode(Node source) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String getDocumentURI() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public DOMConfiguration getDomConfig() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String getInputEncoding() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean getStrictErrorChecking() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String getXmlEncoding() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean getXmlStandalone() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String getXmlVersion() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void normalizeDocument() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void setDocumentURI(String documentURI) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void setStrictErrorChecking(boolean strictErrorChecking) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void setXmlVersion(String xmlVersion) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public short compareDocumentPosition(Node other) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String getBaseURI() {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public Object getFeature(String feature, String version) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String getTextContent() throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public Object getUserData(String key) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean isDefaultNamespace(String namespaceURI) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean isEqualNode(Node arg) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean isSameNode(Node other) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String lookupNamespaceURI(String prefix) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public String lookupPrefix(String namespaceURI) {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public void setTextContent(String textContent) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public Object setUserData(String key, Object data, UserDataHandler handler) {
> throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> }
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPFault.java Tue Mar 13 12:50:18 2007
> @@ -423,4 +423,62 @@
> }
> }
> }
> +
> + // SAAJ 1.3 API
> +
> + public void setFaultCode(QName faultCode) throws SOAPException {
> + fault.setFaultCode(faultCode);
> + }
> +
> + public QName getFaultCodeAsQName() {
> + return fault.getFaultCode();
> + }
> +
> + public Iterator getFaultSubcodes() {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public void removeAllFaultSubcodes() {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public void appendFaultSubcode(QName subcode) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public boolean hasDetail() {
> + return (getDetail() != null);
> + }
> +
> + public void addFaultReasonText(String text, Locale locale) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public String getFaultReasonText(Locale locale) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public Iterator getFaultReasonTexts() throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public Iterator getFaultReasonLocales() throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public String getFaultRole() {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public void setFaultRole(String uri) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public String getFaultNode() {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public void setFaultNode(String uri) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/SOAPHeader.java Tue Mar 13 12:50:18 2007
> @@ -400,4 +400,26 @@
> }
> return headerElement;
> }
> +
> + // SAAJ 1.3 API
> +
> + public javax.xml.soap.SOAPHeaderElement addHeaderElement(QName name) throws SOAPException {
> + return addHeaderElement(new PrefixedQName(name));
> + }
> +
> + public javax.xml.soap.SOAPHeaderElement addNotUnderstoodHeaderElement(QName name) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(Iterator supportedSOAPURIs) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(String[] supportedSoapUris) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> +
> + public javax.xml.soap.SOAPHeaderElement addUpgradeHeaderElement(String supportedSoapUri) throws SOAPException {
> + throw new UnsupportedOperationException("Not implemented.");
> + }
> }
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/message/Text.java Tue Mar 13 12:50:18 2007
> @@ -212,5 +212,19 @@
> }
> return ( textRep.getData() != null ? textRep.getData().hashCode() : 0 );
> }
> +
> + // DOM 1.3 API
> +
> + public String getWholeText() {
> + return textRep.getData();
> + }
> +
> + public org.w3c.dom.Text replaceWholeText(String text) throws DOMException {
> + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
> + }
> +
> + public boolean isElementContentWhitespace() {
> + return (toString().trim().length() == 0);
> + }
>
> }
>
> Added: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java?view=auto&rev=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java (added)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SAAJMetaFactoryImpl.java Tue Mar 13 12:50:18 2007
> @@ -0,0 +1,33 @@
> +/*
> + * Copyright 2002-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.
> + */
> +package org.apache.axis.soap;
> +
> +import javax.xml.soap.MessageFactory;
> +import javax.xml.soap.SAAJMetaFactory;
> +import javax.xml.soap.SOAPException;
> +import javax.xml.soap.SOAPFactory;
> +
> +public class SAAJMetaFactoryImpl extends SAAJMetaFactory {
> +
> + protected MessageFactory newMessageFactory(String arg0) throws SOAPException {
> + return new MessageFactoryImpl();
> + }
> +
> + protected SOAPFactory newSOAPFactory(String arg0) throws SOAPException {
> + return new SOAPFactoryImpl();
> + }
> +
> +}
>
> Modified: webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java
> URL: http://svn.apache.org/viewvc/webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java?view=diff&rev=517832&r1=517831&r2=517832
> ==============================================================================
> --- webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java (original)
> +++ webservices/axis/branches/AXIS_1_4_SAAJ_1_3/src/org/apache/axis/soap/SOAPFactoryImpl.java Tue Mar 13 12:50:18 2007
> @@ -19,9 +19,11 @@
> import org.apache.axis.message.MessageElement;
> import org.apache.axis.message.PrefixedQName;
>
> +import javax.xml.namespace.QName;
> import javax.xml.soap.Name;
> import javax.xml.soap.SOAPElement;
> import javax.xml.soap.SOAPException;
> +import javax.xml.soap.SOAPFault;
>
> /**
> * SOAP Element Factory implementation
> @@ -90,5 +92,18 @@
> public Name createName(String localName)
> throws SOAPException {
> return new PrefixedQName("",localName,"");
> + }
> +
> + // SAAJ 1.3 API
> +
> + public SOAPFault createFault() throws SOAPException {
> + return new org.apache.axis.message.SOAPFault(null);
> + }
> +
> + public SOAPFault createFault(String reason, QName faultCode) throws SOAPException {
> + org.apache.axis.message.SOAPFault fault = new org.apache.axis.message.SOAPFault(null);
> + fault.setFaultString(reason);
> + fault.setFaultCode(faultCode);
> + return fault;
> }
> }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>
--
Davanum Srinivas :: http://wso2.org/ :: Oxygen for Web Services Developers
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org