You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2006/10/09 12:24:57 UTC
svn commit: r454329 - in /incubator/woden/branches/WODEN-44:
src/org/apache/woden/ src/org/apache/woden/internal/
src/org/apache/woden/internal/util/
src/org/apache/woden/internal/wsdl20/extensions/http/
src/org/apache/woden/internal/wsdl20/extensions/...
Author: jkaputin
Date: Mon Oct 9 03:24:55 2006
New Revision: 454329
URL: http://svn.apache.org/viewvc?view=rev&rev=454329
Log:
Renamed ElementSource to XMLElement and updated
comments and local variable names to reflect this.
Added:
incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java
- copied, changed from r453547, incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java
- copied, changed from r453547, incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java
- copied, changed from r453547, incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMXMLElement.java
- copied, changed from r453547, incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMXMLElementTest.java
- copied, changed from r453547, incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/OMXMLElementTest.java
- copied, changed from r453547, incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java
Removed:
incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java
Modified:
incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/util/QNameUtils.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPHeaderDeserializer.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/BooleanAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/IntOrTokenAnyAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameOrTokenAnyAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/StringAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/TokenAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/URIAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/XMLAttrImpl.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/UnknownAttr.java
incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/XMLAttr.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/IntOrTokenAttrTest.java
incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/TokenAttrTest.java
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/WSDLReader.java Mon Oct 9 03:24:55 2006
@@ -176,7 +176,7 @@
//TODO - a readWSDL method that returns a Description (eg a component)
- //TODO - decide if an API method createElementSource() is needed.
+ //TODO - decide if an API method createXMLElement() is needed.
/**
* Returns a concrete implementation of WSDLSource that is compatible with
Copied: incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java (from r453547, incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java)
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java?view=diff&rev=454329&p1=incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java&r1=453547&p2=incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/ElementSource.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/XMLElement.java Mon Oct 9 03:24:55 2006
@@ -27,7 +27,7 @@
*
* @author John Kaputin (jkaputin@apache.org)
*/
-public interface ElementSource {
+public interface XMLElement {
/**
* Accepts an Object representing an XML element. The implementation should
@@ -92,7 +92,7 @@
*
* @return the first child element.
*/
- public ElementSource getFirstChildElement () throws WSDLException;
+ public XMLElement getFirstChildElement () throws WSDLException;
/**
* Return the next sibling element of the given element. Null if no
@@ -100,7 +100,7 @@
*
* @return the next sibling element.
*/
- public ElementSource getNextSiblingElement() throws WSDLException;
+ public XMLElement getNextSiblingElement() throws WSDLException;
//TODO - other methods for accessing the element's contents?
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseWSDLReader.java Mon Oct 9 03:24:55 2006
@@ -15,7 +15,7 @@
*/
package org.apache.woden.internal;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
import org.apache.woden.WSDLFactory;
@@ -50,16 +50,16 @@
}
/**
- * Returns an ElementSource object representing the specified element
+ * Returns an XMLElement object representing the specified element
* object. The element object argument must be compatible with the
- * concrete reader implementation. If so, this method returns an ElementSource
+ * concrete reader implementation. If so, this method returns an XMLElement
* object that is type-compatible with the reader implementatation (e.g. a
- * DOMElementSource for DOMWSDLReader).
+ * DOMXMLElement for DOMWSDLReader).
*
* @throws IllegalArgumentException if elem is not a type recognized by the
* WSDLReader implementation.
*/
- abstract protected ElementSource createElementSource(Object elem) throws IllegalArgumentException;
+ abstract protected XMLElement createXMLElement(Object elem) throws IllegalArgumentException;
/**
* @return Returns the fErrorReporter.
Copied: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java (from r453547, incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseElementSource.java)
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java?view=diff&rev=454329&p1=incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseElementSource.java&r1=453547&p2=incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseElementSource.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/BaseXMLElement.java Mon Oct 9 03:24:55 2006
@@ -15,27 +15,23 @@
*/
package org.apache.woden.internal;
-import java.net.URI;
-
+import org.apache.woden.XMLElement;
import org.apache.woden.ErrorReporter;
-import org.apache.woden.WSDLException;
-import org.apache.woden.WSDLSource;
-import org.apache.woden.ElementSource;
/**
- * This abstract class implements methods of the ElementSource interface that are
+ * This abstract class implements methods of the XMLElement interface that are
* common across all concrete implementations.
*/
-public abstract class BaseElementSource implements ElementSource {
+public abstract class BaseXMLElement implements XMLElement {
protected Object fSource = null;
protected ErrorReporter fErrorReporter = null;
- protected BaseElementSource(ErrorReporter errorReporter) {
+ protected BaseXMLElement(ErrorReporter errorReporter) {
fErrorReporter = errorReporter;
}
- abstract public void setSource(Object elementSource) throws WSDLException;
+ abstract public void setSource(Object elem);
/**
* @return Returns the fSource.
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMWSDLReader.java Mon Oct 9 03:24:55 2006
@@ -29,7 +29,7 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.ErrorHandler;
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
@@ -1813,8 +1813,8 @@
if(xmlAttr != null) //TODO use an 'UnknownAttr' class in place of null
{
String attrValue = domAttr.getValue();
- //Wrap the domEl in DOMElementSource
- ElementSource domElSource = createElementSource(domEl);
+ //Wrap the domEl in DOMXMLElement
+ XMLElement domElSource = createXMLElement(domEl);
xmlAttr.init(domElSource, attrType, attrValue);
wsdlObj.setExtensionAttribute(attrType, xmlAttr);
}
@@ -1875,11 +1875,11 @@
ExtensionDeserializer extDS = extReg.queryDeserializer(parentType,
elementType);
- //Wrapping the el with an ElementSource
- ElementSource elementSource = new DOMElementSource(getErrorReporter());
- elementSource.setSource(el);
+ //Wrapping the el with an XMLElement
+ XMLElement xmlElement = new DOMXMLElement(getErrorReporter());
+ xmlElement.setSource(el);
- return extDS.unmarshall(parentType, parent, elementType, elementSource, desc, extReg);
+ return extDS.unmarshall(parentType, parent, elementType, xmlElement, desc, extReg);
}
catch (WSDLException e)
{
@@ -1898,12 +1898,12 @@
* ************************************************************/
/* (non-Javadoc)
- * @see org.apache.woden.internal.BaseWSDLReader#createElementSource(java.lang.Object)
+ * @see org.apache.woden.internal.BaseWSDLReader#createXMLElement(java.lang.Object)
*/
- protected ElementSource createElementSource(Object elem) {
- DOMElementSource domElementSource = new DOMElementSource(getErrorReporter());
- domElementSource.setSource(elem);
- return domElementSource;
+ protected XMLElement createXMLElement(Object elem) {
+ DOMXMLElement domXMLElement = new DOMXMLElement(getErrorReporter());
+ domXMLElement.setSource(elem);
+ return domXMLElement;
}
Copied: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java (from r453547, incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java)
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java?view=diff&rev=454329&p1=incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java&r1=453547&p2=incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMElementSource.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/DOMXMLElement.java Mon Oct 9 03:24:55 2006
@@ -18,7 +18,7 @@
import org.apache.woden.WSDLException;
import org.apache.woden.ErrorReporter;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.util.dom.XPathUtils;
import org.apache.woden.internal.util.dom.DOMUtils;
import org.w3c.dom.*;
@@ -27,29 +27,29 @@
import java.util.List;
import java.util.Vector;
-public class DOMElementSource extends BaseElementSource{
+public class DOMXMLElement extends BaseXMLElement{
private static final String ATTR_XMLNS = "xmlns";
- public DOMElementSource(ErrorReporter errorReporter) {
+ public DOMXMLElement(ErrorReporter errorReporter) {
super(errorReporter);
}
/*
- * @see org.apache.woden.ElementSource#setSource(java.lang.Object)
+ * @see org.apache.woden.XMLElement#setSource(java.lang.Object)
*/
- public void setSource(Object elementSource) {
+ public void setSource(Object elem) {
- if(elementSource instanceof Element) {
- fSource = elementSource;
+ if(elem instanceof Element) {
+ fSource = elem;
}
else {
- String sourceClass = (elementSource != null
- ? elementSource.getClass().getName()
+ String elemClass = (elem != null
+ ? elem.getClass().getName()
: null);
- String elemSourceClass = this.getClass().getName();
+ String xmlElementClass = this.getClass().getName();
String msg = fErrorReporter.getFormattedMessage(
- "WSDL019", new Object[] {sourceClass, elemSourceClass});
+ "WSDL019", new Object[] {elemClass, xmlElementClass});
throw new IllegalArgumentException(msg);
}
@@ -89,14 +89,14 @@
return null;
}
- public ElementSource getFirstChildElement() throws WSDLException {
- ElementSource elementSource = new DOMElementSource(getErrorReporter());
+ public XMLElement getFirstChildElement() throws WSDLException {
+ XMLElement xmlElement = new DOMXMLElement(getErrorReporter());
if (fSource instanceof Element){
Element el = (Element)fSource;
for (Node node = el.getFirstChild(); node!=null; node=node.getNextSibling()){
if (node.getNodeType() == Node.ELEMENT_NODE){
- elementSource.setSource(node);
- return elementSource;
+ xmlElement.setSource(node);
+ return xmlElement;
}
}
}
@@ -144,14 +144,14 @@
return null;
}
- public ElementSource getNextSiblingElement() throws WSDLException {
- ElementSource elementSource = new DOMElementSource(getErrorReporter());
+ public XMLElement getNextSiblingElement() throws WSDLException {
+ XMLElement xmlElement = new DOMXMLElement(getErrorReporter());
if (fSource instanceof Element){
Element el = (Element)fSource;
for (Node node = el.getNextSibling (); node != null; node = node.getNextSibling ()) {
if (node.getNodeType() == Node.ELEMENT_NODE){
- elementSource.setSource(node);
- return elementSource;
+ xmlElement.setSource(node);
+ return xmlElement;
}
}
}
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/Messages.properties Mon Oct 9 03:24:55 2006
@@ -52,7 +52,7 @@
WSDL016=The Java class "{0}" does not implement the "ComponentExtensions" interface.
WSDL017=WSDL source represented by the type "{0}" cannot be read by the WSDLReader implementation class "{1}".
WSDL018=WSDL cannot be represented by the type "{0}" in the WSDLSource implementation class "{1}".
-WSDL019=A WSDL element cannot be represented by the type "{0}" in the ElementSource implementation class "{1}".
+WSDL019=A WSDL element cannot be represented by the type "{0}" in the XMLElement implementation class "{1}".
# ------------ Parsing errors -------------------
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMWSDLReader.java Mon Oct 9 03:24:55 2006
@@ -31,7 +31,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.ErrorHandler;
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
@@ -1455,10 +1455,10 @@
return null;
}
- protected ElementSource createElementSource(Object elem) {
- OMElementSource omElementSource = new OMElementSource(getErrorReporter());
- omElementSource.setSource(elem);
- return omElementSource;
+ protected XMLElement createXMLElement(Object elem) {
+ OMXMLElement omXMLElement = new OMXMLElement(getErrorReporter());
+ omXMLElement.setSource(elem);
+ return omXMLElement;
}
Copied: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMXMLElement.java (from r453547, incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java)
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMXMLElement.java?view=diff&rev=454329&p1=incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java&r1=453547&p2=incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMXMLElement.java&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMElementSource.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/OMXMLElement.java Mon Oct 9 03:24:55 2006
@@ -18,7 +18,7 @@
import org.apache.woden.WSDLException;
import org.apache.woden.ErrorReporter;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.axiom.om.OMElement;
import javax.xml.namespace.QName;
@@ -26,27 +26,27 @@
import java.util.Vector;
import java.util.Iterator;
-public class OMElementSource extends BaseElementSource{
+public class OMXMLElement extends BaseXMLElement{
- public OMElementSource(ErrorReporter errorReporter) {
+ public OMXMLElement(ErrorReporter errorReporter) {
super(errorReporter);
}
/*
- * @see org.apache.woden.ElementSource#setSource(java.lang.Object)
+ * @see org.apache.woden.XMLElement#setSource(java.lang.Object)
*/
- public void setSource(Object elementSource) {
+ public void setSource(Object elem) {
- if(elementSource instanceof OMElement) {
- fSource = elementSource;
+ if(elem instanceof OMElement) {
+ fSource = elem;
}
else {
- String sourceClass = (elementSource != null
- ? elementSource.getClass().getName()
+ String elemClass = (elem != null
+ ? elem.getClass().getName()
: null);
- String elemSourceClass = this.getClass().getName();
+ String xmlElementClass = this.getClass().getName();
String msg = fErrorReporter.getFormattedMessage(
- "WSDL019", new Object[] {sourceClass, elemSourceClass});
+ "WSDL019", new Object[] {elemClass, xmlElementClass});
throw new IllegalArgumentException(msg);
}
@@ -75,12 +75,12 @@
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public ElementSource getFirstChildElement() throws WSDLException {
+ public XMLElement getFirstChildElement() throws WSDLException {
if (fSource instanceof OMElement){
OMElement elem = (OMElement)fSource;
- OMElementSource omElementSource = new OMElementSource(getErrorReporter());
- omElementSource.setSource(elem.getFirstElement());
- return omElementSource;
+ OMXMLElement omXMLElement = new OMXMLElement(getErrorReporter());
+ omXMLElement.setSource(elem.getFirstElement());
+ return omXMLElement;
}
return null;
}
@@ -120,12 +120,12 @@
return null;
}
- public ElementSource getNextSiblingElement() throws WSDLException {
+ public XMLElement getNextSiblingElement() throws WSDLException {
if (fSource instanceof OMElement){
OMElement elem = (OMElement)fSource;
- OMElementSource omElementSource = new OMElementSource(getErrorReporter());
- omElementSource.setSource(elem.getNextOMSibling());
- return omElementSource;
+ OMXMLElement omXMLElement = new OMXMLElement(getErrorReporter());
+ omXMLElement.setSource(elem.getNextOMSibling());
+ return omXMLElement;
}
return null;
}
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/util/QNameUtils.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/util/QNameUtils.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/util/QNameUtils.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/util/QNameUtils.java Mon Oct 9 03:24:55 2006
@@ -19,21 +19,21 @@
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
-import org.apache.woden.ElementSource;
-import org.apache.woden.internal.DOMElementSource;
-import org.apache.woden.internal.OMElementSource;
+import org.apache.woden.XMLElement;
+import org.apache.woden.internal.DOMXMLElement;
+import org.apache.woden.internal.OMXMLElement;
import org.apache.woden.internal.util.dom.DOMQNameUtils;
import org.apache.woden.internal.util.om.OMQNameUtils;
import org.w3c.dom.Element;
public class QNameUtils {
- public static boolean matches(QName qname, ElementSource elementSource){
- if (elementSource instanceof DOMElementSource){
- return DOMQNameUtils.matches(qname, (Element)elementSource.getSource());
+ public static boolean matches(QName qname, XMLElement xmlElement){
+ if (xmlElement instanceof DOMXMLElement){
+ return DOMQNameUtils.matches(qname, (Element)xmlElement.getSource());
}
- else if (elementSource instanceof OMElementSource){
- return OMQNameUtils.matches(qname, (OMElement)elementSource.getSource());
+ else if (xmlElement instanceof OMXMLElement){
+ return OMQNameUtils.matches(qname, (OMElement)xmlElement.getSource());
}
//TODO: Should probably throw an IllegalArgumentException here
return false;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPHeaderDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPHeaderDeserializer.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPHeaderDeserializer.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPHeaderDeserializer.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.wsdl20.extensions.ExtensionDeserializer;
@@ -45,7 +45,7 @@
public ExtensionElement unmarshall(Class parentType,
Object parent,
QName extType,
- ElementSource extEl,
+ XMLElement extEl,
DescriptionElement desc,
ExtensionRegistry extReg)
throws WSDLException
@@ -81,7 +81,7 @@
return httpHdr;
}
- private DocumentationElement parseDocumentation(ElementSource docEl,
+ private DocumentationElement parseDocumentation(XMLElement docEl,
DocumentableElement parent)
throws WSDLException
{
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPHeaderBlockDeserializer.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.internal.util.QNameUtils;
import org.apache.woden.internal.wsdl20.Constants;
@@ -47,7 +47,7 @@
public ExtensionElement unmarshall(Class parentType,
Object parent,
QName extType,
- ElementSource extEl,
+ XMLElement extEl,
DescriptionElement desc,
ExtensionRegistry extReg)
throws WSDLException
@@ -85,7 +85,7 @@
//TODO parseExtensionAttributes(el, SOAPHeaderBlockElement.class, soapHdr, desc);
- ElementSource tempEl = extEl.getFirstChildElement();
+ XMLElement tempEl = extEl.getFirstChildElement();
while (tempEl != null)
{
@@ -103,7 +103,7 @@
return soapHdr;
}
- private DocumentationElement parseDocumentation(ElementSource docEl,
+ private DocumentationElement parseDocumentation(XMLElement docEl,
DocumentableElement parent)
throws WSDLException
{
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPModuleDeserializer.java Mon Oct 9 03:24:55 2006
@@ -22,7 +22,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.internal.util.QNameUtils;
import org.apache.woden.internal.wsdl20.Constants;
@@ -50,7 +50,7 @@
public ExtensionElement unmarshall(Class parentType,
Object parent,
QName elementType,
- ElementSource el,
+ XMLElement el,
DescriptionElement desc,
ExtensionRegistry extReg)
throws WSDLException
@@ -84,7 +84,7 @@
//TODO parseExtensionAttributes(el, SOAPModuleElement.class, soapMod, desc);
- ElementSource tempEl = el.getFirstChildElement();
+ XMLElement tempEl = el.getFirstChildElement();
while (tempEl != null)
{
@@ -102,7 +102,7 @@
return soapMod;
}
- private DocumentationElement parseDocumentation(ElementSource docEl,
+ private DocumentationElement parseDocumentation(XMLElement docEl,
DocumentableElement parent)
throws WSDLException
{
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/ArgumentArrayAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -23,7 +23,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.internal.util.StringUtils;
import org.apache.woden.wsdl20.extensions.rpc.Argument;
@@ -47,7 +47,7 @@
* This ctor is not used for extension attributes, but may be useful if
* parsing of native attributes is changed to use the XMLAttr interface.
*/
- protected ArgumentArrayAttrImpl(ElementSource ownerEl, QName attrType,
+ protected ArgumentArrayAttrImpl(XMLElement ownerEl, QName attrType,
String attrValue, ErrorReporter errRpt) throws WSDLException {
super(ownerEl, attrType, attrValue, errRpt);
@@ -63,7 +63,7 @@
return (Argument[]) getContent();
}
- protected Object convert(ElementSource ownerEl, String attrValue)
+ protected Object convert(XMLElement ownerEl, String attrValue)
throws WSDLException {
setValid(false);
@@ -109,7 +109,7 @@
return null;
}
- private QName convertQName(ElementSource ownerEl, String qnameStr)
+ private QName convertQName(XMLElement ownerEl, String qnameStr)
throws WSDLException {
QName qname = null;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/BooleanAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/BooleanAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/BooleanAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/BooleanAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.xml.BooleanAttr;
@@ -39,7 +39,7 @@
* TODO This ctor is not used for extension attributes, but may be useful if
* parsing of native WSDL attributes is changed to use the XMLAttr interface.
*/
- public BooleanAttrImpl(ElementSource ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
+ public BooleanAttrImpl(XMLElement ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
throws WSDLException
{
super(ownerEl, attrType, attrValue, errRpt);
@@ -63,7 +63,7 @@
* Any conversion error will be reported and will initialize the Boolean to false.
* If the attrValue does not match the Boolean value the Attr is marked invalid.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
Boolean bool = Boolean.valueOf(attrValue);
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/HTTPAuthenicationSchemeAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -17,7 +17,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.wsdl20.extensions.http.HTTPAuthenticationScheme;
import org.apache.woden.xml.HTTPAuthenticationSchemeAttr;
@@ -37,7 +37,7 @@
* @see org.apache.woden.internal.xml.XMLAttrImpl#convert(org.w3c.dom.Element,
* java.lang.String)
*/
- protected Object convert(ElementSource ownerEl, String attrValue)
+ protected Object convert(XMLElement ownerEl, String attrValue)
throws WSDLException {
// TODO: define correct error numbers
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/IntOrTokenAnyAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/IntOrTokenAnyAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/IntOrTokenAnyAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/IntOrTokenAnyAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -17,7 +17,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.xml.IntOrTokenAttr;
@@ -87,7 +87,7 @@
* A null argument will return a null value.
* Any conversion error will be reported and a null value will be returned.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
//First, check if the attribute contains the xs:token '#any'.
if("#any".equals(attrValue)) return attrValue;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.xml.QNameAttr;
@@ -36,7 +36,7 @@
* TODO This ctor is not used for extension attributes, but may be useful if
* parsing of native WSDL attributes is changed to use the XMLAttr interface.
*/
- public QNameAttrImpl(ElementSource ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
+ public QNameAttrImpl(XMLElement ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
throws WSDLException
{
super(ownerEl, attrType, attrValue, errRpt);
@@ -59,7 +59,7 @@
* A a null argument will return a null value.
* Any conversion error will be reported and a null value will be returned.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
Exception ex = null;
QName qn = null;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -23,7 +23,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.internal.util.StringUtils;
import org.apache.woden.xml.QNameListAttr;
@@ -42,7 +42,7 @@
* TODO This ctor is not used for extension attributes, but may be useful if
* parsing of native WSDL attributes is changed to use the XMLAttr interface.
*/
- public QNameListAttrImpl(ElementSource ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
+ public QNameListAttrImpl(XMLElement ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
throws WSDLException
{
super(ownerEl, attrType, attrValue, errRpt);
@@ -68,7 +68,7 @@
* be converted, but the object will be marked invalid. If no QName strings can
* be converted, a null value will be returned.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
if(attrValue == null || "".equals(attrValue))
{
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameListOrTokenAnyAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -23,7 +23,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.internal.util.StringUtils;
import org.apache.woden.xml.QNameListOrTokenAttr;
@@ -96,7 +96,7 @@
* A null argument will return a null value.
* Any conversion error will be reported and a null value will be returned.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
//First, check if the attribute contains the xs:token '#any'.
if("#any".equals(attrValue)) return attrValue;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameOrTokenAnyAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameOrTokenAnyAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameOrTokenAnyAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/QNameOrTokenAnyAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.xml.QNameOrTokenAttr;
@@ -91,7 +91,7 @@
* A null argument will return a null value.
* Any conversion error will be reported and a null value will be returned.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
//First, check if the attribute contains the xs:token '#any'.
if("#any".equals(attrValue)) return attrValue;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/StringAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/StringAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/StringAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/StringAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.xml.StringAttr;
@@ -37,7 +37,7 @@
* TODO This ctor is not used for extension attributes, but may be useful if
* parsing of native WSDL attributes is changed to use the XMLAttr interface.
*/
- public StringAttrImpl(ElementSource ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
+ public StringAttrImpl(XMLElement ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
throws WSDLException
{
super(ownerEl, attrType, attrValue, errRpt);
@@ -60,7 +60,7 @@
* A null argument will return a null value.
* Any conversion error will be reported and a null value will be returned.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
if(attrValue == null)
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/TokenAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/TokenAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/TokenAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/TokenAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.xml.TokenAttr;
@@ -40,7 +40,7 @@
* TODO This ctor is not used for extension attributes, but may be useful if
* parsing of native WSDL attributes is changed to use the XMLAttr interface.
*/
- public TokenAttrImpl(ElementSource ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
+ public TokenAttrImpl(XMLElement ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
throws WSDLException
{
super(ownerEl, attrType, attrValue, errRpt);
@@ -63,7 +63,7 @@
* A null argument will return a null value.
* Any conversion error will be reported and a null value will be returned.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
if(attrValue == null)
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/URIAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/URIAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/URIAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/URIAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -22,7 +22,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorLocatorImpl;
import org.apache.woden.xml.URIAttr;
@@ -39,7 +39,7 @@
* TODO This ctor is not used for extension attributes, but may be useful if
* parsing of native WSDL attributes is changed to use the XMLAttr interface.
*/
- public URIAttrImpl(ElementSource ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
+ public URIAttrImpl(XMLElement ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
throws WSDLException
{
super(ownerEl, attrType, attrValue, errRpt);
@@ -63,7 +63,7 @@
* A null argument will return a null value.
* Any conversion error will be reported and a null value will be returned.
*/
- protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException
+ protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException
{
Exception ex = null;
URI uri = null;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/XMLAttrImpl.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/XMLAttrImpl.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/XMLAttrImpl.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/internal/xml/XMLAttrImpl.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorReporterImpl;
import org.apache.woden.xml.XMLAttr;
@@ -43,7 +43,7 @@
* This ctor is not used for extension attributes, but may be useful if
* parsing of native attributes is changed to use the XMLAttr interface.
*/
- protected XMLAttrImpl(ElementSource ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
+ protected XMLAttrImpl(XMLElement ownerEl, QName attrType, String attrValue, ErrorReporter errRpt)
throws WSDLException
{
fErrorReporter = errRpt;
@@ -58,7 +58,7 @@
fErrorReporter = errRpt;
}
- public void init(ElementSource ownerEl, QName attrType, String attrValue) throws WSDLException
+ public void init(XMLElement ownerEl, QName attrType, String attrValue) throws WSDLException
{
fAttrType = attrType;
fExternalForm = attrValue;
@@ -86,7 +86,7 @@
* Non-API implementation methods
* ************************************************************/
- abstract protected Object convert(ElementSource ownerEl, String attrValue) throws WSDLException;
+ abstract protected Object convert(XMLElement ownerEl, String attrValue) throws WSDLException;
protected ErrorReporter getErrorReporter() throws WSDLException
{
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/ExtensionDeserializer.java Mon Oct 9 03:24:55 2006
@@ -18,7 +18,7 @@
import javax.xml.namespace.QName;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.wsdl20.xml.DescriptionElement;
/**
@@ -53,7 +53,7 @@
public ExtensionElement unmarshall(Class parentType,
Object parent,
QName extType,
- ElementSource extEl,
+ XMLElement extEl,
DescriptionElement desc,
ExtensionRegistry extReg)
throws WSDLException;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java Mon Oct 9 03:24:55 2006
@@ -18,7 +18,7 @@
import javax.xml.namespace.QName;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
//TODO remove internals from the API: import org.apache.woden.internal.util.dom.DOMUtils;
//TODO remove internals from the API: import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.wsdl20.xml.DescriptionElement;
@@ -41,7 +41,7 @@
public ExtensionElement unmarshall(Class parentType,
Object parent,
QName extType,
- ElementSource extEl,
+ XMLElement extEl,
DescriptionElement desc,
ExtensionRegistry extReg)
throws WSDLException
@@ -69,14 +69,14 @@
//Method copied from DOMUtils, to avoid using internal classes
//here in the API packages (it was breaking the API build).
- //TODO workaround for M2, replace with new ElementSource behaviour.
- private String getAttributeNS (ElementSource elementSource,
+ //TODO workaround for M2, replace with new XMLElement behaviour.
+ private String getAttributeNS (XMLElement xmlElement,
String namespaceURI,
String localPart) {
String sRet = null;
- if (elementSource.getSource() instanceof Element){
- Element el = (Element)elementSource.getSource();
+ if (xmlElement.getSource() instanceof Element){
+ Element el = (Element)xmlElement.getSource();
Attr attr = el.getAttributeNodeNS (namespaceURI, localPart);
if (attr != null) {
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/wsdl20/extensions/UnknownExtensionElement.java Mon Oct 9 03:24:55 2006
@@ -15,7 +15,7 @@
*/
package org.apache.woden.wsdl20.extensions;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import javax.xml.namespace.*;
@@ -35,7 +35,7 @@
protected QName elementQN = null;
// Uses the wrapper type so we can tell if it was set or not.
protected Boolean required = null;
- protected ElementSource element = null;
+ protected XMLElement element = null;
/**
* Set the type of this extensibility element.
@@ -80,7 +80,7 @@
*
* @param element the unknown element that was encountered
*/
- public void setElement(ElementSource element)
+ public void setElement(XMLElement element)
{
this.element = element;
}
@@ -90,7 +90,7 @@
*
* @return the unknown element that was encountered
*/
- public ElementSource getElement()
+ public XMLElement getElement()
{
return element;
}
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/UnknownAttr.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/UnknownAttr.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/UnknownAttr.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/UnknownAttr.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
/**
* This class represents extension attributes (those not in the WSDL namespace)
@@ -44,7 +44,7 @@
/* (non-Javadoc)
* @see org.apache.woden.xml.XMLAttr#init(org.w3c.dom.Element, java.lang.String)
*/
- public void init(ElementSource ownerEl, QName attrType, String attrValue) throws WSDLException
+ public void init(XMLElement ownerEl, QName attrType, String attrValue) throws WSDLException
{
fAttrType = attrType;
fExternalForm = attrValue;
Modified: incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/XMLAttr.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/XMLAttr.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/XMLAttr.java (original)
+++ incubator/woden/branches/WODEN-44/src/org/apache/woden/xml/XMLAttr.java Mon Oct 9 03:24:55 2006
@@ -19,7 +19,7 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
/**
* This interface represents an XML attribute information item. It can be initialized
@@ -42,7 +42,7 @@
*
* @throws WSDLException if conversion errors occur
*/
- public void init(ElementSource ownerEl, QName attrType, String attrValue) throws WSDLException;
+ public void init(XMLElement ownerEl, QName attrType, String attrValue) throws WSDLException;
public QName getAttributeType();
Copied: incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMXMLElementTest.java (from r453547, incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java)
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMXMLElementTest.java?view=diff&rev=454329&p1=incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java&r1=453547&p2=incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMXMLElementTest.java&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMElementSourceTest.java (original)
+++ incubator/woden/branches/WODEN-44/test/org/apache/woden/DOMXMLElementTest.java Mon Oct 9 03:24:55 2006
@@ -27,13 +27,13 @@
import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
import org.apache.xerces.parsers.DOMParser;
-import org.apache.woden.internal.DOMElementSource;
+import org.apache.woden.internal.DOMXMLElement;
import org.apache.woden.internal.ErrorReporterImpl;
import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.internal.util.dom.DOMQNameUtils;
import org.apache.woden.internal.util.dom.DOMUtils;
-public class DOMElementSourceTest extends TestCase {
+public class DOMXMLElementTest extends TestCase {
private URL wsdlURL = getClass().getClassLoader().getResource("org/apache/woden/primer-hotelReservationService.wsdl");
private InputSource inputSource = new InputSource(wsdlURL.toString());
@@ -41,7 +41,7 @@
private Element elem = null;
public static Test suite(){
- return new TestSuite(DOMElementSourceTest.class);
+ return new TestSuite(DOMXMLElementTest.class);
}
protected void setUp() throws Exception{
@@ -65,25 +65,25 @@
public void testGetFirstChildElement() throws WSDLException {
- DOMElementSource domElementSource = new DOMElementSource(errorReporter);
- domElementSource.setSource(elem);
- assertNotNull(domElementSource.getFirstChildElement());
+ DOMXMLElement domXMLElement = new DOMXMLElement(errorReporter);
+ domXMLElement.setSource(elem);
+ assertNotNull(domXMLElement.getFirstChildElement());
}
public void testGetAttributes() throws WSDLException {
//The <binding> element in the hotelReservation WSDL has many attributes
//So, let's test with that element
- DOMElementSource domElementSource = new DOMElementSource(errorReporter);
- domElementSource.setSource(elem);
+ DOMXMLElement domXMLElement = new DOMXMLElement(errorReporter);
+ domXMLElement.setSource(elem);
Object obj;
Element tempEl;
- if ((obj = domElementSource.getFirstChildElement().getSource()) instanceof Element){
+ if ((obj = domXMLElement.getFirstChildElement().getSource()) instanceof Element){
tempEl = (Element)obj;
while (tempEl != null){
if (DOMQNameUtils.matches(Constants.Q_ELEM_BINDING, tempEl)){
- domElementSource.setSource(tempEl);
- assertNotNull(domElementSource.getAttributes());
+ domXMLElement.setSource(tempEl);
+ assertNotNull(domXMLElement.getAttributes());
}
tempEl = DOMUtils.getNextSiblingElement(tempEl);
}
@@ -93,16 +93,16 @@
public void testGetAttribute() throws WSDLException {
//The <binding> element in the hotelReservation WSDL has many attributes
//So, let's test with that element
- DOMElementSource domElementSource = new DOMElementSource(errorReporter);
- domElementSource.setSource(elem);
+ DOMXMLElement domXMLElement = new DOMXMLElement(errorReporter);
+ domXMLElement.setSource(elem);
Object obj;
Element tempEl;
- if ((obj = domElementSource.getFirstChildElement().getSource()) instanceof Element){
+ if ((obj = domXMLElement.getFirstChildElement().getSource()) instanceof Element){
tempEl = (Element)obj;
while (tempEl != null){
if (DOMQNameUtils.matches(Constants.Q_ELEM_BINDING, tempEl)){
- domElementSource.setSource(tempEl);
- assertNotNull(domElementSource.getAttribute("name"));
+ domXMLElement.setSource(tempEl);
+ assertNotNull(domXMLElement.getAttribute("name"));
}
tempEl = DOMUtils.getNextSiblingElement(tempEl);
}
@@ -110,16 +110,16 @@
}
public void testGetQName() throws WSDLException {
- DOMElementSource domElementSource = new DOMElementSource(errorReporter);
- domElementSource.setSource(elem);
+ DOMXMLElement domXMLElement = new DOMXMLElement(errorReporter);
+ domXMLElement.setSource(elem);
Object obj;
Element tempEl;
- if ((obj = domElementSource.getSource()) instanceof Element){
+ if ((obj = domXMLElement.getSource()) instanceof Element){
tempEl = (Element)obj;
while (tempEl != null){
if (DOMQNameUtils.matches(Constants.Q_ELEM_BINDING, tempEl)){
- domElementSource.setSource(tempEl);
- assertNotNull(domElementSource.getQName("wsoap:protocol"));
+ domXMLElement.setSource(tempEl);
+ assertNotNull(domXMLElement.getQName("wsoap:protocol"));
}
tempEl = DOMUtils.getNextSiblingElement(tempEl);
}
Copied: incubator/woden/branches/WODEN-44/test/org/apache/woden/OMXMLElementTest.java (from r453547, incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java)
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/OMXMLElementTest.java?view=diff&rev=454329&p1=incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java&r1=453547&p2=incubator/woden/branches/WODEN-44/test/org/apache/woden/OMXMLElementTest.java&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/test/org/apache/woden/OMElementSourceTest.java (original)
+++ incubator/woden/branches/WODEN-44/test/org/apache/woden/OMXMLElementTest.java Mon Oct 9 03:24:55 2006
@@ -23,21 +23,21 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.woden.internal.OMElementSource;
+import org.apache.woden.internal.OMXMLElement;
import org.apache.woden.internal.ErrorReporterImpl;
import org.apache.woden.internal.wsdl20.Constants;
import org.apache.woden.internal.util.om.OMQNameUtils;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-public class OMElementSourceTest extends TestCase {
+public class OMXMLElementTest extends TestCase {
private URL wsdlURL = getClass().getClassLoader().getResource("org/apache/woden/primer-hotelReservationService.wsdl");
private ErrorReporter errorReporter;
private OMElement elem = null;
public static Test suite(){
- return new TestSuite(DOMElementSourceTest.class);
+ return new TestSuite(DOMXMLElementTest.class);
}
protected void setUp() throws Exception{
@@ -53,45 +53,45 @@
}
public void testGetFirstChildElement() throws WSDLException {
- OMElementSource omElementSource = new OMElementSource(errorReporter);
- omElementSource.setSource(elem);
- assertNotNull(omElementSource.getFirstChildElement());
+ OMXMLElement omXMLElement = new OMXMLElement(errorReporter);
+ omXMLElement.setSource(elem);
+ assertNotNull(omXMLElement.getFirstChildElement());
}
public void testGetAttributes() throws WSDLException {
//The <binding> element in the hotelReservation WSDL has many attributes
//So, let's test with that element
- OMElementSource omElementSource = new OMElementSource(errorReporter);
- omElementSource.setSource(elem);
+ OMXMLElement omXMLElement = new OMXMLElement(errorReporter);
+ omXMLElement.setSource(elem);
Object obj;
OMElement tempEl;
- if ((obj = omElementSource.getSource()) instanceof OMElement){
+ if ((obj = omXMLElement.getSource()) instanceof OMElement){
tempEl = (OMElement)obj;
Iterator childEls = tempEl.getChildElements();
while (childEls.hasNext()){
OMElement childEl = (OMElement) childEls.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_BINDING, childEl)){
- omElementSource.setSource(childEl);
- assertNotNull(omElementSource.getAttributes());
+ omXMLElement.setSource(childEl);
+ assertNotNull(omXMLElement.getAttributes());
}
}
}
}
public void testGetAttribute() throws WSDLException {
- OMElementSource omElementSource = new OMElementSource(errorReporter);
- omElementSource.setSource(elem);
+ OMXMLElement omXMLElement = new OMXMLElement(errorReporter);
+ omXMLElement.setSource(elem);
Object obj;
OMElement tempEl;
- if ((obj = omElementSource.getSource()) instanceof OMElement){
+ if ((obj = omXMLElement.getSource()) instanceof OMElement){
tempEl = (OMElement)obj;
Iterator childEls = tempEl.getChildElements();
while (childEls.hasNext()){
OMElement childEl = (OMElement) childEls.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_BINDING, childEl)){
- omElementSource.setSource(childEl);
- assertNotNull(omElementSource.getAttribute("name"));
+ omXMLElement.setSource(childEl);
+ assertNotNull(omXMLElement.getAttribute("name"));
break;
}
@@ -101,18 +101,18 @@
}
public void testGetQName() throws WSDLException {
- OMElementSource omElementSource = new OMElementSource(errorReporter);
- omElementSource.setSource(elem);
+ OMXMLElement omXMLElement = new OMXMLElement(errorReporter);
+ omXMLElement.setSource(elem);
Object obj;
OMElement tempEl;
- if ((obj = omElementSource.getSource()) instanceof OMElement){
+ if ((obj = omXMLElement.getSource()) instanceof OMElement){
tempEl = (OMElement)obj;
Iterator childEls = tempEl.getChildElements();
while (childEls.hasNext()){
OMElement childEl = (OMElement) childEls.next();
if (OMQNameUtils.matches(Constants.Q_ELEM_BINDING, childEl)){
- omElementSource.setSource(childEl);
- assertNotNull(omElementSource.getQName("wsoap:protocol"));
+ omXMLElement.setSource(childEl);
+ assertNotNull(omXMLElement.getQName("wsoap:protocol"));
}
}
}
Modified: incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java (original)
+++ incubator/woden/branches/WODEN-44/test/org/apache/woden/tests/AllWodenTestsDOM.java Mon Oct 9 03:24:55 2006
@@ -22,7 +22,7 @@
import org.apache.woden.WSDLFactoryTest;
import org.apache.woden.WSDLReaderTest;
-import org.apache.woden.DOMElementSourceTest;
+import org.apache.woden.DOMXMLElementTest;
import org.apache.woden.internal.ReaderFeaturesTest;
import org.apache.woden.internal.wsdl20.validation.WSDLComponentValidatorTest;
import org.apache.woden.internal.wsdl20.validation.WSDLDocumentValidatorTest;
@@ -79,7 +79,7 @@
addTest(WSDLFactoryTest.suite());
addTest(WSDLReaderTest.suite());
- addTest(DOMElementSourceTest.suite());
+ addTest(DOMXMLElementTest.suite());
addTest(W3CTestSuiteTest.suite());
addTestSuite(ReaderFeaturesTest.class);
addTest(WSDLDocumentValidatorTest.suite());
Modified: incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/IntOrTokenAttrTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/IntOrTokenAttrTest.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/IntOrTokenAttrTest.java (original)
+++ incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/IntOrTokenAttrTest.java Mon Oct 9 03:24:55 2006
@@ -23,7 +23,7 @@
import org.apache.woden.ErrorInfo;
import org.apache.woden.ErrorReporter;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorReporterImpl;
import org.apache.woden.internal.xml.IntOrTokenAnyAttrImpl;
import org.apache.woden.tests.TestErrorHandler;
@@ -38,7 +38,7 @@
{
private ErrorReporter reporter;
private TestErrorHandler handler;
- private ElementSource el = null; //Element arg not used to initialize this attr
+ private XMLElement el = null; //Element arg not used to initialize this attr
private QName qn = new QName("http://wsdl/http","code","whttp");
private IntOrTokenAttr attr = null;
Modified: incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/TokenAttrTest.java
URL: http://svn.apache.org/viewvc/incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/TokenAttrTest.java?view=diff&rev=454329&r1=454328&r2=454329
==============================================================================
--- incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/TokenAttrTest.java (original)
+++ incubator/woden/branches/WODEN-44/test/org/apache/woden/xml/TokenAttrTest.java Mon Oct 9 03:24:55 2006
@@ -23,7 +23,7 @@
import org.apache.woden.ErrorInfo;
import org.apache.woden.ErrorReporter;
-import org.apache.woden.ElementSource;
+import org.apache.woden.XMLElement;
import org.apache.woden.internal.ErrorReporterImpl;
import org.apache.woden.internal.xml.TokenAttrImpl;
import org.apache.woden.tests.TestErrorHandler;
@@ -38,7 +38,7 @@
{
private ErrorReporter reporter;
private TestErrorHandler handler;
- private ElementSource el = null; //Element arg not used to initialize this attr
+ private XMLElement el = null; //Element arg not used to initialize this attr
private QName qn = new QName("http://wsdl/http","authenticationType","whttp");
private TokenAttr attr = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org