Author: veithen
Date: Sat Jun 20 15:14:01 2015
New Revision: 1686637
URL: http://svn.apache.org/r1686637
Log:
Merge latest changes from trunk.
Added:
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIXercesJ1586.java
- copied unchanged from r1686631,
webservices/axiom/trunk/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestLookupNamespaceURIXercesJ1586.java
Modified:
webservices/axiom/branches/attrs-aspects/ (props changed)
webservices/axiom/branches/attrs-aspects/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java
Propchange: webservices/axiom/branches/attrs-aspects/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 20 15:14:01 2015
@@ -10,4 +10,4 @@
/webservices/axiom/branches/JAXB2_DS:1366463-1367737
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1685218-1686323
+/webservices/axiom/trunk:1685218-1686631
Modified:
webservices/axiom/branches/attrs-aspects/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/attrs-aspects/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj?rev=1686637&r1=1686636&r2=1686637&view=diff
==============================================================================
---
webservices/axiom/branches/attrs-aspects/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
(original)
+++
webservices/axiom/branches/attrs-aspects/aspects/dom-aspects/src/main/java/org/apache/axiom/dom/DOMElementSupport.aj
Sat Jun 20 15:14:01 2015
@@ -57,10 +57,8 @@ public aspect DOMElementSupport {
String namespace = this.getNamespaceURI();
String prefix = this.getPrefix();
// First check for namespaces implicitly defined by the namespace
prefix/URI of the element
- // TODO: although the namespace != null condition conforms to the
specs, it is likely incorrect; see XERCESJ-1586
- if (namespace != null
- && (prefix == null && specifiedPrefix == null
- || prefix != null && prefix.equals(specifiedPrefix))) {
+ if (prefix == null && specifiedPrefix == null
+ || prefix != null && prefix.equals(specifiedPrefix)) {
return namespace;
}
// looking in attributes
Modified:
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java?rev=1686637&r1=1686636&r2=1686637&view=diff
==============================================================================
---
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
(original)
+++
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
Sat Jun 20 15:14:01 2015
@@ -145,6 +145,7 @@ public final class DOMTestSuiteBuilder e
addTest(new
org.apache.axiom.ts.dom.element.TestInsertBeforeWithDocumentFragment(dbf));
addTest(new
org.apache.axiom.ts.dom.element.TestLookupNamespaceURIExplicit(dbf));
addTest(new
org.apache.axiom.ts.dom.element.TestLookupNamespaceURIImplicit(dbf));
+ addTest(new
org.apache.axiom.ts.dom.element.TestLookupNamespaceURIXercesJ1586(dbf));
addTest(new
org.apache.axiom.ts.dom.element.TestLookupPrefixEmptyNamespace(dbf));
addTest(new
org.apache.axiom.ts.dom.element.TestLookupPrefixExplicitMasked(dbf));
addTest(new
org.apache.axiom.ts.dom.element.TestLookupPrefixImplicitMasked(dbf));
Modified:
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java?rev=1686637&r1=1686636&r2=1686637&view=diff
==============================================================================
---
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java
(original)
+++
webservices/axiom/branches/attrs-aspects/testing/dom-testsuite/src/test/java/org/apache/axiom/ts/dom/XercesTest.java
Sat Jun 20 15:14:01 2015
@@ -25,6 +25,7 @@ import junit.framework.TestSuite;
import
org.apache.axiom.ts.dom.document.TestLookupNamespaceURIWithEmptyDocument;
import org.apache.axiom.ts.dom.document.TestLookupPrefixWithEmptyDocument;
+import org.apache.axiom.ts.dom.element.TestLookupNamespaceURIXercesJ1586;
import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
public class XercesTest extends TestCase {
@@ -39,6 +40,9 @@ public class XercesTest extends TestCase
builder.exclude(TestLookupNamespaceURIWithEmptyDocument.class);
builder.exclude(TestLookupPrefixWithEmptyDocument.class);
+ // XERCESJ-1586
+ builder.exclude(TestLookupNamespaceURIXercesJ1586.class);
+
builder.exclude(W3CTestCase.class,
"(id=http://www.w3.org/2001/DOM-Test-Suite/level1/core/hc_attrgetvalue2)");
builder.exclude(W3CTestCase.class,
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createAttributeNS06)");
builder.exclude(W3CTestCase.class,
"(id=http://www.w3.org/2001/DOM-Test-Suite/level2/core/createDocument08)");
