Author: mukulg Date: Mon Oct 31 01:58:37 2011 New Revision: 1195303 URL: http://svn.apache.org/viewvc?rev=1195303&view=rev Log: schema 1.1 commit: providing an implementation to have non document node (currently only element nodes are supported as XDM roots other than the document node) as root node of XPath2 XDM tree. Providing an enhanced PsychoPath XPath jar with this improvement, along with corresponding Xerces improvements. Corresponding changes were also made at Eclipse CVS (ref, Eclipse bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=362446). this improvement also solves the XSD 1.1 test suite test, cta0017.v01.
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.0.jar Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java?rev=1195303&r1=1195302&r2=1195303&view=diff ============================================================================== --- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java (original) +++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java Mon Oct 31 01:58:37 2011 @@ -118,8 +118,8 @@ public class AbstractPsychoPathXPath2Imp StaticChecker sc = new StaticNameResolver(fXpath2DynamicContext); sc.check(xpathObject); Evaluator xpath2Evaluator = null; - if (contextNode != null) { - xpath2Evaluator = new DefaultEvaluator(fXpath2DynamicContext, fDomDoc); + if (contextNode != null) { + xpath2Evaluator = new DefaultEvaluator(fXpath2DynamicContext, fDomDoc, fDomDoc.getDocumentElement()); // for assertions and CTA, root node of XDM tree is the initial context element // change focus to the top most element ResultSequence contextNodeResultSet = ResultSequenceFactory.create_new(); contextNodeResultSet.add(new ElementType(contextNode, fXpath2DynamicContext.node_position(contextNode))); Modified: xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.0.jar URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.0.jar?rev=1195303&r1=1195302&r2=1195303&view=diff ============================================================================== Binary files - no diff available. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org For additional commands, e-mail: commits-h...@xerces.apache.org