Author: mbenson Date: Mon May 21 13:38:45 2007 New Revision: 540278 URL: http://svn.apache.org/viewvc?view=rev&rev=540278 Log: revert changes for JXPATH-61
Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Path.java jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/Vendor.xml jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/JXPathContext.java Mon May 21 13:38:45 2007 @@ -850,30 +850,4 @@ "Namespace registration is not implemented by " + getClass()); } - /** - * Binds a namespace URI for XPath QNames that are missing the prefix. - * If you have this XML: - * <pre> - * <a xmlns="myns"> - * <b>109</b> - * </a> - * </pre> - * and - * <pre> - * context.setDefaultNamespaceURI("myns"); - * </pre> - * you can use the path "/a/b" instead of "/foo:a/foo:b" (the assumption - * here is that the prefix "foo" is bound to "myns" by calling - * registerNamespace). - */ - public void registerDefaultNamespace(String uri) { - throw new UnsupportedOperationException( - "Namespace registration is not implemented by " + getClass()); - } - - /** - */ - public String getDefaultNamespaceURI() { - return null; - } } Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java Mon May 21 13:38:45 2007 @@ -114,7 +114,6 @@ private Pointer contextPointer; protected NamespaceResolver namespaceResolver; - private String defaultNamespaceURI; // The frequency of the cache cleanup private static final int CLEANUP_THRESHOLD = 500; @@ -686,24 +685,9 @@ public NamespaceResolver getNamespaceResolver() { namespaceResolver.seal(); - namespaceResolver.registerDefaultNamespaceURI(getDefaultNamespaceURI()); return namespaceResolver; } - public String getDefaultNamespaceURI() { - if (defaultNamespaceURI != null) { - return defaultNamespaceURI; - } - if (parentContext != null) { - return parentContext.getDefaultNamespaceURI(); - } - return null; - } - - public void registerDefaultNamespace(String uri) { - defaultNamespaceURI = uri; - } - /** * Checks if existenceCheckClass exists on the class path. If so, allocates * an instance of the specified class, otherwise returns null. Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/NamespaceResolver.java Mon May 21 13:38:45 2007 @@ -36,7 +36,6 @@ protected HashMap namespaceMap = new HashMap(); protected HashMap reverseMap; protected NodePointer pointer; - private String defaultNamespaceURI; private boolean sealed; public NamespaceResolver(NamespaceResolver parent) { @@ -116,14 +115,6 @@ return prefix; } - public String getDefaultNamespaceURI() { - return defaultNamespaceURI; - } - - public void registerDefaultNamespaceURI(String uri) { - this.defaultNamespaceURI = uri; - } - public boolean isSealed() { return sealed; } Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/axes/SimplePathInterpreter.java Mon May 21 13:38:45 2007 @@ -796,10 +796,9 @@ NodeTest nodeTest = step.getNodeTest(); QName qname = ((NodeNameTest) nodeTest).getNodeName(); String prefix = qname.getPrefix(); - String namespaceURI = prefix != null - ? context.getJXPathContext().getNamespaceURI(prefix) - : context.getJXPathContext().getDefaultNamespaceURI(); - if (namespaceURI != null) { + if (prefix != null) { + String namespaceURI = context.getJXPathContext() + .getNamespaceURI(prefix); nodeTest = new NodeNameTest(qname, namespaceURI); } return pointer.childIterator(nodeTest, false, null); Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Path.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Path.java?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Path.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/Path.java Mon May 21 13:38:45 2007 @@ -258,14 +258,13 @@ if (nodeTest instanceof NodeNameTest) { QName qname = ((NodeNameTest) nodeTest).getNodeName(); String prefix = qname.getPrefix(); - String namespaceURI = prefix != null - ? context.getJXPathContext().getNamespaceURI(prefix) - : context.getJXPathContext().getDefaultNamespaceURI(); - if (namespaceURI != null) { + if (prefix != null) { + String namespaceURI = context.getJXPathContext() + .getNamespaceURI(prefix); nodeTest = new NodeNameTest(qname, namespaceURI); } } - + switch (axis) { case Compiler.AXIS_ANCESTOR : return new AncestorContext(context, false, nodeTest); Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java Mon May 21 13:38:45 2007 @@ -379,9 +379,8 @@ if (success) { NodeTest nodeTest; String prefix = name.getPrefix(); - String namespaceURI = prefix != null - ? context.getNamespaceURI(prefix) - : context.getDefaultNamespaceURI(); + String namespaceURI = prefix == null ? null : + context.getNamespaceURI(prefix); nodeTest = new NodeNameTest(name, namespaceURI); NodeIterator it = childIterator(nodeTest, false, null); @@ -455,8 +454,7 @@ } String ln = DOMNodePointer.getLocalName(node); String nsURI = getNamespaceURI(); - if (equalStrings(nsURI, - getNamespaceResolver().getDefaultNamespaceURI())) { + if (nsURI == null) { buffer.append(ln); buffer.append('['); buffer.append(getRelativePositionByName()).append(']'); Modified: jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java Mon May 21 13:38:45 2007 @@ -490,9 +490,8 @@ if (success) { NodeTest nodeTest; String prefix = name.getPrefix(); - String namespaceURI = prefix != null - ? context.getNamespaceURI(prefix) - : context.getDefaultNamespaceURI(); + String namespaceURI = prefix == null ? null : context + .getNamespaceURI(prefix); nodeTest = new NodeNameTest(name, namespaceURI); NodeIterator it = @@ -572,8 +571,7 @@ String nsURI = getNamespaceURI(); String ln = JDOMNodePointer.getLocalName(node); - if (equalStrings(nsURI, - getNamespaceResolver().getDefaultNamespaceURI())) { + if (nsURI == null) { buffer.append(ln); buffer.append('['); buffer.append(getRelativePositionByName()).append(']'); Modified: jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/Vendor.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/Vendor.xml?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/Vendor.xml (original) +++ jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/Vendor.xml Mon May 21 13:38:45 2007 @@ -69,10 +69,4 @@ </register> </pos> - <pos xmlns="temp"> - <register> - <number>110</number> - </register> - </pos> - </vendor> Modified: jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java?view=diff&rev=540278&r1=540277&r2=540278 ============================================================================== --- jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java (original) +++ jakarta/commons/proper/jxpath/trunk/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java Mon May 21 13:38:45 2007 @@ -381,13 +381,6 @@ context.registerNamespace("x", "temp"); assertXPathValue(context, "vendor/x:pos//number", "109"); } - - public void testDefaultNamespaceIgnored() { - context.registerDefaultNamespace("temp"); - assertXPathValueAndPointer(context, "//pos//number", "110", - "/node()[1]/pos[2]/register[1]/number[1]"); - context.registerDefaultNamespace(null); - } public void testAxisChildIndexPredicate() { assertXPathValue( --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]