Author: veithen
Date: Fri May 19 22:05:28 2017
New Revision: 1795637
URL: http://svn.apache.org/viewvc?rev=1795637&view=rev
Log:
Deprecate OMConstants.
Added:
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/OMConstants.java
- copied, changed from r1795636,
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java
Removed:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
webservices/axiom/trunk/systests/old-tests/pom.xml
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMBodyTest.java
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
Fri May 19 22:05:28 2017
@@ -31,7 +31,6 @@ import org.apache.axiom.core.NodeFactory
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMComment;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDocType;
@@ -375,7 +374,7 @@ public class OMFactoryImpl implements OM
throw AxiomExceptionTranslator.translate(ex);
}
attr.internalSetNamespace(ns);
- attr.coreSetType(OMConstants.XMLATTRTYPE_CDATA);
+ attr.coreSetType("CDATA");
return attr;
}
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
(original)
+++
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomElementSupport.aj
Fri May 19 22:05:28 2017
@@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -44,7 +45,6 @@ import org.apache.axiom.core.ElementActi
import org.apache.axiom.core.ElementMatcher;
import org.apache.axiom.core.Mappers;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -458,7 +458,7 @@ public aspect AxiomElementSupport {
return namespace;
}
- private static final OMNamespace XMLNS = new
OMNamespaceImpl(OMConstants.XMLNS_URI, OMConstants.XMLNS_PREFIX);
+ private static final OMNamespace XMLNS = new
OMNamespaceImpl(XMLConstants.XML_NS_URI, XMLConstants.XML_NS_PREFIX);
/**
* Checks for the namespace <B>only</B> in the current Element. This is
also used to retrieve
@@ -478,8 +478,8 @@ public aspect AxiomElementSupport {
}
//If the prefix is available and uri is available and its the xml
namespace
- if ((prefix == null || prefix.equals(OMConstants.XMLNS_PREFIX))
- && (uri == null || uri.equals(OMConstants.XMLNS_URI))) {
+ if ((prefix == null || prefix.equals(XMLConstants.XML_NS_PREFIX))
+ && (uri == null || uri.equals(XMLConstants.XML_NS_URI))) {
return XMLNS;
} else {
return null;
Modified:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
(original)
+++
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
Fri May 19 22:05:28 2017
@@ -21,7 +21,6 @@ package org.apache.axiom.om.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.util.stax.dialect.StAXDialect;
import org.apache.axiom.util.stax.dialect.StAXDialectDetector;
import org.apache.axiom.util.stax.wrapper.ImmutableXMLInputFactory;
@@ -266,7 +265,7 @@ public class StAXUtils {
public static XMLStreamWriter
createXMLStreamWriter(StAXWriterConfiguration configuration,
OutputStream out) throws XMLStreamException {
- XMLStreamWriter writer =
getXMLOutputFactory(configuration).createXMLStreamWriter(out,
OMConstants.DEFAULT_CHAR_SET_ENCODING);
+ XMLStreamWriter writer =
getXMLOutputFactory(configuration).createXMLStreamWriter(out, "utf-8");
if (log.isDebugEnabled()) {
log.debug("XMLStreamWriter is " + writer.getClass().getName());
}
Copied:
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/OMConstants.java
(from r1795636,
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java)
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/OMConstants.java?p2=webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/OMConstants.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java&r1=1795636&r2=1795637&rev=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMConstants.java
(original)
+++
webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/OMConstants.java
Fri May 19 22:05:28 2017
@@ -21,7 +21,9 @@ package org.apache.axiom.om;
import javax.xml.XMLConstants;
-/** Interface OMConstants */
+/**
+ * @deprecated
+ */
public interface OMConstants {
/**
* @deprecated This constant was used in early prototypes of Axis2 and is
no longer relevant.
@@ -50,7 +52,9 @@ public interface OMConstants {
String DEFAULT_CHAR_SET_ENCODING = "utf-8";
String DEFAULT_XML_VERSION = "1.0";
-
+ /**
+ * @deprecated Use {@link XMLConstants#XML_NS_URI} instead.
+ */
String XMLNS_URI =
"http://www.w3.org/XML/1998/namespace";;
@@ -64,6 +68,9 @@ public interface OMConstants {
*/
String XMLNS_NS_PREFIX = "xmlns";
+ /**
+ * @deprecated Use {@link XMLConstants#XML_NS_PREFIX} instead.
+ */
String XMLNS_PREFIX =
"xml";
Modified:
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
(original)
+++
webservices/axiom/trunk/implementations/axiom-dom/src/main/java/org/apache/axiom/om/impl/dom/NSAwareElement.java
Fri May 19 22:05:28 2017
@@ -21,13 +21,11 @@ package org.apache.axiom.om.impl.dom;
import org.apache.axiom.dom.DOMConfigurationImpl;
import org.apache.axiom.dom.DOMNSAwareElement;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.intf.AxiomElement;
/** Implementation of the org.w3c.dom.Element and org.apache.axiom.om.Element
interfaces. */
-public class NSAwareElement extends ElementImpl implements DOMNSAwareElement,
AxiomElement,
- OMConstants {
+public class NSAwareElement extends ElementImpl implements DOMNSAwareElement,
AxiomElement {
public void normalize(DOMConfigurationImpl config) {
if (config.isEnabled(DOMConfigurationImpl.NAMESPACES)) {
Modified: webservices/axiom/trunk/systests/old-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/pom.xml?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/old-tests/pom.xml Fri May 19 22:05:28 2017
@@ -96,5 +96,11 @@
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>core-streams</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMBodyTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMBodyTest.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMBodyTest.java
(original)
+++
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/OMBodyTest.java
Fri May 19 22:05:28 2017
@@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFac
import javax.xml.namespace.QName;
-public class OMBodyTest extends OMTestCase implements OMConstants {
+public class OMBodyTest extends OMTestCase {
SOAPBody soapBody;
private static Log log = LogFactory.getLog(OMBodyTest.class);
Modified:
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
(original)
+++
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
Fri May 19 22:05:28 2017
@@ -19,6 +19,7 @@
package org.apache.axiom.om.impl.serializer;
+import org.apache.axiom.core.stream.stax.StAX;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -27,13 +28,11 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPSampleSet;
-import org.apache.commons.io.output.NullOutputStream;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -47,8 +46,7 @@ public class ElementSerializerTest exten
protected void setUp() throws Exception {
reader =
StAXUtils.createXMLStreamReader(SOAPSampleSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
- writer = StAXUtils.createXMLStreamWriter(new NullOutputStream(),
- OMConstants.DEFAULT_CHAR_SET_ENCODING);
+ writer = StAX.createNullXMLStreamWriter();
builder =
OMXMLBuilderFactory.createStAXSOAPModelBuilder(reader);
}
Modified:
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
(original)
+++
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
Fri May 19 22:05:28 2017
@@ -20,11 +20,12 @@
package org.apache.axiom.om.impl.serializer;
import junit.framework.TestCase;
+
+import org.apache.axiom.core.stream.stax.StAX;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -77,8 +78,7 @@ public class NoNamespaceSerializerTest e
readerTwo = StAXUtils.createXMLStreamReader(
new InputStreamReader(
new
ByteArrayInputStream(xmlTextTwo.getBytes())));
- writer = StAXUtils.createXMLStreamWriter(new ByteArrayOutputStream(),
- OMConstants.DEFAULT_CHAR_SET_ENCODING);
+ writer = StAX.createNullXMLStreamWriter();
builderOne =
OMXMLBuilderFactory.createStAXSOAPModelBuilder(readerOne);
builderTwo =
@@ -125,8 +125,7 @@ public class NoNamespaceSerializerTest e
/** Will just do a probe test to check serialize with caching on works
without any exception */
public void testSerilizationWithCacheOn() throws Exception {
ByteArrayOutputStream byteArrayOutputStream = new
ByteArrayOutputStream();
- writer = StAXUtils.createXMLStreamWriter(byteArrayOutputStream,
- OMConstants.DEFAULT_CHAR_SET_ENCODING);
+ writer = StAXUtils.createXMLStreamWriter(byteArrayOutputStream);
SOAPEnvelope env = (SOAPEnvelope) builderOne.getDocumentElement();
env.serialize(writer);
@@ -136,8 +135,7 @@ public class NoNamespaceSerializerTest e
/** Will just do a probe test to check serialize with caching off works
without any exception */
public void testSerilizationWithCacheOff() throws Exception {
- writer = StAXUtils.createXMLStreamWriter(new ByteArrayOutputStream(),
- OMConstants.DEFAULT_CHAR_SET_ENCODING);
+ writer = StAX.createNullXMLStreamWriter();
SOAPEnvelope env = (SOAPEnvelope) builderOne.getDocumentElement();
env.serializeAndConsume(writer);
Modified:
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java
(original)
+++
webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java
Fri May 19 22:05:28 2017
@@ -21,7 +21,6 @@ package org.apache.axiom.soap.impl.llom;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMComment;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
@@ -37,7 +36,7 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import java.util.Iterator;
-public class OMElementTest extends OMTestCase implements OMConstants {
+public class OMElementTest extends OMTestCase {
private static final String WSA_URI =
"http://schemas.xmlsoap.org/ws/2004/03/addressing";;
private static final String WSA_TO = "To";
private static Log log = LogFactory.getLog(OMElementTest.class);
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
(original)
+++
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
Fri May 19 22:05:28 2017
@@ -18,9 +18,9 @@
*/
package org.apache.axiom.ts.om.element;
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.util.AXIOMUtil;
@@ -43,6 +43,6 @@ public class TestGetAttributeValueWithXm
"xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>" +
"</wsp:Policy>");
assertEquals("Attribute value mismatch", "uri:thisBase",
- elem.getAttributeValue(new QName(OMConstants.XMLNS_URI,
"base")));
+ elem.getAttributeValue(new QName(XMLConstants.XML_NS_URI,
"base")));
}
}
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
(original)
+++
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
Fri May 19 22:05:28 2017
@@ -18,9 +18,9 @@
*/
package org.apache.axiom.ts.om.element;
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.util.AXIOMUtil;
@@ -41,6 +41,6 @@ public class TestGetAttributeValueWithXm
OMElement elem = AXIOMUtil.stringToOM(metaFactory.getOMFactory(),
"<Policy xml:base=\"uri:thisBase\"></Policy>");
assertEquals("Attribute value mismatch", "uri:thisBase",
- elem.getAttributeValue(new QName(OMConstants.XMLNS_URI,
"base")));
+ elem.getAttributeValue(new QName(XMLConstants.XML_NS_URI,
"base")));
}
}
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
(original)
+++
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
Fri May 19 22:05:28 2017
@@ -18,10 +18,10 @@
*/
package org.apache.axiom.ts.om.element;
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.util.AXIOMUtil;
@@ -43,8 +43,8 @@ public class TestGetAttributeWithXmlPref
"<wsp:Policy xml:base=\"uri:thisBase\" " +
"xmlns:wsp=\"http://schemas.xmlsoap.org/ws/2004/09/policy\";>" +
"</wsp:Policy>");
- OMAttribute attr = elem.getAttribute(new QName(OMConstants.XMLNS_URI,
"base"));
- assertEquals("Attribute namespace mismatch", OMConstants.XMLNS_URI,
+ OMAttribute attr = elem.getAttribute(new
QName(XMLConstants.XML_NS_URI, "base"));
+ assertEquals("Attribute namespace mismatch", XMLConstants.XML_NS_URI,
attr.getNamespace().getNamespaceURI());
}
}
Modified:
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java?rev=1795637&r1=1795636&r2=1795637&view=diff
==============================================================================
---
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
(original)
+++
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
Fri May 19 22:05:28 2017
@@ -18,10 +18,10 @@
*/
package org.apache.axiom.ts.om.element;
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
-import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.util.AXIOMUtil;
@@ -41,8 +41,8 @@ public class TestGetAttributeWithXmlPref
protected void runTest() throws Throwable {
OMElement elem = AXIOMUtil.stringToOM(metaFactory.getOMFactory(),
"<Policy xml:base=\"uri:thisBase\"></Policy>");
- OMAttribute attr = elem.getAttribute(new QName(OMConstants.XMLNS_URI,
"base"));
- assertEquals("Attribute namespace mismatch", OMConstants.XMLNS_URI,
+ OMAttribute attr = elem.getAttribute(new
QName(XMLConstants.XML_NS_URI, "base"));
+ assertEquals("Attribute namespace mismatch", XMLConstants.XML_NS_URI,
attr.getNamespace().getNamespaceURI());
}
}
