From: Wolfgang M. M. <wol...@us...> - 2005-07-30 11:04:35
|
Update of /cvsroot/exist/eXist-1.0/src/org/exist/schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2161/src/org/exist/schema Modified Files: GenericSchemaService.java Log Message: Fixed junit tests, removed unnecessary dependencies. Index: GenericSchemaService.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/schema/GenericSchemaService.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GenericSchemaService.java 10 Nov 2004 14:33:22 -0000 1.6 --- GenericSchemaService.java 30 Jul 2005 11:04:26 -0000 1.7 *************** *** 38,42 **** import org.apache.log4j.Logger; ! import org.apache.tools.ant.filters.StringInputStream; import org.apache.xerces.impl.Constants; import org.apache.xerces.parsers.DOMParser; --- 38,42 ---- import org.apache.log4j.Logger; ! //import org.apache.tools.ant.filters.StringInputStream; import org.apache.xerces.impl.Constants; import org.apache.xerces.parsers.DOMParser; *************** *** 488,492 **** ValidationErrorHandler errorHandler = new ValidationErrorHandler(); docBuilder.setErrorHandler(errorHandler); ! Document document = docBuilder.parse(new StringInputStream(contents)); Set namespaces = new TreeSet(); findNamespaces(document.getDocumentElement(), namespaces); --- 488,493 ---- ValidationErrorHandler errorHandler = new ValidationErrorHandler(); docBuilder.setErrorHandler(errorHandler); ! InputSource source = new InputSource(new StringReader(contents)); ! Document document = docBuilder.parse(source); Set namespaces = new TreeSet(); findNamespaces(document.getDocumentElement(), namespaces); *************** *** 519,523 **** docBuilder = factory.newDocumentBuilder(); docBuilder.setErrorHandler(errorHandler); ! docBuilder.parse(new StringInputStream(contents)); if (errorHandler.getErrors().size() > 0) throw errorHandler.toException(); --- 520,525 ---- docBuilder = factory.newDocumentBuilder(); docBuilder.setErrorHandler(errorHandler); ! source = new InputSource(new StringReader(contents)); ! docBuilder.parse(source); if (errorHandler.getErrors().size() > 0) throw errorHandler.toException(); *************** *** 541,545 **** ValidationErrorHandler errorHandler = new ValidationErrorHandler(); parser.setErrorHandler(errorHandler); ! parser.parse(new InputSource(new StringInputStream(contents))); if (errorHandler.getErrors().size() > 0) throw errorHandler.toException(); --- 543,547 ---- ValidationErrorHandler errorHandler = new ValidationErrorHandler(); parser.setErrorHandler(errorHandler); ! parser.parse(new InputSource(new StringReader(contents))); if (errorHandler.getErrors().size() > 0) throw errorHandler.toException(); |