Author: mukulg
Date: Fri Dec 28 01:37:53 2012
New Revision: 1426378
URL: http://svn.apache.org/viewvc?rev=1426378&view=rev
Log:
committing fix for jira issue, XERCESJ-1599 along with few test cases.
Added:
xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_1.xsd
xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_2.xsd
xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_3.xsd
xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_override.xsd
Modified:
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
Added: xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_1.xsd
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_1.xsd?rev=1426378&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_1.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_1.xsd Fri Dec 28
01:37:53 2012
@@ -0,0 +1,15 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
targetNamespace="schemaNS" xmlns:ns="schemaNS">
+ <xs:override schemaLocation="1599_override.xsd">
+ <xs:element name="person">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name"/>
+ <xs:element name="email"/>
+ <xs:element ref="ns:link"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:override>
+
+ <xs:element name="link"/>
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_2.xsd
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_2.xsd?rev=1426378&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_2.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_2.xsd Fri Dec 28
01:37:53 2012
@@ -0,0 +1,15 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
targetNamespace="schemaNS">
+ <xs:override schemaLocation="1599_override.xsd">
+ <xs:element name="person">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name"/>
+ <xs:element name="email"/>
+ <xs:element ref="ns:link" xmlns:ns="schemaNS"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:override>
+
+ <xs:element name="link"/>
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_3.xsd
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_3.xsd?rev=1426378&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_3.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_3.xsd Fri Dec 28
01:37:53 2012
@@ -0,0 +1,15 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
targetNamespace="schemaNS">
+ <xs:override schemaLocation="1599_override.xsd">
+ <xs:element name="person" xmlns:ns="schemaNS">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name"/>
+ <xs:element name="email"/>
+ <xs:element ref="ns:link"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:override>
+
+ <xs:element name="link"/>
+</xs:schema>
\ No newline at end of file
Added: xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_override.xsd
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_override.xsd?rev=1426378&view=auto
==============================================================================
--- xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_override.xsd (added)
+++ xerces/java/branches/xs-1.1-tests/data/jira_bugs/1599_override.xsd Fri Dec
28 01:37:53 2012
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
targetNamespace="schemaNS">
+ <xs:element name="person">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name"/>
+ <xs:element name="email"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
\ No newline at end of file
Modified:
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java?rev=1426378&r1=1426377&r2=1426378&view=diff
==============================================================================
---
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
(original)
+++
xerces/java/branches/xs-1.1-tests/src/org/apache/xerces/tests/JiraBugsTests.java
Fri Dec 28 01:37:53 2012
@@ -312,5 +312,41 @@ public class JiraBugsTests extends Xerce
assertTrue(false);
}
}
+
+ public void testJira_1599_1() {
+ String schemapath = fDataDir+"/jira_bugs/1599_1.xsd";
+ try {
+ Schema s = fSchemaFactory.newSchema(new
StreamSource(schemapath));
+ assertNull(fErrSysId);
+ assertNull(fFatErrSysId);
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ assertTrue(false);
+ }
+ }
+
+ public void testJira_1599_2() {
+ String schemapath = fDataDir+"/jira_bugs/1599_2.xsd";
+ try {
+ Schema s = fSchemaFactory.newSchema(new
StreamSource(schemapath));
+ assertNull(fErrSysId);
+ assertNull(fFatErrSysId);
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ assertTrue(false);
+ }
+ }
+
+ public void testJira_1599_3() {
+ String schemapath = fDataDir+"/jira_bugs/1599_3.xsd";
+ try {
+ Schema s = fSchemaFactory.newSchema(new
StreamSource(schemapath));
+ assertNull(fErrSysId);
+ assertNull(fFatErrSysId);
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ assertTrue(false);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
