You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/09/20 04:13:58 UTC
svn commit: r290330 - in /beehive/trunk/netui:
src/pageflow/org/apache/beehive/netui/pageflow/internal/
src/util/org/apache/beehive/netui/util/config/parser/
src/util/org/apache/beehive/netui/util/xml/validation/
src/util/org/apache/beehive/netui/util/...
Author: ekoneil
Date: Mon Sep 19 19:13:53 2005
New Revision: 290330
URL: http://svn.apache.org/viewcvs?rev=290330&view=rev
Log:
Fixup the error message reported by the SchemaValidatorJava5 class so it's only printed in the commons-logger debug case.
This change also adds the xsd resource path and the xml resource path to the API for the SchemaValidator base class.
BB: self
Test: NetUI DRT pass
Modified:
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/SchemaValidator.java
beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/internal/SchemaValidatorJava5.java
beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java?rev=290330&r1=290329&r2=290330&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultURLTemplatesFactory.java Mon Sep 19 19:13:53 2005
@@ -142,7 +142,8 @@
// Validate the XML against the schema
xsdInputStream = SCHEMA_RESOLVER.getInputStream();
SchemaValidator schemaValidator = SchemaValidatorFactory.getInstance();
- schemaValidator.validate(xsdInputStream, xmlInputStream);
+ schemaValidator.validate(SCHEMA_RESOLVER.getResourcePath(), xsdInputStream,
+ _configFilePath, xmlInputStream);
try
{
if ( xmlInputStream != null )
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java?rev=290330&r1=290329&r2=290330&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/config/parser/NetUIConfigParser.java Mon Sep 19 19:13:53 2005
@@ -126,7 +126,8 @@
xsdInputStream = SCHEMA_RESOLVER.getInputStream();
try {
SchemaValidator schemaValidator = SchemaValidatorFactory.getInstance();
- schemaValidator.validate(xsdInputStream, xmlInputStream);
+ schemaValidator.validate(SCHEMA_RESOLVER.getResourcePath(), xsdInputStream,
+ theXmlResolver.getResourcePath(), xmlInputStream);
}
catch(SchemaValidationException e) {
throw new ConfigInitializationException("Validation errors occurred parsing the config file \"" +
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/SchemaValidator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/SchemaValidator.java?rev=290330&r1=290329&r2=290330&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/SchemaValidator.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/SchemaValidator.java Mon Sep 19 19:13:53 2005
@@ -26,5 +26,6 @@
/**
*/
- public abstract void validate(InputStream xsdInputStream, InputStream xmlInputStrea);
+ public abstract void validate(String xsdResourcePath, InputStream xsdInputStream,
+ String xmlResourcePath, InputStream xmlInputStrea);
}
Modified: beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/internal/SchemaValidatorJava5.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/internal/SchemaValidatorJava5.java?rev=290330&r1=290329&r2=290330&view=diff
==============================================================================
--- beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/internal/SchemaValidatorJava5.java (original)
+++ beehive/trunk/netui/src/util/org/apache/beehive/netui/util/xml/validation/internal/SchemaValidatorJava5.java Mon Sep 19 19:13:53 2005
@@ -45,8 +45,8 @@
private static final Logger LOGGER = Logger.getInstance(SchemaValidatorJava5.class);
- public void validate(InputStream xsdInputStream, InputStream xmlInputStream) {
-
+ public void validate(String xsdResourcePath, InputStream xsdInputStream,
+ String xmlResourcePath, InputStream xmlInputStream) {
try {
SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
StreamSource xsdStreamSource = new StreamSource(xsdInputStream);
@@ -68,9 +68,16 @@
throw new SchemaValidationException("Exception occurred validating document. Cause: " + e, e);
}
catch(TransformerFactoryConfigurationError error) {
+ String message =
+ "Beehive NetUI disabled validation on the XML file \"" + xmlResourcePath + "\" because the XML TransformFactory was " +
+ "configured incorrectly. We suggest configuring the application runtime to enable Java 5 XML Schema validation as additional " +
+ "application configuration errors may occur later. A stack trace is available in the NetUI debug log. Cause: " + error;
+
if(LOGGER.isWarnEnabled())
- LOGGER.warn("Beehive NetUI disabled validation on the given file because the XML TransformFactory was configured incorrectly. " +
- "We suggest fixing this error as errors may occur as a result of having an invalid XML instance document. Cause: " + error, error);
+ LOGGER.warn(message);
+
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("XML TransformFactory stack trace:" , error);
}
}
}
Modified: beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java?rev=290330&r1=290329&r2=290330&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java (original)
+++ beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/SchemaValidationTest.java Mon Sep 19 19:13:53 2005
@@ -44,7 +44,8 @@
InputStream xsdIs = xsdInputStreamResolver.getInputStream();
InputStream xmlIs = xmlInputStreamResolver.getInputStream();
try {
- schemaValidator.validate(xsdIs, xmlIs);
+ schemaValidator.validate(xsdInputStreamResolver.getResourcePath(), xsdIs,
+ xmlInputStreamResolver.getResourcePath(), xmlIs);
}
catch(SchemaValidationException e) {
assertTrue("Received an unexpected schema validation error", false);
@@ -68,7 +69,8 @@
InputStream xsdIs = xsdInputStreamResolver.getInputStream();
InputStream xmlIs = xmlInputStreamResolver.getInputStream();
try {
- schemaValidator.validate(xsdIs, xmlIs);
+ schemaValidator.validate(xsdInputStreamResolver.getResourcePath(), xsdIs,
+ xmlInputStreamResolver.getResourcePath(), xmlIs);
}
catch(SchemaValidationException e) {
return;