Revision 5340
Added by berkley almost 14 years ago
DocumentImpl.java | ||
---|---|---|
3393 | 3393 |
// Get an instance of the parser |
3394 | 3394 |
String parserName = PropertyService.getProperty("xml.saxparser"); |
3395 | 3395 |
parser = XMLReaderFactory.createXMLReader(parserName); |
3396 |
XMLSchemaService.populateRegisteredSchemaList(); |
|
3396 |
XMLSchemaService.getInstance().populateRegisteredSchemaList();
|
|
3397 | 3397 |
if (ruleBase != null && ruleBase.equals(EML200)) { |
3398 | 3398 |
logMetacat.info("DocumentImpl.initalizeParser - Using eml 2.0.0 parser"); |
3399 | 3399 |
chandler = new Eml200SAXHandler(dbconn, action, docid, rev, |
... | ... | |
3411 | 3411 |
// From DB to find the register external schema location |
3412 | 3412 |
String externalSchemaLocation = null; |
3413 | 3413 |
// SchemaLocationResolver resolver = new SchemaLocationResolver(); |
3414 |
externalSchemaLocation = XMLSchemaService.getNameSpaceAndLocationString(); |
|
3414 |
externalSchemaLocation = XMLSchemaService.getInstance().getNameSpaceAndLocationString();
|
|
3415 | 3415 |
logMetacat.debug("DocumentImpl.initalizeParser - 2.0.0 external schema location: " + externalSchemaLocation); |
3416 | 3416 |
// Set external schemalocation. |
3417 | 3417 |
if (externalSchemaLocation != null |
... | ... | |
3436 | 3436 |
parser.setFeature(SCHEMAVALIDATIONFEATURE, true); |
3437 | 3437 |
// From DB to find the register external schema location |
3438 | 3438 |
String externalSchemaLocation = null; |
3439 |
externalSchemaLocation = XMLSchemaService.getNameSpaceAndLocationString(); |
|
3439 |
externalSchemaLocation = XMLSchemaService.getInstance().getNameSpaceAndLocationString();
|
|
3440 | 3440 |
logMetacat.debug("DocumentImpl.initalizeParser - 2.1.0 external schema location: " + externalSchemaLocation); |
3441 | 3441 |
// Set external schemalocation. |
3442 | 3442 |
if (externalSchemaLocation != null |
Also available in: Unified diff
refactored XMLSchemaService to not have static methods. made the CrudServiceTest more robust.