dmitri 2004/01/19 12:44:52
Modified: jxpath/src/java/org/apache/commons/jxpath JXPathContext.java
jxpath/src/java/org/apache/commons/jxpath/ri/axes
RootContext.java
jxpath/src/java/org/apache/commons/jxpath/ri/model
NodePointer.java
jxpath/src/test/org/apache/commons/jxpath/ri/compiler
ExtensionFunctionTest.java CoreFunctionTest.java
jxpath/src/test/org/apache/commons/jxpath/ri/model
XMLModelTestCase.java BeanModelTestCase.java
jxpath/src/test/org/apache/commons/jxpath/ri/model/dom
DOMModelTest.java
jxpath/src/test/org/apache/commons/jxpath/ri/model/jdom
JDOMModelTest.java
jxpath/src/java/org/apache/commons/jxpath/ri/model/jdom
JDOMNodePointer.java
jxpath/src/java/org/apache/commons/jxpath/ri/model/dom
DOMNodePointer.java
jxpath/src/java/org/apache/commons/jxpath/xml
JDOMParser.java
jxpath/src/java/org/apache/commons/jxpath/ri
JXPathContextReferenceImpl.java
jxpath/src/java/org/apache/commons/jxpath/ri/compiler
Expression.java
Removed: jxpath/src/java/org/apache/commons/jxpath
BasicNamespaceManager.java NamespaceManager.java
Log:
Rolled back the external namespace registration feature
Revision Changes Path
1.21 +28 -27
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/JXPathContext.java
Index: JXPathContext.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/JXPathContext.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JXPathContext.java 18 Jan 2004 01:43:29 -0000 1.20
+++ JXPathContext.java 19 Jan 2004 20:44:51 -0000 1.21
@@ -432,7 +432,7 @@
protected IdentityManager idManager;
protected KeyManager keyManager;
protected HashMap decimalFormats;
- protected NamespaceManager namespaceManager;
+// protected NamespaceManager namespaceManager;
private static JXPathContextFactory contextFactory;
private static JXPathContext compilationContext;
@@ -810,28 +810,29 @@
+ "no KeyManager has been specified");
}
}
-
- /**
- * Install a namespace manager that will be used by the context
- * to look up namespace URI's for prefixes.
- */
- public void setNamespaceManager(NamespaceManager namespaceManager) {
- this.namespaceManager = namespaceManager;
- }
- /**
- * Returns this context's namespace manager. If none has been installed,
- * returns the key manager of the parent context, or the default
- * namespace manager.
- */
- public NamespaceManager getNamespaceManager() {
- if (keyManager == null && parentContext != null) {
- return parentContext.getNamespaceManager();
- }
- if (namespaceManager == null) {
- namespaceManager = new BasicNamespaceManager();
- }
- return namespaceManager;
- }
+// TODO: either remove these methods or complete the functionality
+// /**
+// * Install a namespace manager that will be used by the context
+// * to look up namespace URI's for prefixes.
+// */
+// public void setNamespaceManager(NamespaceManager namespaceManager) {
+// this.namespaceManager = namespaceManager;
+// }
+//
+// /**
+// * Returns this context's namespace manager. If none has been installed,
+// * returns the key manager of the parent context, or the default
+// * namespace manager.
+// */
+// public NamespaceManager getNamespaceManager() {
+// if (keyManager == null && parentContext != null) {
+// return parentContext.getNamespaceManager();
+// }
+// if (namespaceManager == null) {
+// namespaceManager = new BasicNamespaceManager();
+// }
+// return namespaceManager;
+// }
}
1.15 +5 -6
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java
Index: RootContext.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/axes/RootContext.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RootContext.java 18 Jan 2004 01:43:29 -0000 1.14
+++ RootContext.java 19 Jan 2004 20:44:51 -0000 1.15
@@ -139,8 +139,7 @@
pointer = NodePointer.newNodePointer(
new QName(null, ""),
constant,
- null,
- jxpathContext.getNamespaceManager());
+ null);
}
return new InitialContext(new RootContext(jxpathContext, pointer));
}
1.21 +26 -46
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java
Index: NodePointer.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/NodePointer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- NodePointer.java 18 Jan 2004 01:43:30 -0000 1.20
+++ NodePointer.java 19 Jan 2004 20:44:52 -0000 1.21
@@ -65,7 +65,6 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathException;
-import org.apache.commons.jxpath.NamespaceManager;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.ri.Compiler;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
@@ -95,33 +94,15 @@
/**
* Allocates an entirely new NodePointer by iterating through all installed
* NodePointerFactories until it finds one that can create a pointer.
- *
- * @deprecated Use instead
- * [EMAIL PROTECTED] #newNodePointer(QName, Object, Locale, NamespaceManager)
- * newNodePointer(QName, Object, Locale, NamespaceManager)}
*/
public static NodePointer newNodePointer(
QName name,
Object bean,
Locale locale)
{
- return newNodePointer(name, bean, locale, null);
- }
-
- /**
- * Allocates an entirely new NodePointer by iterating through all installed
- * NodePointerFactories until it finds one that can create a pointer.
- */
- public static NodePointer newNodePointer(
- QName name,
- Object bean,
- Locale locale,
- NamespaceManager namespaceManager)
- {
NodePointer pointer = null;
if (bean == null) {
pointer = new NullPointer(name, locale);
- pointer.setNamespaceManager(namespaceManager);
return pointer;
}
@@ -130,7 +111,6 @@
for (int i = 0; i < factories.length; i++) {
pointer = factories[i].createNodePointer(name, bean, locale);
if (pointer != null) {
- pointer.setNamespaceManager(namespaceManager);
return pointer;
}
}
@@ -164,7 +144,7 @@
protected NodePointer parent;
protected Locale locale;
- private NamespaceManager namespaceManager;
+// private NamespaceManager namespaceManager;
protected NodePointer(NodePointer parent) {
this.parent = parent;
@@ -537,27 +517,27 @@
return name.toUpperCase().startsWith(lang.toUpperCase());
}
- /**
- * Installs the supplied manager as the namespace manager for this node
- * pointer. The [EMAIL PROTECTED] #getNamespaceURI(String)
getNamespaceURI(prefix)}
- * uses this manager to resolve namespace prefixes.
- *
- * @param namespaceManager
- */
- public void setNamespaceManager(NamespaceManager namespaceManager) {
- this.namespaceManager = namespaceManager;
- }
-
- public NamespaceManager getNamespaceManager() {
- if (namespaceManager != null) {
- return namespaceManager;
- }
- if (parent != null) {
- return parent.getNamespaceManager();
- }
- return null;
- }
-
+// /**
+// * Installs the supplied manager as the namespace manager for this node
+// * pointer. The [EMAIL PROTECTED] #getNamespaceURI(String)
getNamespaceURI(prefix)}
+// * uses this manager to resolve namespace prefixes.
+// *
+// * @param namespaceManager
+// */
+// public void setNamespaceManager(NamespaceManager namespaceManager) {
+// this.namespaceManager = namespaceManager;
+// }
+//
+// public NamespaceManager getNamespaceManager() {
+// if (namespaceManager != null) {
+// return namespaceManager;
+// }
+// if (parent != null) {
+// return parent.getNamespaceManager();
+// }
+// return null;
+// }
+//
/**
* Returns a NodeIterator that iterates over all children or all children
* that match the given NodeTest, starting with the specified one.
1.11 +6 -9
jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java
Index: ExtensionFunctionTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/compiler/ExtensionFunctionTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExtensionFunctionTest.java 18 Jan 2004 01:43:30 -0000 1.10
+++ ExtensionFunctionTest.java 19 Jan 2004 20:44:52 -0000 1.11
@@ -388,11 +388,8 @@
}
public Pointer getContextNodePointer() {
- return NodePointer.newNodePointer(
- null,
- object,
- Locale.getDefault(),
- null);
+ return NodePointer
+ .newNodePointer(null, object, Locale.getDefault());
}
public List getContextNodeList() {
1.8 +5 -5
jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java
Index: CoreFunctionTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/compiler/CoreFunctionTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CoreFunctionTest.java 18 Jan 2004 01:43:30 -0000 1.7
+++ CoreFunctionTest.java 19 Jan 2004 20:44:52 -0000 1.8
@@ -179,7 +179,7 @@
String key,
String value)
{
- return NodePointer.newNodePointer(null, "42", null, null);
+ return NodePointer.newNodePointer(null, "42", null);
}
});
1.16 +49 -49
jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java
Index: XMLModelTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/model/XMLModelTestCase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLModelTestCase.java 18 Jan 2004 01:43:30 -0000 1.15
+++ XMLModelTestCase.java 19 Jan 2004 20:44:52 -0000 1.16
@@ -66,7 +66,6 @@
import org.apache.commons.jxpath.IdentityManager;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathTestCase;
-import org.apache.commons.jxpath.NamespaceManager;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.Variables;
import org.apache.commons.jxpath.xml.DocumentContainer;
@@ -114,9 +113,7 @@
}
protected abstract AbstractFactory getAbstractFactory();
-
- protected abstract boolean isExternalNamespaceSupported();
-
+
protected JXPathContext createContext() {
JXPathContext context =
JXPathContext.newContext(createDocumentContainer());
@@ -771,45 +768,48 @@
"vendor//location[last()]",
"/vendor[1]/location[2]");
}
-
- public void testExternalNamespace() {
- if (isExternalNamespaceSupported()) {
- DocumentContainer container = new DocumentContainer(
- XMLModelTestCase.class.getResource("ExternalNamespaceTest.xml"),
- getModel());
- JXPathContext context = JXPathContext.newContext(container);
- NamespaceManager nsm = context.getNamespaceManager();
- nsm.registerNamespace("quality", "qualityNS");
- nsm.registerNamespace("money", "priceNS");
-
- assertXPathValueAndPointer(
- context,
- "//quality:color",
- "orange",
- "/vendor[1]/product[1]/quality:color[1]");
-
- // It is supposed to figure out that the prefixes "money" and
- // "value" map to the same namespaceURI
- assertXPathValueAndPointer(
- context,
- "//value:price",
- "1000.00",
- "/vendor[1]/product[1]/money:price[1]");
-
- assertXPathValue(
- context,
- "local-name(vendor/product/value:price)",
- "price");
-
- assertXPathValue(
- context,
- "name(vendor/product/quality:color)",
- "qualityNS:color");
-
- assertXPathValue(
- context,
- "namespace-uri(vendor/product/value:price)",
- "priceNS");
- }
- }
+
+// TODO: either complete the external namespace functionality, or get rid of
+// this test.
+//
+// public void testExternalNamespace() {
+// if (isExternalNamespaceSupported()) {
+// DocumentContainer container = new DocumentContainer(
+//
XMLModelTestCase.class.getResource("ExternalNamespaceTest.xml"),
+// getModel());
+// JXPathContext context = JXPathContext.newContext(container);
+// NamespaceManager nsm = context.getNamespaceManager();
+// nsm.registerNamespace("quality", "qualityNS");
+// nsm.registerNamespace("money", "priceNS");
+//
+// assertXPathValueAndPointer(
+// context,
+// "//quality:color",
+// "orange",
+// "/vendor[1]/product[1]/quality:color[1]");
+//
+// // It is supposed to figure out that the prefixes "money" and
+// // "value" map to the same namespaceURI
+// assertXPathValueAndPointer(
+// context,
+// "//value:price",
+// "1000.00",
+// "/vendor[1]/product[1]/money:price[1]");
+//
+// assertXPathValue(
+// context,
+// "local-name(vendor/product/value:price)",
+// "price");
+//
+// assertXPathValue(
+// context,
+// "name(vendor/product/quality:color)",
+// "qualityNS:color");
+//
+// assertXPathValue(
+// context,
+// "namespace-uri(vendor/product/value:price)",
+// "priceNS");
+// }
+// }
}
1.18 +6 -8
jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/model/BeanModelTestCase.java
Index: BeanModelTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/model/BeanModelTestCase.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BeanModelTestCase.java 18 Jan 2004 01:43:30 -0000 1.17
+++ BeanModelTestCase.java 19 Jan 2004 20:44:52 -0000 1.18
@@ -138,8 +138,7 @@
(PropertyOwnerPointer) NodePointer.newNodePointer(
new QName(null, "root"),
createContextBean(),
- Locale.getDefault(),
- null);
+ Locale.getDefault());
NodeIterator it;
@@ -201,8 +200,7 @@
(PropertyOwnerPointer) NodePointer.newNodePointer(
new QName(null, "root"),
createContextBean(),
- Locale.getDefault(),
- null);
+ Locale.getDefault());
NodeIterator it;
PropertyPointer start = null;
1.10 +4 -8
jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java
Index: DOMModelTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/model/dom/DOMModelTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMModelTest.java 18 Jan 2004 01:43:30 -0000 1.9
+++ DOMModelTest.java 19 Jan 2004 20:44:52 -0000 1.10
@@ -104,10 +104,6 @@
protected AbstractFactory getAbstractFactory() {
return new TestDOMFactory();
}
-
- protected boolean isExternalNamespaceSupported() {
- return true;
- }
protected String getXMLSignature(
Object node,
1.10 +4 -8
jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java
Index: JDOMModelTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/test/org/apache/commons/jxpath/ri/model/jdom/JDOMModelTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JDOMModelTest.java 18 Jan 2004 01:43:30 -0000 1.9
+++ JDOMModelTest.java 19 Jan 2004 20:44:52 -0000 1.10
@@ -102,10 +102,6 @@
protected String getModel() {
return DocumentContainer.MODEL_JDOM;
}
-
- protected boolean isExternalNamespaceSupported() {
- return false; // Until a bug preventing external NS in JDOM B9 is fixed
- }
public void testID() {
// id() is not supported by JDOM
1.12 +8 -9
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java
Index: JDOMNodePointer.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/jdom/JDOMNodePointer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JDOMNodePointer.java 18 Jan 2004 01:43:30 -0000 1.11
+++ JDOMNodePointer.java 19 Jan 2004 20:44:52 -0000 1.12
@@ -68,7 +68,6 @@
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathException;
-import org.apache.commons.jxpath.NamespaceManager;
import org.apache.commons.jxpath.ri.Compiler;
import org.apache.commons.jxpath.ri.QName;
import org.apache.commons.jxpath.ri.compiler.NodeNameTest;
@@ -157,10 +156,10 @@
Element element = (Element) node;
Namespace ns = element.getNamespace(prefix);
if (ns == null) {
- NamespaceManager manager = getNamespaceManager();
- if (manager != null) {
- return manager.getNamespaceURI(prefix, this);
- }
+// NamespaceManager manager = getNamespaceManager();
+// if (manager != null) {
+// return manager.getNamespaceURI(prefix, this);
+// }
return null;
}
1.20 +10 -11
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java
Index: DOMNodePointer.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/model/dom/DOMNodePointer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DOMNodePointer.java 18 Jan 2004 01:43:30 -0000 1.19
+++ DOMNodePointer.java 19 Jan 2004 20:44:52 -0000 1.20
@@ -68,7 +68,6 @@
import org.apache.commons.jxpath.AbstractFactory;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathException;
-import org.apache.commons.jxpath.NamespaceManager;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.ri.Compiler;
import org.apache.commons.jxpath.ri.QName;
@@ -276,12 +275,12 @@
}
aNode = aNode.getParentNode();
}
- if (namespace == null) {
- NamespaceManager manager = getNamespaceManager();
- if (manager != null) {
- namespace = manager.getNamespaceURI(prefix, this);
- }
- }
+// if (namespace == null) {
+// NamespaceManager manager = getNamespaceManager();
+// if (manager != null) {
+// namespace = manager.getNamespaceURI(prefix, this);
+// }
+// }
if (namespace == null || namespace.equals("")) {
namespace = NodePointer.UNKNOWN_NAMESPACE;
}
1.6 +5 -5
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/xml/JDOMParser.java
Index: JDOMParser.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/xml/JDOMParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDOMParser.java 18 Jan 2004 01:42:58 -0000 1.5
+++ JDOMParser.java 19 Jan 2004 20:44:52 -0000 1.6
@@ -94,7 +94,7 @@
isNamespaceAware());
builder.setFeature(
"http://xml.org/sax/features/namespace-prefixes";,
- isNamespaceAware());
+ false);
return builder.build(stream);
}
catch (Exception ex) {
1.37 +7 -13
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java
Index: JXPathContextReferenceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- JXPathContextReferenceImpl.java 18 Jan 2004 01:43:30 -0000 1.36
+++ JXPathContextReferenceImpl.java 19 Jan 2004 20:44:52 -0000 1.37
@@ -181,16 +181,14 @@
NodePointer.newNodePointer(
new QName(null, "root"),
contextPointer.getRootNode(),
- getLocale(),
- getNamespaceManager());
+ getLocale());
}
else {
this.contextPointer =
NodePointer.newNodePointer(
new QName(null, "root"),
contextBean,
- getLocale(),
- getNamespaceManager());
+ getLocale());
this.rootPointer = this.contextPointer;
}
}
@@ -376,11 +374,7 @@
return (Pointer) result;
}
else {
- return NodePointer.newNodePointer(
- null,
- result,
- getLocale(),
- getNamespaceManager());
+ return NodePointer.newNodePointer(null, result, getLocale());
}
}
1.9 +5 -21
jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Expression.java
Index: Expression.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/ri/compiler/Expression.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Expression.java 18 Jan 2004 01:43:30 -0000 1.8
+++ Expression.java 19 Jan 2004 20:44:52 -0000 1.9
@@ -61,7 +61,6 @@
*/
package org.apache.commons.jxpath.ri.compiler;
-import org.apache.commons.jxpath.NamespaceManager;
import org.apache.commons.jxpath.Pointer;
import org.apache.commons.jxpath.ri.EvalContext;
import org.apache.commons.jxpath.ri.model.NodePointer;
@@ -140,25 +139,14 @@
private Iterator iterator;
private QName qname;
private Locale locale;
- private NamespaceManager namespaceManager;
/**
* @deprecated Use the method that takes a NamespaceManager
*/
public PointerIterator(Iterator it, QName qname, Locale locale) {
- this(it, qname, locale, null);
- }
-
- public PointerIterator(
- Iterator it,
- QName qname,
- Locale locale,
- NamespaceManager namespaceManager)
- {
this.iterator = it;
this.qname = qname;
this.locale = locale;
- this.namespaceManager = namespaceManager;
}
public boolean hasNext() {
@@ -167,11 +155,7 @@
public Object next() {
Object o = iterator.next();
- return NodePointer.newNodePointer(
- qname,
- o,
- locale,
- namespaceManager);
+ return NodePointer.newNodePointer(qname, o, locale);
}
public void remove() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
