svn commit: r1195123 - /xerces/java/branches/xml-schema-1.1-dev/tools/org.eclipse.wst.xml.xpath2.processor_1.2.0.jar
Author: mukulg Date: Sun Oct 30 06:43:17 2011 New Revision: 1195123 URL: http://svn.apache.org/viewvc?rev=1195123&view=rev Log: committing an improved PsychoPath XPath jar. checks like following , went into infinite loop if the type T in ElementTest, element(.., T) is not in the XPath context. this commit resolves this problem. the corresponding commit was also made at Eclipse CVS. Modified: 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/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=1195123&r1=1195122&r2=1195123&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
svn commit: r1194862 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
Author: mukulg
Date: Sat Oct 29 10:09:48 2011
New Revision: 1194862
URL: http://svn.apache.org/viewvc?rev=1194862&view=rev
Log:
doing minor variable spelling correction
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java?rev=1194862&r1=1194861&r2=1194862&view=diff
==
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
Sat Oct 29 10:09:48 2011
@@ -108,7 +108,7 @@ public class XMLAssertPsychopathXPath2Im
private XSAssert[] fFailedAssertions = null;
// state to save the root type information, of the current
assertion evaluation
-private XSTypeDefinition fAsertRootTypeDef = null;
+private XSTypeDefinition fAssertRootTypeDef = null;
/*
@@ -294,7 +294,7 @@ public class XMLAssertPsychopathXPath2Im
*/
private ElementPSVImpl savePsviInfoWithUntypingOfAssertRoot(ElementPSVI
elemPsvi, boolean isSetXsAny) {
ElementPSVImpl assertRootPsvi = new ElementPSVImpl(true, elemPsvi);
-fAsertRootTypeDef = assertRootPsvi.getTypeDefinition();
+fAssertRootTypeDef = assertRootPsvi.getTypeDefinition();
if (isSetXsAny) {
assertRootPsvi.fTypeDecl = new SchemaGrammar.XSAnyType();
((PSVIElementNSImpl)fCurrentAssertDomNode).setPSVI(assertRootPsvi);
@@ -308,8 +308,8 @@ public class XMLAssertPsychopathXPath2Im
*/
private void restorePsviInfoForXPathContext(ElementPSVI elemPsvi) {
ElementPSVImpl assertRootPsvi = (ElementPSVImpl)elemPsvi;
-if (fAsertRootTypeDef != null) {
- assertRootPsvi.fTypeDecl = fAsertRootTypeDef;
+if (fAssertRootTypeDef != null) {
+ assertRootPsvi.fTypeDecl = fAssertRootTypeDef;
((PSVIElementNSImpl)fCurrentAssertDomNode).setPSVI(assertRootPsvi);
}
} // restorePsviInfoForXPathContext
-
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org
[Xerces Wiki] Update of "xmlschema11TestSuiteReports" by Mukul Gandhi
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Xerces Wiki" for change notification. The "xmlschema11TestSuiteReports" page has been changed by Mukul Gandhi: http://wiki.apache.org/xerces/xmlschema11TestSuiteReports?action=diff&rev1=47&rev2=48 Comment: updating aggregate test results after latest changes to code base '''__XERCES XML Schema 1.1 test-suite results__''' - Xerces SVN Revision: 1190401 + Xerces SVN Revision: 1194855 (1) __Xerces running IBM XML Schema 1.1 Tests__ @@ -19, +19 @@ ''Summary'': ||Total Tests ||Tests passed ||Success % || - ||1283 ||1274 ||99.30 || + ||1283 ||1277 ||99.53 || @@ -28, +28 @@ '''Overall Test Suite run status:''' ||Total Tests ||Tests passed ||Success % || - ||2202 ||2193 ||99.60 || + ||2202 ||2196 ||99.73 || - To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org For additional commands, e-mail: commits-h...@xerces.apache.org
[Xerces Wiki] Update of "xmlschema11SaxonicaTests" by Mukul Gandhi
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Xerces Wiki" for change notification. The "xmlschema11SaxonicaTests" page has been changed by Mukul Gandhi: http://wiki.apache.org/xerces/xmlschema11SaxonicaTests?action=diff&rev1=40&rev2=41 Comment: updating saxon test results after latest changes to code base ||<:>53.|| || || ||<:>assert013.v1.xml||<: #ccff99>valid||<: #ccff99>valid|| || || ||<:>assert014|| || || || || ||<:>54.|| || ||<:>assert014.xsd|| ||<: #ccff99>valid||<: #ccff99>valid|| - ||<:>55.|| || || ||<:>assert014.v1.xml||<: #ffcc99>valid||<: #ffcc99>invalid|| + ||<:>55.|| || || ||<:>assert014.v1.xml||<: #ccff99>valid||<: #ccff99>valid|| || || ||<:>assert015|| || || || || ||<:>56.|| || ||<:>assert015.xsd|| ||<: #ccff99>valid||<: #ccff99>valid|| ||<:>57.|| || || ||<:>assert015.v1.xml||<: #ccff99>valid||<: #ccff99>valid|| @@ -243, +243 @@ ||<:>59.|| || || ||<:>assert016.v1.xml||<: #ccff99>valid||<: #ccff99>valid|| || || ||<:>assert017|| || || || || ||<:>60.|| || ||<:>assert017.xsd|| ||<: #ccff99>valid||<: #ccff99>valid|| - ||<:>61.|| || || ||<:>assert017.v1.xml||<: #ffcc99>valid||<: #ffcc99>invalid|| + ||<:>61.|| || || ||<:>assert017.v1.xml||<: #ccff99>valid||<: #ccff99>valid|| || || ||<:>assert018|| || || || || ||<:>62.|| || ||<:>assert018.xsd|| ||<: #ccff99>valid||<: #ccff99>valid|| ||<:>63.|| || || ||<:>assert018.v1.xml||<: #ccff99>valid||<: #ccff99>valid|| @@ -260, +260 @@ ||<:>71.|| || || ||<:>assert021.n1.xml||<: #ccff99>invalid||<: #ccff99>invalid|| || || ||<:>assert022|| || || || || ||<:>72.|| || ||<:>assert022.xsd|| ||<: #ccff99>valid||<: #ccff99>valid|| - ||<:>73.|| || || ||<:>assert022.v1.xml||<: #ffcc99>valid||<: #ffcc99>invalid|| + ||<:>73.|| || || ||<:>assert022.v1.xml||<: #ccff99>valid||<: #ccff99>valid|| || || ||<:>assert023|| || || || || ||<:>74.|| || ||<:>assert023.xsd|| ||<: #ccff99>valid||<: #ccff99>valid|| ||<:>75.|| || || ||<:>assert023.v1.xml||<: #ccff99>valid||<: #ccff99>valid|| - To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org For additional commands, e-mail: commits-h...@xerces.apache.org
svn commit: r1194855 - in /xerces/java/branches/xml-schema-1.1-dev: src/org/apache/xerces/impl/xs/SchemaGrammar.java src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java tools/org.eclipse.
Author: mukulg
Date: Sat Oct 29 09:44:17 2011
New Revision: 1194855
URL: http://svn.apache.org/viewvc?rev=1194855&view=rev
Log:
schema 1.1 commit:
XSD 1.1 assertions require the root node of assert XDM tree to be untyped (this
was tested in couple of XSD 1.1 test suite tests), and all other nodes of
assert tree need to be typed. The typed value of the assert root node needs to
be also annotated with the type untypedAtomic.
We were earlier non compliant for this feature, and this commit provides this
enhancement.
These changes also required few improvements to PsychoPath XPath engine, whose
updated jar is also provided with this commit. The corresponding PsychoPath
XPath engine code base at Eclipse CVS was also updated.
There are also few minor javadoc improvements in this commit.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaGrammar.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.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/SchemaGrammar.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaGrammar.java?rev=1194855&r1=1194854&r2=1194855&view=diff
==
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaGrammar.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaGrammar.java
Sat Oct 29 09:44:17 2011
@@ -1228,7 +1228,7 @@ public class SchemaGrammar implements XS
return type == fAnyType || type == fAnyType11 || type ==
fAnyTypeExtended;
}
-private static class XSAnyType extends XSComplexTypeDecl {
+public static class XSAnyType extends XSComplexTypeDecl {
public XSAnyType () {
fName = SchemaSymbols.ATTVAL_ANYTYPE;
super.fTargetNamespace = SchemaSymbols.URI_SCHEMAFORSCHEMA;
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java?rev=1194855&r1=1194854&r2=1194855&view=diff
==
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLAssertPsychopathXPath2Impl.java
Sat Oct 29 09:44:17 2011
@@ -60,11 +60,11 @@ import org.w3c.dom.Element;
/**
* Class implementing an XPath interface for XML Schema 1.1 "assertions"
evaluation.
* This class interfaces with the "Eclipse/PsychoPath XPath 2.0" engine for
XPath
- * expression evaluations for XML Schema assertions.
+ * expression evaluations for XSD assertions.
*
- * We construct here Xerces PSVI enabled DOM trees (on which PsychoPath XPath
2.0
- * engine operates) from XNI event calls, for typed XDM instance support. XML
Schema
- * assertions are evaluated on these XPath tree instances in a bottom up
fashion.
+ * An instance of this class constructs Xerces PSVI enabled DOM trees (which
are in-memory XDM
+ * representation for PsychoPath XPath 2.0 engine) from XNI event calls. XSD
assertions
+ * are evaluated on these PSVI XDM instances in a bottom up fashion.
*
* @xerces.internal
*
@@ -107,6 +107,9 @@ public class XMLAssertPsychopathXPath2Im
// failed assertions for an "element information item"
private XSAssert[] fFailedAssertions = null;
+// state to save the root type information, of the current
assertion evaluation
+private XSTypeDefinition fAsertRootTypeDef = null;
+
/*
* Class constructor.
@@ -268,12 +271,15 @@ public class XMLAssertPsychopathXPath2Im
initXPathProcessor();
// determine "string value" of XPath2 context variable $value
-String value = computeStringValueOf$value(fCurrentAssertDomNode,
(ElementPSVI) augs.getItem(Constants.ELEMENT_PSVI));
+ElementPSVI elemPsvi = (ElementPSVI)
augs.getItem(Constants.ELEMENT_PSVI);
+String value = computeStringValueOf$value(fCurrentAssertDomNode,
elemPsvi);
// evaluate assertions
if (assertions instanceof XSObjectList) {
-// assertions from a "complex type" definition
-evaluateAssertionsFromAComplexType(element, assertions, value,
augs);
+// assertions from a "complex type" definition
+ElementPSVImpl modifiedRootNodePsvi =
savePsviInfoWithUntypingOfAssertRoot(elemPsvi, true);
+evaluateAssertionsFromAComplexType(element, assertions, value,
augs);
+resto
