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 di...@apache.org on 2006/12/26 21:41:03 UTC
svn commit: r490366 -
/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/
Author: dims
Date: Tue Dec 26 12:40:59 2006
New Revision: 490366
URL: http://svn.apache.org/viewvc?view=rev&rev=490366
Log:
implement a few methods, remove some duplicate methods
Modified:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttachmentPartImpl.java Tue Dec 26 12:40:59 2006
@@ -406,15 +406,38 @@
}
public InputStream getBase64Content() throws SOAPException {
- return null; //TODO - Not yet implemented
+ try {
+ if (dataHandler == null) {
+ return null;
+ }
+ return dataHandler.getInputStream();
+ } catch (IOException e) {
+ throw new SOAPException(e);
+ }
}
public InputStream getRawContent() throws SOAPException {
- return null; //TODO - Not yet implemented
+ try {
+ if (dataHandler == null) {
+ return null;
+ }
+ return dataHandler.getInputStream();
+ } catch (IOException e) {
+ throw new SOAPException(e);
+ }
}
public byte[] getRawContentBytes() throws SOAPException {
- return new byte[0]; //TODO - Not yet implemented
+ if (dataHandler == null) {
+ return null;
+ }
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ try {
+ dataHandler.writeTo(bout);
+ } catch (Exception ex) {
+ throw new SOAPException(ex);
+ }
+ return bout.toByteArray();
}
public void setBase64Content(InputStream inputstream, String s) throws SOAPException {
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailEntryImpl.java Tue Dec 26 12:40:59 2006
@@ -37,40 +37,4 @@
public DetailEntryImpl(ElementImpl element) {
super(element);
}
-
- public SOAPElement addAttribute(QName qname, String s) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public SOAPElement addChildElement(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public QName createQName(String s, String s1) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public Iterator getAllAttributesAsQNames() {
- return null; //TODO - Not yet implemented
- }
-
- public String getAttributeValue(QName qname) {
- return null; //TODO - Not yet implemented
- }
-
- public Iterator getChildElements(QName name) {
- return null; //TODO - Not yet implemented
- }
-
- public QName getElementQName() {
- return null; //TODO - Not yet implemented
- }
-
- public boolean removeAttribute(QName qname) {
- return false; //TODO - Not yet implemented
- }
-
- public SOAPElement setElementQName(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/DetailImpl.java Tue Dec 26 12:40:59 2006
@@ -100,42 +100,6 @@
}
public DetailEntry addDetailEntry(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public SOAPElement addAttribute(QName qname, String s) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public SOAPElement addChildElement(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public QName createQName(String s, String s1) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public Iterator getAllAttributesAsQNames() {
- return null; //TODO - Not yet implemented
- }
-
- public String getAttributeValue(QName qname) {
- return null; //TODO - Not yet implemented
- }
-
- public Iterator getChildElements(QName name) {
- return null; //TODO - Not yet implemented
- }
-
- public QName getElementQName() {
- return null; //TODO - Not yet implemented
- }
-
- public boolean removeAttribute(QName qname) {
- return false; //TODO - Not yet implemented
- }
-
- public SOAPElement setElementQName(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImplEx.java Tue Dec 26 12:40:59 2006
@@ -138,22 +138,22 @@
}
public TypeInfo getSchemaTypeInfo() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void setIdAttribute(String name, boolean isId) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyElementImpl.java Tue Dec 26 12:40:59 2006
@@ -40,40 +40,4 @@
}
this.parentElement = parent;
}
-
- public SOAPElement addAttribute(QName qname, String s) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public SOAPElement addChildElement(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public QName createQName(String s, String s1) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public Iterator getAllAttributesAsQNames() {
- return null; //TODO - Not yet implemented
- }
-
- public String getAttributeValue(QName qname) {
- return null; //TODO - Not yet implemented
- }
-
- public Iterator getChildElements(QName name) {
- return null; //TODO - Not yet implemented
- }
-
- public QName getElementQName() {
- return null; //TODO - Not yet implemented
- }
-
- public boolean removeAttribute(QName qname) {
- return false; //TODO - Not yet implemented
- }
-
- public SOAPElement setElementQName(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java Tue Dec 26 12:40:59 2006
@@ -226,8 +226,14 @@
* @throws SOAPException if there is a SOAP error
*/
public SOAPFault addFault(Name faultCode, String faultString, Locale locale) throws SOAPException {
- SOAP11FaultImpl fault = new SOAP11FaultImpl(omSOAPBody, new Exception(
- faultString), (SOAPFactory) this.element.getOMFactory());
+ org.apache.axiom.soap.SOAPFault fault;
+ if (this.element.getOMFactory() instanceof SOAP11Factory) {
+ fault = new SOAP11FaultImpl(omSOAPBody, new Exception(
+ faultString), (SOAPFactory) this.element.getOMFactory());
+ } else {
+ fault = new SOAP12FaultImpl(omSOAPBody, new Exception(
+ faultString), (SOAPFactory) this.element.getOMFactory());
+ }
SOAPFaultImpl faultImpl = new SOAPFaultImpl(fault);
faultImpl.setFaultCode(faultCode);
if (locale != null) {
@@ -284,19 +290,19 @@
}
public SOAPBodyElement addBodyElement(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public SOAPFault addFault(QName qname, String s) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public SOAPFault addFault(QName qname, String s, Locale locale) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public Document extractContentAsDocument() throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //To change body of implemented methods use File | Settings | File Templates.
}
private javax.xml.soap.Node toSAAJNode(org.w3c.dom.Node node,
@@ -365,42 +371,6 @@
public Iterator getChildElements(Name name) {
QName qName = new QName(name.getURI(), name.getLocalName());
return getChildren(element.getChildrenWithName(qName));
- }
-
- public SOAPElement addAttribute(QName qname, String s) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public SOAPElement addChildElement(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public QName createQName(String s, String s1) throws SOAPException {
- return null; //TODO - Not yet implemented
- }
-
- public Iterator getAllAttributesAsQNames() {
- return null; //TODO - Not yet implemented
- }
-
- public String getAttributeValue(QName qname) {
- return null; //TODO - Not yet implemented
- }
-
- public Iterator getChildElements(QName name) {
- return null; //TODO - Not yet implemented
- }
-
- public QName getElementQName() {
- return null; //TODO - Not yet implemented
- }
-
- public boolean removeAttribute(QName qname) {
- return false; //TODO - Not yet implemented
- }
-
- public SOAPElement setElementQName(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
}
public Iterator getChildElements() {
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Tue Dec 26 12:40:59 2006
@@ -378,39 +378,39 @@
}
public SOAPElement addAttribute(QName qname, String s) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public SOAPElement addChildElement(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public QName createQName(String s, String s1) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public Iterator getAllAttributesAsQNames() {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public String getAttributeValue(QName qname) {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public Iterator getChildElements(QName name) {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public QName getElementQName() {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
public boolean removeAttribute(QName qname) {
- return false; //TODO - Not yet implemented
+ return false; //TODO: Fixme.
}
public SOAPElement setElementQName(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return null; //TODO: Fixme.
}
/* (non-Javadoc)
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderElementImpl.java Tue Dec 26 12:40:59 2006
@@ -99,11 +99,11 @@
}
public void setRole(String s) throws SOAPException {
- //TODO - Not yet implemented
+ this.headerElem.setRole(s);
}
public String getRole() {
- return null; //TODO - Not yet implemented
+ return this.headerElem.getRole();
}
public void setRelay(boolean flag) throws SOAPException {
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java Tue Dec 26 12:40:59 2006
@@ -260,7 +260,7 @@
}
public SOAPHeaderElement addHeaderElement(QName qname) throws SOAPException {
- return null; //TODO - Not yet implemented
+ return (SOAPHeaderElement) addChildElement(qname.getLocalPart(), qname.getPrefix(), qname.getNamespaceURI());
}
public SOAPHeaderElement addNotUnderstoodHeaderElement(QName qname) throws SOAPException {
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java Tue Dec 26 12:40:59 2006
@@ -704,72 +704,72 @@
}
public String getInputEncoding() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public String getXmlEncoding() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public boolean getXmlStandalone() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public String getXmlVersion() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void setXmlVersion(String xmlVersion) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public boolean getStrictErrorChecking() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void setStrictErrorChecking(boolean strictErrorChecking) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public String getDocumentURI() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void setDocumentURI(String documentURI) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public Node adoptNode(Node source) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public DOMConfiguration getDomConfig() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void normalizeDocument() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
@@ -1176,62 +1176,62 @@
*/
public String getBaseURI() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public short compareDocumentPosition(Node arg0) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public String getTextContent() throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public void setTextContent(String arg0) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public boolean isSameNode(Node arg0) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public String lookupPrefix(String arg0) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public boolean isDefaultNamespace(String arg0) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public String lookupNamespaceURI(String arg0) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public boolean isEqualNode(Node arg0) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public Object getFeature(String arg0, String arg1) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public Object getUserData(String arg0) {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java?view=diff&rev=490366&r1=490365&r2=490366
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java Tue Dec 26 12:40:59 2006
@@ -105,17 +105,17 @@
}
public boolean isElementContentWhitespace() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public String getWholeText() {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
public org.w3c.dom.Text replaceWholeText(String content) throws DOMException {
- // TODO TODO
+ // TODO - Fixme.
throw new UnsupportedOperationException("TODO");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org