date:20111008

[Xerces Wiki] Update of "xmlschema11TestSuiteReports" by Mukul Gandhi

2011-10-08 Thread Apache Wiki

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=35&rev2=36

Comment:
updating aggregate test results after latest changes to code base

  '''__XERCES XML Schema 1.1 test-suite results__'''
  
- Xerces SVN Revision: 1180333
+ Xerces SVN Revision: 1180543
  
  (1) __Xerces running IBM XML Schema 1.1 Tests__
  
@@ -19, +19 @@

  
  ''Summary'':
  ||Total Tests ||Tests passed ||Success % ||
- ||1253 ||1227 
||97.92 ||
+ ||1253 ||1229 
||98.08 ||
  
  
  
@@ -28, +28 @@

  
  '''Overall Test Suite run status:'''
  ||Total Tests ||Tests passed ||Success % ||
- ||2172 ||2144 
||98.71 ||
+ ||2172 ||2146 
||98.80 ||
  
  
  

-
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

2011-10-08 Thread Apache Wiki

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=30&rev2=31

Comment:
updating saxon test results after latest changes to code base

  || || ||<: bgcolor="">cta9001err|| || || || ||
  ||<:>100.|| || ||<:>cta9001err|| ||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">cta9002err|| || || || ||
- ||<:>101.|| || ||<:>cta9002err|| ||<: #ffcc99>invalid||<: #ffcc99>valid||
+ ||<:>101.|| || ||<:>cta9002err|| ||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">cta9003err|| || || || ||
- ||<:>102.|| || ||<:>cta9003err|| ||<: #ffcc99>invalid||<: #ffcc99>valid||
+ ||<:>102.|| || ||<:>cta9003err|| ||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">cta9004err|| || || || ||
  ||<:>103.|| || ||<:>cta9004err|| ||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">cta9005err|| || || || ||

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

svn commit: r1180543 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl: ./ msg/ xs/ xs/alternative/ xs/traversers/ xs/util/

2011-10-08 Thread mukulg

Author: mukulg
Date: Sun Oct  9 04:34:12 2011
New Revision: 1180543

URL: http://svn.apache.org/viewvc?rev=1180543&view=rev
Log:
committing a schema 1.1 fix. started with fixing implementation to comply to 
the XSD 1.1 test case "cta9003err" (contributed by Saxonica). doing additional 
static checking of XPath expression, in XSDTypeAlternativeTraverser to abort 
processing and raise error, if for example a schema type used in the XPath 
expression isn't present in the XPath static context (which is been tested by 
the test case mentioned above).

have also done minor refactoring in other parts of code base (also in class 
XSTypeHelper, which is not related to the functional fix for this commit).

Modified:

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/AbstractPsychoPathXPath2Impl.java

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDAssertionValidator.java

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/src/org/apache/xerces/impl/xs/traversers/XSDTypeAlternativeTraverser.java

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.java

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java?rev=1180543&r1=1180542&r2=1180543&view=diff
==
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/Constants.java
 Sun Oct  9 04:34:12 2011
