svn commit: r1187865 - in /xerces/java/branches/xml-schema-1.1-dev: src/org/apache/xerces/impl/xs/alternative/Test.java tools/org.eclipse.wst.xml.xpath2.processor_1.2.0.jar

[mu...@apache.org]

Author: mukulg
Date: Sun Oct 23 11:09:21 2011
New Revision: 1187865

URL: http://svn.apache.org/viewvc?rev=1187865&view=rev
Log:
schema 1.1 commit:

made few fixes to meet requirements of more XSD 1.1 test suite tests, that involve checks like following in CTA XPath expressions,
. instance of element(*, xs:untyped)

and

@type instance of attribute(*, xs:untypedAtomic)

This also needs an improved PsychoPath XPath engine jar, that is also provided with this commit (ref Eclipse bug, https://bugs.eclipse.org/bugs/show_bug.cgi?id=361748).

Modified:
    xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.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/alternative/Test.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java?rev=1187865&r1=1187864&r2=1187865&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/alternative/Test.java Sun Oct 23 11:09:21 2011
@@ -23,8 +23,10 @@ import java.util.Map;
 
 import javax.xml.XMLConstants;
 
+import org.apache.xerces.dom.CoreDocumentImpl;
 import org.apache.xerces.dom.PSVIAttrNSImpl;
 import org.apache.xerces.dom.PSVIDocumentImpl;
+import org.apache.xerces.dom.PSVIElementNSImpl;
 import org.apache.xerces.impl.Constants;
 import org.apache.xerces.impl.xpath.XPath20;
 import org.apache.xerces.impl.xs.AbstractPsychoPathXPath2Impl;
@@ -136,7 +138,7 @@ public class Test extends AbstractPsycho
             // to provide to PsychoPath XPath engine for evaluation.
             Document document = new PSVIDocumentImpl();
             document.setDocumentURI(expandedSystemId); // an approximation (the URI of the parent document) of the document URI for this <alternative>, document tree
-            Element elem = document.createElementNS(element.uri, element.rawname);
+            Element elem = new PSVIElementNSImpl((CoreDocumentImpl) document, element.uri, element.rawname);            
             for (int attrIndx = 0; attrIndx < attributes.getLength(); attrIndx++) {         
                 PSVIAttrNSImpl attrNode = new PSVIAttrNSImpl((PSVIDocumentImpl)document, attributes.getURI(attrIndx), attributes.getQName(attrIndx));
                 attrNode.setNodeValue(attributes.getValue(attrIndx));

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=1187865&r1=1187864&r2=1187865&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org