You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2005/11/17 08:01:51 UTC
svn commit: r345202 - in /webservices/axis2/trunk/java/modules: saaj/
saaj/src/org/apache/axis2/om/impl/dom/
saaj/src/org/apache/axis2/om/impl/dom/jaxp/
xml/src/org/apache/axis2/om/impl/llom/
Author: ruchithf
Date: Wed Nov 16 23:01:13 2005
New Revision: 345202
URL: http://svn.apache.org/viewcvs?rev=345202&view=rev
Log:
1.) Removed commented code from OMTextImpl
2.) Updated project.xml of saaj to add the xbeans.jar to include the DOM-Level 3 specific interfaces
3.) Added the DOM-Level 3 methods (unimplemented) to the OM-DOM impl. Hoping to move this back to the XML module, once its confirmed that this is working with JDK 1.5
Modified:
webservices/axis2/trunk/java/modules/saaj/project.xml
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/AttrImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/TextImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
Modified: webservices/axis2/trunk/java/modules/saaj/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/project.xml?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/project.xml (original)
+++ webservices/axis2/trunk/java/modules/saaj/project.xml Wed Nov 16 23:01:13 2005
@@ -143,6 +143,16 @@
<url>http://dist.codehaus.org/stax/jars/</url>
</dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xbean.version}</version>
+ <type>jar</type>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
</dependencies>
<reports/>
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/AttrImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/AttrImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/AttrImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/AttrImpl.java Wed Nov 16 23:01:13 2005
@@ -25,6 +25,8 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.TypeInfo;
+import org.w3c.dom.UserDataHandler;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -350,8 +352,19 @@
clone.isSpecified(true);
return clone;
}
-
-
+
+ /*
+ * DOM-Level 3 methods
+ */
+ public TypeInfo getSchemaTypeInfo() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public boolean isId() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DOMImplementationImpl.java Wed Nov 16 23:01:13 2005
@@ -43,4 +43,13 @@
throw new UnsupportedOperationException("TODO");
}
+ /*
+ * DOM-Level 3 methods
+ */
+
+ public Object getFeature(String arg0, String arg1) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/DocumentImpl.java Wed Nov 16 23:01:13 2005
@@ -26,6 +26,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;
@@ -322,5 +323,79 @@
throw new DOMException(DOMException.INVALID_CHARACTER_ERR, msg);
}
}
+
+ /*
+ * DOM-Level 3 methods
+ */
+
+ public Node adoptNode(Node arg0) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public String getDocumentURI() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public DOMConfiguration getDomConfig() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public String getInputEncoding() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public boolean getStrictErrorChecking() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public String getXmlEncoding() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public boolean getXmlStandalone() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public String getXmlVersion() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void normalizeDocument() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public Node renameNode(Node arg0, String arg1, String arg2) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setDocumentURI(String arg0) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setStrictErrorChecking(boolean arg0) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setXmlStandalone(boolean arg0) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setXmlVersion(String arg0) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/ElementImpl.java Wed Nov 16 23:01:13 2005
@@ -34,6 +34,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.TypeInfo;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -858,4 +859,28 @@
ElementHelper helper = new ElementHelper(this);
return helper.resolveQName(qname);
}
+
+ /*
+ * DOM-Level 3 methods
+ */
+
+ public TypeInfo getSchemaTypeInfo() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setIdAttribute(String arg0, boolean arg1) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setIdAttributeNode(Attr arg0, boolean arg1) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setIdAttributeNS(String arg0, String arg1, boolean arg2) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/NodeImpl.java Wed Nov 16 23:01:13 2005
@@ -26,6 +26,7 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.UserDataHandler;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -472,5 +473,69 @@
omOutput.flush();
}
-
+ /*
+ * DOM-Level 3 methods
+ */
+
+ public String getBaseURI() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public short compareDocumentPosition(Node arg0) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public String getTextContent() throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public void setTextContent(String arg0) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public boolean isSameNode(Node arg0) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public String lookupPrefix(String arg0) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public boolean isDefaultNamespace(String arg0) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public String lookupNamespaceURI(String arg0) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public boolean isEqualNode(Node arg0) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public Object getFeature(String arg0, String arg1) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public Object setUserData(String arg0, Object arg1, UserDataHandler arg2) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public Object getUserData(String arg0) {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/TextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/TextImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/TextImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/TextImpl.java Wed Nov 16 23:01:13 2005
@@ -466,6 +466,25 @@
}
}
+ /*
+ * DOM-Level 3 methods
+ */
+
+ public String getWholeText() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public boolean isElementContentWhitespace() {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public Text replaceWholeText(String arg0) throws DOMException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/om/impl/dom/jaxp/DocumentBuilderFactoryImpl.java Wed Nov 16 23:01:13 2005
@@ -27,4 +27,14 @@
public static DocumentBuilderFactory newInstance() {
return new DocumentBuilderFactoryImpl();
}
+
+ public void setFeature(String arg0, boolean arg1) throws ParserConfigurationException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
+
+ public boolean getFeature(String arg0) throws ParserConfigurationException {
+ // TODO TODO
+ throw new UnsupportedOperationException("TODO");
+ }
}
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMNamespaceImpl.java Wed Nov 16 23:01:13 2005
@@ -32,8 +32,6 @@
*/
private String uri;
- // private String value;
-
/**
* @param uri
* @param prefix
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java?rev=345202&r1=345201&r2=345202&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java Wed Nov 16 23:01:13 2005
@@ -204,7 +204,6 @@
try {
InputStream inStream;
inStream = this.getInputStream();
- //int x = inStream.available();
byte[] data;
StringBuffer text = new StringBuffer();
do {
@@ -218,20 +217,6 @@
} while (inStream.available() > 0);
- //Breakup the base64 encoded text
- StringBuffer newText = new StringBuffer();
-
-// while(72 <= text.length()) {
-// newText.append(text.substring(0,Base64.BASE64DEFAULTLENGTH));
-// newText.append("\n");
-// text = text.delete(0,Base64.BASE64DEFAULTLENGTH);
-// }
-//
-// if(text.length() > 0) {
-// newText.append(text.toString());
-// }
-
-// return newText.toString();
return text.toString();
} catch (Exception e) {
throw new OMException(e);