@@ -497,6 +497,9 @@ public final class Constants {
 public final static short TYPE_AND_FACET_AVAILABILITY = 2;
 public final static short TYPE_AND_FACET_UNAVAILABILITY = 3;
 
+// Constants to support PsychoPath XPath engine uses
+public final static String XPATH2_NAMESPACE_CONTEXT = "XPATH2_NS_CONTEXT";
+
 // private
 
 /** SAX features. */

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties?rev=1180543&r1=1180542&r2=1180543&view=diff
==
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
 Sun Oct  9 04:34:12 2011
@@ -348,7 +348,8 @@
 c-fields-xpaths = c-fields-xpaths: The field value = ''{0}'' is not 
valid.
 c-general-xpath = c-general-xpath: The expression ''{0}'' is not valid 
with respect to the XPath subset supported by XML Schema.
 c-general-xpath-ns = c-general-xpath-ns: A namespace prefix in XPath 
expression ''{0}'' was not bound to a namespace.
-c-cta-xpath = c-cta-xpath: The XPath expression ''{0}'' couldn''t 
compile successfully in ''{1}'' mode, during CTA evaluation.  
+c-cta-xpath = c-cta-xpath: The XPath expression ''{0}'' couldn''t 
compile successfully in ''{1}'' mode, during CTA evaluation.
+c-cta-xpath-serr = c-cta-xpath-serr: The XPath expression ''{0}'' 
couldn''t compile successfully in ''{1}'' mode, during CTA evaluation. A static 
error ''{2}'' occured in the XPath expression.  
 c-selector-xpath = c-selector-xpath: The selector value = ''{0}'' is 
not valid; selector xpaths cannot contain attributes.
 EmptyTargetNamespace = EmptyTargetNamespace: In schema document 
''{0}'', the value of the ''targetNamespace'' attribute cannot be an empty 
string.
 FacetValueFromBase = FacetValueFromBase: In the declaration of type 
''{0}'', value ''{1}'' of facet ''{2}'' must be from the value space of the 
base type, ''{3}''.

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=1180543&r1=1180542&r2=1180543&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
 Sun Oct  9 04:34:12 2011
@@ -20,6 +20,9 @@ package org.apache.xerces.impl.xs;
 import java.uti

[Xerces Wiki] Update of "xmlschema11TestSuiteReports" by Mukul Gandhi

2011-10-08 Thread Apache Wiki

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=34&rev2=35

Comment:
updating aggregate test results after latest changes to test suite

  
  ''Summary'':
  ||Total Tests ||Tests passed ||Success % ||
- ||1259 ||1230 
||97.70 ||
+ ||1253 ||1227 
||97.92 ||
  
  
  
@@ -28, +28 @@

  
  '''Overall Test Suite run status:'''
  ||Total Tests ||Tests passed ||Success % ||
- ||2178 ||2147 
||98.58 ||
+ ||2172 ||2144 
||98.71 ||
  
  
  

-
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

2011-10-08 Thread Apache Wiki

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=29&rev2=30

Comment:
updating saxon test results after latest changes to saxon test-suite

  ||<:>77.|| || ||<:>assert-simple001.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
  ||<:>78.|| || || ||<:>assert-simple001.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
  ||<:>79.|| || || ||<:>assert-simple001.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
- || || ||<: bgcolor="yellow">assert-simple002|| || || || ||
- ||<:>80.|| || ||<:>assert-simple002.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>81.|| || || ||<:>assert-simple002.v1.xml||<: #ffcc99>valid||<: 
#ffcc99>invalid||
- ||<:>82.|| || || ||<:>assert-simple002.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
- ||<:>83.|| || || ||<:>assert-simple002.n2.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || || ||<: bgcolor="">assert-simple003|| || || || ||
- ||<:>84.|| || ||<:>assert-simple003.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>80.|| || ||<:>assert-simple003.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>85.|| || || ||<:>assert-simple003.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>81.|| || || ||<:>assert-simple003.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>86.|| || || ||<:>assert-simple003.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
+ ||<:>82.|| || || ||<:>assert-simple003.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || || ||<: bgcolor="">assert-simple004|| || || || ||
- ||<:>87.|| || ||<:>assert-simple004.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>83.|| || ||<:>assert-simple004.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>88.|| || || ||<:>assert-simple004.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>84.|| || || ||<:>assert-simple004.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>89.|| || || ||<:>assert-simple004.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
+ ||<:>85.|| || || ||<:>assert-simple004.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || || ||<: bgcolor="">assert-simple005|| || || || ||
- ||<:>90.|| || ||<:>assert-simple005.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>86.|| || ||<:>assert-simple005.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>91.|| || || ||<:>assert-simple005.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>87.|| || || ||<:>assert-simple005.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>92.|| || || ||<:>assert-simple005.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
+ ||<:>88.|| || || ||<:>assert-simple005.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || || ||<: bgcolor="">assert-simple006|| || || || ||
- ||<:>93.|| || ||<:>assert-simple006.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>89.|| || ||<:>assert-simple006.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>94.|| || || ||<:>assert-simple006.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>90.|| || || ||<:>assert-simple006.v1.xml||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>95.|| || || ||<:>assert-simple006.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
+ ||<:>91.|| || || ||<:>assert-simple006.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || || ||<: bgcolor="">assert-simple007|| || || || ||
- ||<:>96.|| || ||<:>assert-simple007.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>92.|| || ||<:>assert-simple007.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>93.|| || || ||<:>assert-simple007.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
+ || || ||<: bgcolor="">assert-simple008|| || || || ||
+ ||<:>94.|| || ||<:>assert-simple008.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>95.|| || || ||<:>assert-simple007.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
+ || || ||<: bgcolor="">assert-simple009|| || || || ||
+ ||<:>96.|| || ||<:>assert-simple009.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
  ||<:>97.|| || || ||<:>assert-simple007.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
- || || ||<: bgcolor="">assert-simple008|| || || || ||
+ || || ||<: bgcolor="">assert-simple010|| || || || ||
- ||<:>98.|| || ||<:>assert-simple008.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
+ ||<:>98.|| || ||<:>assert-simple010.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
  ||<:>99.|| || || ||<:>assert-simple007.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
- || || ||<: bgcolor="">assert-simple009|| || || || ||
- ||<:>100.|| || ||<:>assert-simple009.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>101.|| || || ||<:>assert-simple007.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
- || || ||<: bgcolor="">assert-simple010|| || || || ||
- ||<:>102.|| || ||<:>assert-simple010.xsd|| ||<: #ccff99>valid||<: 
#ccff99>valid||
- ||<:>103.|| || || ||<:>assert-simple007.n1.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || ||<: #99>Complex|| || || || || ||
  || || |

[Xerces Wiki] Update of "xmlschema11TestSuiteReports" by Mukul Gandhi

2011-10-08 Thread Apache Wiki

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=33&rev2=34

Comment:
updating aggregate test results after latest implementation improvements

  '''__XERCES XML Schema 1.1 test-suite results__'''
  
- Xerces SVN Revision: 1171718
+ Xerces SVN Revision: 1180333
  
  (1) __Xerces running IBM XML Schema 1.1 Tests__
  
@@ -19, +19 @@

  
  ''Summary'':
  ||Total Tests ||Tests passed ||Success % ||
- ||1258 ||1226 
||97.46 ||
+ ||1259 ||1230 
||97.70 ||
  
  
  
@@ -28, +28 @@

  
  '''Overall Test Suite run status:'''
  ||Total Tests ||Tests passed ||Success % ||
- ||2177 ||2143 
||98.44 ||
+ ||2178 ||2147 
||98.58 ||
  
  
  

-
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

2011-10-08 Thread Apache Wiki

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=28&rev2=29

Comment:
updating saxon test results, after latest implementation improvements and using 
latest test suite files

  || || ||<: bgcolor="">cta0006|| || || || ||
  ||<:>19.|| || ||<:>cta0006|| ||<: #ccff99>valid||<: #ccff99>valid||
  ||<:>20.|| || || ||<:>cta0006.v01||<: #ccff99>valid||<: #ccff99>valid||
- ||<:>21.|| || || ||<:>cta0006.n01||<: #ffcc99>invalid||<: #ffcc99>valid||
+ ||<:>21.|| || || ||<:>cta0006.n01||<: #ccff99>invalid||<: #ccff99>invalid||
- ||<:>22.|| || || ||<:>cta0006.n02||<: #ffcc99>invalid||<: #ffcc99>valid||
+ ||<:>22.|| || || ||<:>cta0006.n02||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">cta0007|| || || || ||
  ||<:>23.|| || ||<:>cta0007|| ||<: #ccff99>valid||<: #ccff99>valid||
- ||<:>24.|| || || ||<:>cta0007.n01||<: #ffcc99>invalid||<: #ffcc99>valid||
+ ||<:>24.|| || || ||<:>cta0007.n01||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">cta0008|| || || || ||
  ||<:>25.|| || ||<:>cta0008|| ||<: #ccff99>valid||<: #ccff99>valid||
  ||<:>26.|| || || ||<:>cta0008.v01||<: #ccff99>valid||<: #ccff99>valid||
@@ -976, +976 @@

  || || ||<: bgcolor="">over014|| || || || ||
  ||<:>47.|| || ||<:>over014.bad.xsd|| ||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || || ||<: bgcolor="">over015|| || || || ||
- ||<:>48.|| || ||<:>over015.xsd|| ||<: #ffcc99>valid||<: #ffcc99>invalid||
+ ||<:>48.|| || ||<:>over015.xsd|| ||<: #ccff99>valid||<: #ccff99>valid||
- ||<:>49.|| || || ||<:>over015.v01.xml||<: #ccff99>valid||<: #ccff99>valid||
+ ||<:>49.|| || || ||<:>over015.v01.xml||<: #ffcc99>valid||<: #ffcc99>invalid||
  ||<:>50.|| || || ||<:>over015.n01.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
  ||<:>51.|| || || ||<:>over015.n02.xml||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || || ||<: bgcolor="">over016|| || || || ||
@@ -1075, +1075 @@

  || || ||<: bgcolor="">simple042|| || || || ||
  ||<:>43.|| || ||<:>simple042.bad.xsd|| ||<: #ccff99>invalid||<: 
#ccff99>invalid||
  || || ||<: bgcolor="">simple043|| || || || ||
- ||<:>44.|| || ||<:>simple043.bad.xsd|| ||<: #ffcc99>invalid||<: 
#ffcc99>valid||
+ ||<:>44.|| || ||<:>simple043.xsd|| ||<: #ccff99>valid||<: #ccff99>valid||
  || || ||<: bgcolor="">simple044|| || || || ||
  ||<:>45.|| || ||<:>simple044.xsd|| ||<: #ccff99>valid||<: #ccff99>valid||
  ||<:>46.|| || || ||<:>simple044.v01.xml||<: #ccff99>valid||<: #ccff99>valid||
@@ -1251, +1251 @@

  || || ||<: bgcolor="">vc901|| || || || ||
  ||<:>46.|| || ||<:>vc901.xsd|| ||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">vc902|| || || || ||
+ ||<:>47.|| || ||<:>vc902.xsd|| ||<: #ffcc99>valid||<: #ffcc99>invalid||
+ || || ||<: bgcolor="">vc903|| || || || ||
- ||<:>47.|| || ||<:>vc902.xsd|| ||<: #ccff99>invalid||<: #ccff99>invalid||
+ ||<:>48.|| || ||<:>vc902.xsd|| ||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">vc904|| || || || ||
- ||<:>48.|| || ||<:>vc904.xsd|| ||<: #ccff99>invalid||<: #ccff99>invalid||
+ ||<:>49.|| || ||<:>vc904.xsd|| ||<: #ccff99>invalid||<: #ccff99>invalid||
  || || ||<: bgcolor="">vc905|| || || || ||
- ||<:>49.|| || ||<:>vc905.xsd|| ||<: #ccff99>invalid||<: #ccff99>invalid||
+ ||<:>50.|| || ||<:>vc905.xsd|| ||<: #ccff99>invalid||<: #ccff99>invalid||
  || ||<: #99>Wild|| || || || || ||
  || || ||<: bgcolor="">wild001|| || || || ||
  ||<:>1.|| || ||<:>wild001.xsd|| ||<: #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: r1180333 - in /xerces/java/branches/xml-schema-1.1-dev: src/org/apache/xerces/impl/xs/ src/org/apache/xerces/impl/xs/alternative/ src/org/apache/xerces/impl/xs/assertion/ src/org/apache/xe

2011-10-08 Thread mukulg

Author: mukulg
Date: Sat Oct  8 07:51:08 2011
New Revision: 1180333

URL: http://svn.apache.org/viewvc?rev=1180333&view=rev
Log:
starting with need to improve schema 1.1 implementation, as per requirements of 
XSD 1.1 CTA test "cta0006.n01" (contributed by Saxonica), have made following 
improvements in this commit,
- adding in-scope namespaces to XDM tree for type alternatives (for full XPath 
mode evaluation)
- improved implementation of XPath2 "resolve-QName" function and xs:QName type 
implementation. a new PsychoPath XPath 2.0 jar is provided with these 
improvements.

have also done minor refactoring.

Modified:

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java

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/src/org/apache/xerces/impl/xs/assertion/XSAssertionXPath2ValueImpl.java

xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/util/XSTypeHelper.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/SchemaSymbols.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java?rev=1180333&r1=1180332&r2=1180333&view=diff
==
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/SchemaSymbols.java
 Sat Oct  8 07:51:08 2011
@@ -41,6 +41,7 @@ public final class SchemaSymbols {
 public static final String XSI_NONAMESPACESCHEMALOCATION = 
"noNamespaceSchemaLocation".intern();
 public static final String XSI_TYPE  = "type".intern();
 public static final String XSI_NIL   = "nil".intern();
+public static final String EMPTY_STRING  = "".intern(); 
 
 // schema namespace
 public static final String URI_SCHEMAFORSCHEMA   = 
"http://www.w3.org/2001/XMLSchema".intern();

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=1180333&r1=1180332&r2=1180333&view=diff
==
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
 Sat Oct  8 07:51:08 2011
@@ -422,6 +422,8 @@ public class XMLSchemaValidator
 private IDContext fIDContext = null;
 
 private String fDatatypeXMLVersion = null;
+
+private NamespaceContext fNamespaceContext = null;
 
 /**
  * A wrapper of the standard error reporter. We'll store all schema errors
@@ -774,6 +776,8 @@ public class XMLSchemaValidator
 if (fDocumentHandler != null) {
 fDocumentHandler.startDocument(locator, encoding, 
namespaceContext, augs);
 }
+
+fNamespaceContext = namespaceContext;
 
 } // startDocument(XMLLocator,String)
 
@@ -2246,7 +2250,7 @@ public class XMLSchemaValidator
 
 //process type alternatives
 if (fTypeAlternativesChecking && fCurrentElemDecl != null) {
-   fTypeAlternative = 
fTypeAlternativeValidator.getTypeAlternative(fCurrentElemDecl, element, 
attributes, fInheritableAttrList);   
+   fTypeAlternative = 
fTypeAlternativeValidator.getTypeAlternative(fCurrentElemDecl, element, 
attributes, fInheritableAttrList, fNamespaceContext);   
if (fTypeAlternative != null) {
fCurrentType = fTypeAlternative.getTypeDefinition();
}

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java?rev=1180333&r1=1180332&r2=1180333&view=diff
==
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/XSDTypeAlternativeValidator.java
 Sat Oct  8 07:51:08 2011
@@ -23,6 +23,7 @@ import org.apache.xerces.impl.xs.alterna
 import org.apache.xerces.impl.xs.alternative.XSTypeAlternativeI

[Xerces Wiki] Update of "xmlschema11TestSuiteReports" by Mukul Gandhi

[Xerces Wiki] Update of "xmlschema11SaxonicaTests" by Mukul Gandhi

svn commit: r1180543 - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl: ./ msg/ xs/ xs/alternative/ xs/traversers/ xs/util/

[Xerces Wiki] Update of "xmlschema11TestSuiteReports" by Mukul Gandhi

[Xerces Wiki] Update of "xmlschema11SaxonicaTests" by Mukul Gandhi

[Xerces Wiki] Update of "xmlschema11TestSuiteReports" by Mukul Gandhi

[Xerces Wiki] Update of "xmlschema11SaxonicaTests" by Mukul Gandhi

svn commit: r1180333 - in /xerces/java/branches/xml-schema-1.1-dev: src/org/apache/xerces/impl/xs/ src/org/apache/xerces/impl/xs/alternative/ src/org/apache/xerces/impl/xs/assertion/ src/org/apache/xe

8 matches

Site Navigation

Mail list logo

Footer information