Author: mukulg
Date: Mon Jan 25 03:28:52 2010
New Revision: 902691
URL: http://svn.apache.org/viewvc?rev=902691&view=rev
Log:
reverting the changes back, after comments from Michael Glavassevich (jira,
issue XERCESJ-1414)
Modified:
xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/SourceValidator.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/SourceValidator.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/SourceValidator.java?rev=902691&r1=902690&r2=902691&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/SourceValidator.java
(original)
+++ xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/SourceValidator.java
Mon Jan 25 03:28:52 2010
@@ -98,9 +98,6 @@
/** Default schema language (http://www.w3.org/2001/XMLSchema). */
protected static final String DEFAULT_SCHEMA_LANGUAGE =
XMLConstants.W3C_XML_SCHEMA_NS_URI;
- /** XSD 1.1 schema language */
- protected static final String XSD11_SCHEMA_LANGUAGE =
"http://www.w3.org/2001/XMLSchema/v1.1";
-
/** Default repetition (1). */
protected static final int DEFAULT_REPETITION = 1;
@@ -399,12 +396,6 @@
memoryUsage = option.equals("m");
continue;
}
- if (option.equals("xsd11")) {
- schemaLanguage = XSD11_SCHEMA_LANGUAGE;
-
System.setProperty("javax.xml.validation.SchemaFactory:http://www.w3.org/2001/XMLSchema/v1.1",
-
"org.apache.xerces.jaxp.validation.XMLSchema11Factory");
- continue;
- }
if (option.equals("h")) {
printUsage();
continue;
@@ -419,7 +410,7 @@
SourceValidator sourceValidator = new SourceValidator();
// Create SchemaFactory and configure
- SchemaFactory factory = SchemaFactory.newInstance(schemaLanguage);
+ SchemaFactory factory = SchemaFactory.newInstance(schemaLanguage);
factory.setErrorHandler(sourceValidator);
try {
@@ -604,7 +595,6 @@
System.err.println(" -ga | -GA Turn on/off generation of synthetic
schema annotations.");
System.err.println(" NOTE: Not supported by all schema
factories and validators.");
System.err.println(" -m | -M Turn on/off memory usage report");
- System.err.println(" -xsd11 Turn on XSD 1.1 support");
System.err.println(" -h This help screen.");
System.err.println();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]