You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2011/08/29 23:10:15 UTC
svn commit: r1163007 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/om/impl/ axiom-common-impl/
axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/
axiom-common-impl/src/test/ axiom-common-i...
Author: veithen
Date: Mon Aug 29 21:10:13 2011
New Revision: 1163007
URL: http://svn.apache.org/viewvc?rev=1163007&view=rev
Log:
* Share the OMNamespace implementation class between LLOM and DOOM.
* Deprecated the OMNamespace implementation class in axiom-api. Rationale: OMNamespace objects should always be created using OMFactory#createOMNamespace and the implementation class should not be part of the public API.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java
- copied, changed from r1162944, webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/om/
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/om/impl/
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/om/impl/common/
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java
- copied, changed from r1162944, webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NamespaceImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMNamespaceImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java Mon Aug 29 21:10:13 2011
@@ -19,9 +19,14 @@
package org.apache.axiom.om.impl;
+import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-/** Class OMNamespaceImpl */
+/**
+ * @deprecated {@link OMNamespace} instances should always be created using
+ * {@link OMFactory#createOMNamespace(String, String)}. This class will be removed in
+ * Axiom 1.3.
+ */
public class OMNamespaceImpl implements OMNamespace {
/** Field prefix */
private final String prefix;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/pom.xml?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/pom.xml Mon Aug 29 21:10:13 2011
@@ -44,5 +44,10 @@
<artifactId>axiom-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Copied: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java (from r1162944, webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java&r1=1162944&r2=1163007&rev=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/OMNamespaceImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java Mon Aug 29 21:10:13 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.axiom.om.impl;
+package org.apache.axiom.om.impl.common;
import org.apache.axiom.om.OMNamespace;
Copied: webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java (from r1162944, webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java&r1=1162944&r2=1163007&rev=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/llom/OMNamespaceImplTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-common-impl/src/test/java/org/apache/axiom/om/impl/common/OMNamespaceImplTest.java Mon Aug 29 21:10:13 2011
@@ -17,10 +17,9 @@
* under the License.
*/
-package org.apache.axiom.om.impl.llom;
+package org.apache.axiom.om.impl.common;
import junit.framework.TestCase;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
import java.lang.reflect.Field;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/AttrImpl.java Mon Aug 29 21:10:13 2011
@@ -27,6 +27,7 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
@@ -50,7 +51,7 @@ public class AttrImpl extends NodeImpl i
private String attrType;
/** Attribute namespace */
- private NamespaceImpl namespace;
+ private OMNamespaceImpl namespace;
/** Flag to indicate whether this attr is used or not */
private boolean used;
@@ -71,7 +72,7 @@ public class AttrImpl extends NodeImpl i
this.attrName = localName;
this.attrValue = new TextImpl(ownerDocument, value, factory);
this.attrType = OMConstants.XMLATTRTYPE_CDATA;
- this.namespace = (NamespaceImpl) ns;
+ this.namespace = (OMNamespaceImpl) ns;
}
public AttrImpl(DocumentImpl ownerDocument, String name, String value,
@@ -87,7 +88,7 @@ public class AttrImpl extends NodeImpl i
this.attrName = name;
//If this is a default namespace attr
if (OMConstants.XMLNS_NS_PREFIX.equals(name)) {
- this.namespace = new NamespaceImpl(
+ this.namespace = new OMNamespaceImpl(
OMConstants.XMLNS_NS_URI, OMConstants.XMLNS_NS_PREFIX);
}
this.attrType = OMConstants.XMLATTRTYPE_CDATA;
@@ -97,7 +98,7 @@ public class AttrImpl extends NodeImpl i
OMNamespace namespace, OMFactory factory) {
super(ownerDocument, factory);
this.attrName = localName;
- this.namespace = (NamespaceImpl) namespace;
+ this.namespace = (OMNamespaceImpl) namespace;
this.attrType = OMConstants.XMLATTRTYPE_CDATA;
}
@@ -272,7 +273,7 @@ public class AttrImpl extends NodeImpl i
* @see org.apache.axiom.om.OMAttribute#setOMNamespace (org.apache.axiom.om.OMNamespace)
*/
public void setOMNamespace(OMNamespace omNamespace) {
- this.namespace = (NamespaceImpl) omNamespace;
+ this.namespace = (OMNamespaceImpl) omNamespace;
}
/**
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DOMImplementationImpl.java Mon Aug 29 21:10:13 2011
@@ -19,6 +19,7 @@
package org.apache.axiom.om.impl.dom;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
@@ -42,7 +43,7 @@ public class DOMImplementationImpl imple
fac.setDocument(doc);
new ElementImpl(doc, DOMUtil.getLocalName(qualifiedName),
- new NamespaceImpl(namespaceURI, DOMUtil
+ new OMNamespaceImpl(namespaceURI, DOMUtil
.getPrefix(qualifiedName)), fac);
return doc;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/DocumentImpl.java Mon Aug 29 21:10:13 2011
@@ -31,6 +31,7 @@ import org.apache.axiom.om.OMXMLParserWr
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.common.OMDocumentImplUtil;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
@@ -177,7 +178,7 @@ public class DocumentImpl extends Parent
return this.createAttribute(localName);
}
- return new AttrImpl(this, localName, new NamespaceImpl(
+ return new AttrImpl(this, localName, new OMNamespaceImpl(
namespaceURI, prefix), this.factory);
}
@@ -214,7 +215,7 @@ public class DocumentImpl extends Parent
this.checkQName(prefix, localName);
}
- NamespaceImpl namespace = new NamespaceImpl(ns, prefix);
+ OMNamespaceImpl namespace = new OMNamespaceImpl(ns, prefix);
return new ElementImpl(this, localName, namespace, this.factory);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/ElementImpl.java Mon Aug 29 21:10:13 2011
@@ -28,7 +28,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
import org.apache.axiom.om.impl.traverse.OMChildElementIterator;
import org.apache.axiom.om.impl.traverse.OMDescendantsIterator;
@@ -73,9 +73,9 @@ public class ElementImpl extends ParentN
private static final EmptyIterator EMPTY_ITERATOR = new EmptyIterator();
- private static final OMNamespace XMLNS_NAMESPACE_WITH_PREFIX = new NamespaceImpl(OMConstants.XMLNS_NS_URI, OMConstants.XMLNS_NS_PREFIX);
+ private static final OMNamespace XMLNS_NAMESPACE_WITH_PREFIX = new OMNamespaceImpl(OMConstants.XMLNS_NS_URI, OMConstants.XMLNS_NS_PREFIX);
- private static final OMNamespace XMLNS_NAMESPACE_WITHOUT_PREFIX = new NamespaceImpl(OMConstants.XMLNS_NS_URI, null);
+ private static final OMNamespace XMLNS_NAMESPACE_WITHOUT_PREFIX = new OMNamespaceImpl(OMConstants.XMLNS_NS_URI, null);
/** @param ownerDocument ownerDocument
* @param tagName tagName
@@ -99,7 +99,7 @@ public class ElementImpl extends ParentN
* @param factory
*/
public ElementImpl(DocumentImpl ownerDocument, String tagName,
- NamespaceImpl ns, OMFactory factory) {
+ OMNamespaceImpl ns, OMFactory factory) {
super(ownerDocument, factory);
this.localName = tagName;
if (ns != null) {
@@ -110,7 +110,7 @@ public class ElementImpl extends ParentN
}
public ElementImpl(DocumentImpl ownerDocument, String tagName,
- NamespaceImpl ns, OMXMLParserWrapper builder, OMFactory factory) {
+ OMNamespaceImpl ns, OMXMLParserWrapper builder, OMFactory factory) {
super(ownerDocument, factory);
this.localName = tagName;
if (ns != null) {
@@ -120,14 +120,14 @@ public class ElementImpl extends ParentN
this.attributes = new AttributeMap(this);
}
- public ElementImpl(ParentNode parentNode, String tagName, NamespaceImpl ns,
+ public ElementImpl(ParentNode parentNode, String tagName, OMNamespaceImpl ns,
OMFactory factory) {
this((DocumentImpl) parentNode.getOwnerDocument(), tagName, ns, factory);
parentNode.addChild(this);
this.done = true;
}
- public ElementImpl(ParentNode parentNode, String tagName, NamespaceImpl ns,
+ public ElementImpl(ParentNode parentNode, String tagName, OMNamespaceImpl ns,
OMXMLParserWrapper builder, OMFactory factory) {
this(tagName, ns, builder, factory);
if (parentNode != null) {
@@ -138,7 +138,7 @@ public class ElementImpl extends ParentN
}
- public ElementImpl(String tagName, NamespaceImpl ns,
+ public ElementImpl(String tagName, OMNamespaceImpl ns,
OMXMLParserWrapper builder, OMFactory factory) {
this(factory);
this.localName = tagName;
@@ -392,7 +392,7 @@ public class ElementImpl extends ParentN
AttrImpl namespaceAttr = new AttrImpl(this.ownerNode,
localName, nsuri, this.factory);
- NamespaceImpl xmlNs = new NamespaceImpl(OMConstants.XMLNS_NS_URI);
+ OMNamespaceImpl xmlNs = new OMNamespaceImpl(OMConstants.XMLNS_NS_URI, null);
namespaceAttr.setOMNamespace(xmlNs);
return namespaceAttr;
}
@@ -532,7 +532,7 @@ public class ElementImpl extends ParentN
== null) {
// TODO checkwhether the same ns is declared with a different
// prefix and remove it
- this.declareNamespace(new NamespaceImpl(attr.getNamespaceURI(),
+ this.declareNamespace(new OMNamespaceImpl(attr.getNamespaceURI(),
attr.getPrefix()));
}
@@ -555,7 +555,7 @@ public class ElementImpl extends ParentN
} else {
AttrImpl attr = new AttrImpl(this.ownerNode, DOMUtil
.getLocalName(qualifiedName), value, this.factory);
- attr.setOMNamespace(new NamespaceImpl(namespaceURI, DOMUtil
+ attr.setOMNamespace(new OMNamespaceImpl(namespaceURI, DOMUtil
.getPrefix(qualifiedName)));
this.setAttributeNodeNS(attr);
@@ -601,13 +601,13 @@ public class ElementImpl extends ParentN
Attr attributeNode = this.getAttributeNodeNS(namespaceURI, localName);
if (attributeNode != null) {
AttrImpl tempAttr = ((AttrImpl) attributeNode);
- tempAttr.setOMNamespace(new NamespaceImpl(namespaceURI, DOMUtil
+ tempAttr.setOMNamespace(new OMNamespaceImpl(namespaceURI, DOMUtil
.getPrefix(qualifiedName)));
tempAttr.setAttributeValue(value);
this.attributes.setNamedItem(tempAttr);
return tempAttr;
} else {
- NamespaceImpl ns = new NamespaceImpl(namespaceURI, DOMUtil
+ OMNamespaceImpl ns = new OMNamespaceImpl(namespaceURI, DOMUtil
.getPrefix(qualifiedName));
AttrImpl attr = new AttrImpl((DocumentImpl) this
.getOwnerDocument(), localName, ns, value, this.factory);
@@ -744,7 +744,7 @@ public class ElementImpl extends ParentN
namespace = declareDefaultNamespace(namespace.getNamespaceURI());
} else if (prefix == null) {
prefix = OMSerializerUtil.getNextNSPrefix();
- namespace = new NamespaceImpl(namespace.getNamespaceURI(), prefix);
+ namespace = new OMNamespaceImpl(namespace.getNamespaceURI(), prefix);
}
if (prefix.length() > 0 && namespace.getNamespaceURI().length() == 0) {
throw new IllegalArgumentException("Cannot bind a prefix to the empty namespace name");
@@ -775,7 +775,7 @@ public class ElementImpl extends ParentN
prefix = OMSerializerUtil.getNextNSPrefix();
}
- NamespaceImpl ns = new NamespaceImpl(uri, prefix);
+ OMNamespaceImpl ns = new OMNamespaceImpl(uri, prefix);
return declareNamespace(ns);
}
@@ -786,7 +786,7 @@ public class ElementImpl extends ParentN
* @param uri
*/
public OMNamespace declareDefaultNamespace(String uri) {
- NamespaceImpl ns = new NamespaceImpl(uri, "");
+ OMNamespaceImpl ns = new OMNamespaceImpl(uri, "");
if (namespaces == null) {
this.namespaces = new HashMap(5);
}
@@ -796,7 +796,7 @@ public class ElementImpl extends ParentN
public OMNamespace getDefaultNamespace() {
if (namespaces != null) {
- NamespaceImpl defaultNS = (NamespaceImpl) namespaces.get("");
+ OMNamespaceImpl defaultNS = (OMNamespaceImpl) namespaces.get("");
if (defaultNS != null) {
return defaultNS;
}
@@ -871,7 +871,7 @@ public class ElementImpl extends ParentN
// namespace
if (prefix != null && prefix.equals(OMConstants.XMLNS_PREFIX)
&& uri.equals(OMConstants.XMLNS_URI)) {
- return new NamespaceImpl(uri, prefix);
+ return new OMNamespaceImpl(uri, prefix);
}
if (namespaces == null) {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/factory/OMDOMFactory.java Mon Aug 29 21:10:13 2011
@@ -37,6 +37,7 @@ import org.apache.axiom.om.OMProcessingI
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.AttrImpl;
import org.apache.axiom.om.impl.dom.CDATASectionImpl;
import org.apache.axiom.om.impl.dom.CommentImpl;
@@ -44,7 +45,6 @@ import org.apache.axiom.om.impl.dom.Docu
import org.apache.axiom.om.impl.dom.DocumentImpl;
import org.apache.axiom.om.impl.dom.DocumentTypeImpl;
import org.apache.axiom.om.impl.dom.ElementImpl;
-import org.apache.axiom.om.impl.dom.NamespaceImpl;
import org.apache.axiom.om.impl.dom.OMDOMException;
import org.apache.axiom.om.impl.dom.ParentNode;
import org.apache.axiom.om.impl.dom.ProcessingInstructionImpl;
@@ -115,35 +115,35 @@ public class OMDOMFactory implements OMF
public OMElement createOMElement(String localName, OMNamespace ns) {
return new ElementImpl((DocumentImpl) this.createOMDocument(),
- localName, (NamespaceImpl) ns, this);
+ localName, (OMNamespaceImpl) ns, this);
}
public OMElement createOMElement(String localName, OMNamespace ns,
OMContainer parent) throws OMDOMException {
if (parent == null) {
return new ElementImpl((DocumentImpl) this.createOMDocument(),
- localName, (NamespaceImpl) ns, this);
+ localName, (OMNamespaceImpl) ns, this);
}
switch (((ParentNode) parent).getNodeType()) {
case Node.ELEMENT_NODE: { // We are adding a new child to an elem
ElementImpl parentElem = (ElementImpl) parent;
ElementImpl elem = new ElementImpl((DocumentImpl) parentElem
- .getOwnerDocument(), localName, (NamespaceImpl) ns, this);
+ .getOwnerDocument(), localName, (OMNamespaceImpl) ns, this);
parentElem.appendChild(elem);
return elem;
}
case Node.DOCUMENT_NODE: {
DocumentImpl docImpl = (DocumentImpl) parent;
ElementImpl elem = new ElementImpl(docImpl, localName,
- (NamespaceImpl) ns, this);
+ (OMNamespaceImpl) ns, this);
docImpl.appendChild(elem);
return elem;
}
case Node.DOCUMENT_FRAGMENT_NODE:
DocumentFragmentImpl docFragImpl = (DocumentFragmentImpl) parent;
return new ElementImpl((DocumentImpl) docFragImpl
- .getOwnerDocument(), localName, (NamespaceImpl) ns, this);
+ .getOwnerDocument(), localName, (OMNamespaceImpl) ns, this);
default:
throw new OMDOMException(
"The parent container can only be an ELEMENT, DOCUMENT " +
@@ -158,21 +158,21 @@ public class OMDOMFactory implements OMF
case Node.ELEMENT_NODE: // We are adding a new child to an elem
ElementImpl parentElem = (ElementImpl) parent;
ElementImpl elem = new ElementImpl((DocumentImpl) parentElem
- .getOwnerDocument(), localName, (NamespaceImpl) ns,
+ .getOwnerDocument(), localName, (OMNamespaceImpl) ns,
builder, this);
parentElem.appendChild(elem);
return elem;
case Node.DOCUMENT_NODE:
DocumentImpl docImpl = (DocumentImpl) parent;
ElementImpl elem2 = new ElementImpl(docImpl, localName,
- (NamespaceImpl) ns, builder, this);
+ (OMNamespaceImpl) ns, builder, this);
docImpl.appendChild(elem2);
return elem2;
case Node.DOCUMENT_FRAGMENT_NODE:
DocumentFragmentImpl docFragImpl = (DocumentFragmentImpl) parent;
return new ElementImpl((DocumentImpl) docFragImpl
- .getOwnerDocument(), localName, (NamespaceImpl) ns,
+ .getOwnerDocument(), localName, (OMNamespaceImpl) ns,
builder, this);
default:
throw new OMDOMException(
@@ -225,16 +225,16 @@ public class OMDOMFactory implements OMF
*/
public OMElement createOMElement(QName qname, OMContainer parent)
throws OMException {
- NamespaceImpl ns;
+ OMNamespaceImpl ns;
if (qname.getNamespaceURI().length() == 0) {
if (qname.getPrefix().length() > 0) {
throw new IllegalArgumentException("Cannot create a prefixed element with an empty namespace name");
}
ns = null;
} else if (qname.getPrefix() != null) {
- ns = new NamespaceImpl(qname.getNamespaceURI(), qname.getPrefix());
+ ns = new OMNamespaceImpl(qname.getNamespaceURI(), qname.getPrefix());
} else {
- ns = new NamespaceImpl(qname.getNamespaceURI());
+ ns = new OMNamespaceImpl(qname.getNamespaceURI(), null);
}
return createOMElement(qname.getLocalPart(), ns, parent);
}
@@ -258,7 +258,7 @@ public class OMDOMFactory implements OMF
* @see org.apache.axiom.om.OMFactory#createOMNamespace(String, String)
*/
public OMNamespace createOMNamespace(String uri, String prefix) {
- return new NamespaceImpl(uri, prefix);
+ return new OMNamespaceImpl(uri, prefix);
}
public OMText createOMText(OMContainer parent, String text) {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPElement.java Mon Aug 29 21:10:13 2011
@@ -22,9 +22,9 @@ package org.apache.axiom.soap.impl.dom;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.DocumentImpl;
import org.apache.axiom.om.impl.dom.ElementImpl;
-import org.apache.axiom.om.impl.dom.NamespaceImpl;
import org.apache.axiom.om.impl.dom.ParentNode;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPProcessingException;
@@ -64,11 +64,11 @@ public abstract class SOAPElement extend
protected SOAPElement(DocumentImpl doc, String localName, OMNamespace ns,
SOAPFactory factory) {
- super(doc, localName, (NamespaceImpl) ns, factory);
+ super(doc, localName, (OMNamespaceImpl) ns, factory);
}
protected SOAPElement(DocumentImpl ownerDocument, String tagName,
- NamespaceImpl ns, OMXMLParserWrapper builder, SOAPFactory factory) {
+ OMNamespaceImpl ns, OMXMLParserWrapper builder, SOAPFactory factory) {
super(ownerDocument, tagName, ns, builder, factory);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/SOAPHeaderBlockImpl.java Mon Aug 29 21:10:13 2011
@@ -24,9 +24,9 @@ import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.AttrImpl;
import org.apache.axiom.om.impl.dom.ElementImpl;
-import org.apache.axiom.om.impl.dom.NamespaceImpl;
import org.apache.axiom.om.impl.dom.ParentNode;
import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
import org.apache.axiom.soap.SOAPConstants;
@@ -49,13 +49,13 @@ public abstract class SOAPHeaderBlockImp
public SOAPHeaderBlockImpl(String localName, OMNamespace ns,
SOAPHeader parent, SOAPFactory factory)
throws SOAPProcessingException {
- super((ParentNode) parent, localName, (NamespaceImpl) ns, factory);
+ super((ParentNode) parent, localName, (OMNamespaceImpl) ns, factory);
this.setNamespace(ns);
}
public SOAPHeaderBlockImpl(String localName, OMNamespace ns,
SOAPFactory factory) throws SOAPProcessingException {
- super(((OMDOMFactory) factory).getDocument(), localName, (NamespaceImpl) ns, factory);
+ super(((OMDOMFactory) factory).getDocument(), localName, (OMNamespaceImpl) ns, factory);
this.setNamespace(ns);
}
@@ -69,7 +69,7 @@ public abstract class SOAPHeaderBlockImp
*/
public SOAPHeaderBlockImpl(String localName, OMNamespace ns,
OMElement parent, OMXMLParserWrapper builder, SOAPFactory factory) {
- super((ParentNode) parent, localName, (NamespaceImpl) ns, builder, factory);
+ super((ParentNode) parent, localName, (OMNamespaceImpl) ns, builder, factory);
this.setNamespace(ns);
}
@@ -87,7 +87,7 @@ public abstract class SOAPHeaderBlockImp
omAttribute.setAttributeValue(attrValue);
} else {
OMAttribute attribute = new AttrImpl(this.ownerNode, attributeName,
- new NamespaceImpl(soapEnvelopeNamespaceURI,
+ new OMNamespaceImpl(soapEnvelopeNamespaceURI,
SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX),
attrValue, this.factory);
this.addAttribute(attribute);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap11/SOAP11Factory.java Mon Aug 29 21:10:13 2011
@@ -21,8 +21,8 @@ package org.apache.axiom.soap.impl.dom.s
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.DocumentImpl;
-import org.apache.axiom.om.impl.dom.NamespaceImpl;
import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPBody;
@@ -69,7 +69,7 @@ public class SOAP11Factory extends DOMSO
public SOAPEnvelope createSOAPEnvelope() {
return new SOAPEnvelopeImpl(
- new NamespaceImpl(
+ new OMNamespaceImpl(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
SOAP11Constants.SOAP_DEFAULT_NAMESPACE_PREFIX),
this);
@@ -242,7 +242,7 @@ public class SOAP11Factory extends DOMSO
public SOAPEnvelope getDefaultEnvelope() throws SOAPProcessingException {
OMNamespace ns =
- new NamespaceImpl(
+ new OMNamespaceImpl(
SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
SOAP11Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
SOAPEnvelopeImpl env = new SOAPEnvelopeImpl(ns, this);
@@ -252,7 +252,7 @@ public class SOAP11Factory extends DOMSO
}
public OMNamespace getNamespace() {
- return new NamespaceImpl(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
+ return new OMNamespaceImpl(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI,
SOAP11Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/main/java/org/apache/axiom/soap/impl/dom/soap12/SOAP12Factory.java Mon Aug 29 21:10:13 2011
@@ -21,8 +21,8 @@ package org.apache.axiom.soap.impl.dom.s
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.DocumentImpl;
-import org.apache.axiom.om.impl.dom.NamespaceImpl;
import org.apache.axiom.om.impl.dom.factory.OMDOMMetaFactory;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPBody;
@@ -68,7 +68,7 @@ public class SOAP12Factory extends DOMSO
public SOAPEnvelope createSOAPEnvelope() {
return new SOAPEnvelopeImpl(
- new NamespaceImpl(
+ new OMNamespaceImpl(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI,
SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX),
this);
@@ -230,7 +230,7 @@ public class SOAP12Factory extends DOMSO
public SOAPEnvelope getDefaultEnvelope() throws SOAPProcessingException {
OMNamespace ns =
- new NamespaceImpl(
+ new OMNamespaceImpl(
SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI,
SOAP12Constants.SOAP_DEFAULT_NAMESPACE_PREFIX);
SOAPEnvelopeImpl env = new SOAPEnvelopeImpl(ns, this);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/NamespaceTest.java Mon Aug 29 21:10:13 2011
@@ -23,16 +23,17 @@ import junit.framework.TestCase;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
public class NamespaceTest extends TestCase {
public void testEquals() throws Exception {
boolean goodResult = false;
- NamespaceImpl ns1;
- NamespaceImpl ns2;
+ OMNamespaceImpl ns1;
+ OMNamespaceImpl ns2;
try {
- new NamespaceImpl(null);
+ new OMNamespaceImpl(null, null);
} catch (IllegalArgumentException e) {
// Caught null, good.
goodResult = true;
@@ -42,8 +43,8 @@ public class NamespaceTest extends TestC
String URI1 = "http://testuri1";
String URI2 = "http://";
- ns1 = new NamespaceImpl(URI1);
- ns2 = new NamespaceImpl("http://testuri1");
+ ns1 = new OMNamespaceImpl(URI1, null);
+ ns2 = new OMNamespaceImpl("http://testuri1", null);
URI2 = URI2 + "testuri1"; // Make sure the strings don't intern to the same place
assertTrue(ns1.equals(URI2, null));
assertTrue(ns1.equals(ns2));
@@ -54,7 +55,7 @@ public class NamespaceTest extends TestC
String NSURI_UPPER = "HTTP://TESTNS";
OMFactory fac = new OMDOMFactory();
- OMNamespace ns = new NamespaceImpl(NSURI);
+ OMNamespace ns = new OMNamespaceImpl(NSURI, null);
OMElement el = fac.createOMElement("foo", null);
el.declareNamespace(NSURI, "p");
assertNull(el.findNamespace(NSURI_UPPER, "p"));
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMElementImpl.java Mon Aug 29 21:10:13 2011
@@ -33,11 +33,11 @@ import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.OMXMLStreamReader;
import org.apache.axiom.om.impl.OMContainerEx;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.builder.XOPAwareStAXOMBuilder;
import org.apache.axiom.om.impl.builder.XOPBuilder;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.jaxp.OMSource;
import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
import org.apache.axiom.om.impl.traverse.OMChildElementIterator;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMSourcedElementImpl.java Mon Aug 29 21:10:13 2011
@@ -31,8 +31,8 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMTextImpl.java Mon Aug 29 21:10:13 2011
@@ -28,8 +28,8 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
import org.apache.axiom.om.impl.builder.XOPBuilder;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.util.UIDGenerator;
import org.apache.axiom.util.base64.Base64Utils;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/factory/OMLinkedListImplFactory.java Mon Aug 29 21:10:13 2011
@@ -35,7 +35,7 @@ import org.apache.axiom.om.OMProcessingI
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.llom.OMAttributeImpl;
import org.apache.axiom.om.impl.llom.OMCommentImpl;
import org.apache.axiom.om.impl.llom.OMDocTypeImpl;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/SOAPHeaderBlockImpl.java Mon Aug 29 21:10:13 2011
@@ -25,7 +25,7 @@ import org.apache.axiom.om.OMDataSourceE
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.llom.OMAttributeImpl;
import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
import org.apache.axiom.soap.SOAPConstants;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11Factory.java Mon Aug 29 21:10:13 2011
@@ -22,7 +22,7 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
import org.apache.axiom.soap.SOAP11Constants;
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java?rev=1163007&r1=1163006&r2=1163007&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12Factory.java Mon Aug 29 21:10:13 2011
@@ -22,7 +22,7 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.OMNamespaceImpl;
+import org.apache.axiom.om.impl.common.OMNamespaceImpl;
import org.apache.axiom.om.impl.llom.factory.OMLinkedListImplFactory;
import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
import org.apache.axiom.soap.SOAP12Constants;