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 2005/12/23 07:00:16 UTC
svn commit: r358726 - in /webservices/axis2/trunk/java: etc/
modules/core/src/org/apache/axis2/context/ modules/integration/
modules/saaj/src/org/apache/axis2/saaj/ modules/samples/ modules/security/
Author: dims
Date: Thu Dec 22 22:00:06 2005
New Revision: 358726
URL: http://svn.apache.org/viewcvs?rev=358726&view=rev
Log:
- Switch to latest Xerces 2.7.1
- Switch to corresponding xml-apis jar (1.3.02)
- Switch the SAAJ classes to DOM3
- Remove IDE generated stuff
PS: Now the build should work both in JDK1.4 AND JDK1.5. Please yell if
you see a problem. thanks. :)
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttrImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPDocumentImpl.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/SOAPPartImpl.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java
webservices/axis2/trunk/java/modules/samples/project.xml
webservices/axis2/trunk/java/modules/security/maven.xml
webservices/axis2/trunk/java/modules/security/project.xml
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Thu Dec 22 22:00:06 2005
@@ -96,7 +96,8 @@
wss4j.version=SNAPSHOT
xalan.version=2.6.0
xbean.version=2.1.0
-xerces.version=2.6.2
+xerces.version=2.7.1
+xml_apis.version=1.3.02
XmlSchema.version=SNAPSHOT
xmlsec.version=1.2.1
xmlunit.version=1.0
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Thu Dec 22 22:00:06 2005
@@ -53,7 +53,7 @@
}
protected void finalize() throws Throwable {
- super.finalize(); //To change body of overridden methods use File | Settings | File Templates.
+ super.finalize();
}
/**
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Thu Dec 22 22:00:06 2005
@@ -324,8 +324,8 @@
<!-- Copying the DOM3 stuff to the endorsed dir -->
<mkdir dir="target/test-resources/endorsed"/>
- <copy file="${maven.repo.local}/xerces/jars/xercesImpl-2.6.2.jar" todir="target/test-resources/endorsed"/>
- <copy file="${maven.repo.local}/xerces/jars/xmlParserAPIs-2.6.2.jar" todir="target/test-resources/endorsed"/>
+ <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/test-resources/endorsed"/>
+ <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/test-resources/endorsed"/>
<!-- Scenario ST1 -->
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Thu Dec 22 22:00:06 2005
@@ -233,16 +233,16 @@
</properties>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml_apis.version}</version>
<properties>
<module>true</module>
</properties>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
+ <artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
<properties>
<module>true</module>
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttrImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttrImpl.java?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttrImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/AttrImpl.java Thu Dec 22 22:00:06 2005
@@ -18,6 +18,7 @@
import org.apache.axis2.om.OMAttribute;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
+import org.w3c.dom.TypeInfo;
public class AttrImpl extends NodeImpl implements Attr {
@@ -88,6 +89,14 @@
*/
public Element getOwnerElement() {
return ownerElement;
+ }
+
+ public TypeInfo getSchemaTypeInfo() {
+ return null;
+ }
+
+ public boolean isId() {
+ return false;
}
/**
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/NodeImpl.java Thu Dec 22 22:00:06 2005
@@ -32,12 +32,13 @@
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.NodeList;
+import org.w3c.dom.UserDataHandler;
/**
* Class NodeImpl
*/
public class NodeImpl implements Node {
-
+
/**
* Field omNode
*/
@@ -226,6 +227,54 @@
return false;
}
+ public String getBaseURI() {
+ return null;
+ }
+
+ public short compareDocumentPosition(org.w3c.dom.Node other) throws DOMException {
+ return 0;
+ }
+
+ public String getTextContent() throws DOMException {
+ return null;
+ }
+
+ public void setTextContent(String textContent) throws DOMException {
+
+ }
+
+ public boolean isSameNode(org.w3c.dom.Node other) {
+ return false;
+ }
+
+ public String lookupPrefix(String namespaceURI) {
+ return null;
+ }
+
+ public boolean isDefaultNamespace(String namespaceURI) {
+ return false;
+ }
+
+ public String lookupNamespaceURI(String prefix) {
+ return null;
+ }
+
+ public boolean isEqualNode(org.w3c.dom.Node arg) {
+ return false;
+ }
+
+ public Object getFeature(String feature, String version) {
+ return null;
+ }
+
+ public Object setUserData(String key, Object data, UserDataHandler handler) {
+ return null;
+ }
+
+ public Object getUserData(String key) {
+ return null;
+ }
+
/**
* Method hasChildNodes
*
@@ -444,17 +493,17 @@
Iterator iter = ((OMElement) omNode).getChildren();
NodeListImpl list = new NodeListImpl();
while (iter.hasNext()) {
- Object omChild = iter.next();
- if(omChild instanceof OMText){
- OMText omTextChild = (OMText)omChild;
- TextImpl textChild = new TextImpl(omTextChild);
- list.addNode(textChild);
- }else{
- OMNode omNodeChild = (OMNode)omChild;
- Node nodeChild = new NodeImpl(omNodeChild);
- list.addNode(nodeChild);
- }
-
+ Object omChild = iter.next();
+ if(omChild instanceof OMText){
+ OMText omTextChild = (OMText)omChild;
+ TextImpl textChild = new TextImpl(omTextChild);
+ list.addNode(textChild);
+ }else{
+ OMNode omNodeChild = (OMNode)omChild;
+ Node nodeChild = new NodeImpl(omNodeChild);
+ list.addNode(nodeChild);
+ }
+
}
return list;
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPDocumentImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPDocumentImpl.java?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPDocumentImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPDocumentImpl.java Thu Dec 22 22:00:06 2005
@@ -107,6 +107,62 @@
return delegate.getElementById(elementId);
}
+ public String getInputEncoding() {
+ return null;
+ }
+
+ public String getXmlEncoding() {
+ return null;
+ }
+
+ public boolean getXmlStandalone() {
+ return false;
+ }
+
+ public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
+
+ }
+
+ public String getXmlVersion() {
+ return null;
+ }
+
+ public void setXmlVersion(String xmlVersion) throws DOMException {
+
+ }
+
+ public boolean getStrictErrorChecking() {
+ return false;
+ }
+
+ public void setStrictErrorChecking(boolean strictErrorChecking) {
+
+ }
+
+ public String getDocumentURI() {
+ return null;
+ }
+
+ public void setDocumentURI(String documentURI) {
+
+ }
+
+ public Node adoptNode(Node source) throws DOMException {
+ return null;
+ }
+
+ public DOMConfiguration getDomConfig() {
+ return null;
+ }
+
+ public void normalizeDocument() {
+
+ }
+
+ public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
+ return null;
+ }
+
/**
* @param name
@@ -230,6 +286,54 @@
public boolean hasAttributes() {
throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
+
+ public String getBaseURI() {
+ return null;
+ }
+
+ public short compareDocumentPosition(Node other) throws DOMException {
+ return 0;
+ }
+
+ public String getTextContent() throws DOMException {
+ return null;
+ }
+
+ public void setTextContent(String textContent) throws DOMException {
+
+ }
+
+ public boolean isSameNode(Node other) {
+ return false;
+ }
+
+ public String lookupPrefix(String namespaceURI) {
+ return null;
+ }
+
+ public boolean isDefaultNamespace(String namespaceURI) {
+ return false;
+ }
+
+ public String lookupNamespaceURI(String prefix) {
+ return null;
+ }
+
+ public boolean isEqualNode(Node arg) {
+ return false;
+ }
+
+ public Object getFeature(String feature, String version) {
+ return null;
+ }
+
+ public Object setUserData(String key, Object data, UserDataHandler handler) {
+ return null;
+ }
+
+ public Object getUserData(String key) {
+ return null;
}
public boolean hasChildNodes() {
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- 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 Thu Dec 22 22:00:06 2005
@@ -20,6 +20,7 @@
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.NodeList;
+import org.w3c.dom.TypeInfo;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
@@ -602,6 +603,22 @@
}
}
return false;
+ }
+
+ public TypeInfo getSchemaTypeInfo() {
+ return null;
+ }
+
+ public void setIdAttribute(String name, boolean isId) throws DOMException {
+
+ }
+
+ public void setIdAttributeNS(String namespaceURI, String localName, boolean isId) throws DOMException {
+
+ }
+
+ public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException {
+
}
/**
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- 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 Thu Dec 22 22:00:06 2005
@@ -333,6 +333,30 @@
return document.getElementById(elementId);
}
+ public String getInputEncoding() {
+ return null;
+ }
+
+ public String getXmlEncoding() {
+ return null;
+ }
+
+ public boolean getXmlStandalone() {
+ return false;
+ }
+
+ public void setXmlStandalone(boolean xmlStandalone) throws DOMException {
+
+ }
+
+ public String getXmlVersion() {
+ return null;
+ }
+
+ public void setXmlVersion(String xmlVersion) throws DOMException {
+
+ }
+
/////////////////////////////////////////////////////////////
public String getEncoding() {
@@ -361,6 +385,14 @@
throw new UnsupportedOperationException("Not yet implemented. 74");
}
+ public String getDocumentURI() {
+ return null;
+ }
+
+ public void setDocumentURI(String documentURI) {
+
+ }
+
public String getVersion() {
throw new UnsupportedOperationException("Not yet implemented. 75");
@@ -377,6 +409,18 @@
throw new UnsupportedOperationException("Not yet implemented.77");
}
+ public DOMConfiguration getDomConfig() {
+ return null;
+ }
+
+ public void normalizeDocument() {
+
+ }
+
+ public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
+ return null;
+ }
+
/**
* Node Implementation
*/
@@ -480,5 +524,53 @@
public boolean hasAttributes() {
return document.hasAttributes();
}
-
+
+ public String getBaseURI() {
+ return null;
+ }
+
+ public short compareDocumentPosition(Node other) throws DOMException {
+ return 0;
+ }
+
+ public String getTextContent() throws DOMException {
+ return null;
+ }
+
+ public void setTextContent(String textContent) throws DOMException {
+
+ }
+
+ public boolean isSameNode(Node other) {
+ return false;
+ }
+
+ public String lookupPrefix(String namespaceURI) {
+ return null;
+ }
+
+ public boolean isDefaultNamespace(String namespaceURI) {
+ return false;
+ }
+
+ public String lookupNamespaceURI(String prefix) {
+ return null;
+ }
+
+ public boolean isEqualNode(Node arg) {
+ return false;
+ }
+
+ public Object getFeature(String feature, String version) {
+ return null;
+ }
+
+ public Object setUserData(String key, Object data, UserDataHandler handler) {
+ return null;
+ }
+
+ public Object getUserData(String key) {
+ return null;
+ }
+
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/TextImpl.java Thu Dec 22 22:00:06 2005
@@ -111,6 +111,18 @@
return tailText;
}
+ public boolean isElementContentWhitespace() {
+ return false;
+ }
+
+ public String getWholeText() {
+ return null;
+ }
+
+ public org.w3c.dom.Text replaceWholeText(String content) throws DOMException {
+ return null;
+ }
+
public int getLength() {
Modified: webservices/axis2/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/project.xml?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/project.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/project.xml Thu Dec 22 22:00:06 2005
@@ -188,17 +188,9 @@
</properties>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>${xerces.version}</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml_apis.version}</version>
<properties>
<module>true</module>
</properties>
Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Thu Dec 22 22:00:06 2005
@@ -30,8 +30,8 @@
<copy file="${maven.repo.local}/opensaml/jars/opensaml-1.0.1.jar" todir="target/classes/lib"/>
<copy file="${maven.repo.local}/wss4j/jars/wss4j-SNAPSHOT.jar" todir="target/classes/lib"/>
<copy file="${maven.repo.local}/jaxen/jars/jaxen-1.1-beta-7.jar" todir="target/classes/lib"/>
- <copy file="${maven.repo.local}/xerces/jars/xmlParserAPIs-2.6.2.jar" todir="target/classes/lib"/>
- <copy file="${maven.repo.local}/xerces/jars/xercesImpl-2.6.2.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar" todir="target/classes/lib"/>
+ <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar" todir="target/classes/lib"/>
<jar jarfile="target/security.mar" basedir="target/classes">
Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/project.xml?rev=358726&r1=358725&r2=358726&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Thu Dec 22 22:00:06 2005
@@ -164,9 +164,9 @@
</properties>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>${xerces.version}</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml_apis.version}</version>
<properties>
<module>true</module>
</properties>