[dna-commits] DNA SVN: r267 - in trunk/dna-repository/src/main: java/org/jboss/dna/repository/sequencers/xml and 1 other directories.

[dna-commits at lists.jboss.org]

Author: jverhaeg at redhat.com
Date: 2008-06-11 10:39:43 -0400 (Wed, 11 Jun 2008)
New Revision: 267

Modified:
   trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryI18n.java
   trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/xml/XmlSequencer.java
   trunk/dna-repository/src/main/resources/org/jboss/dna/repository/RepositoryI18n.properties
Log:
DNA-123: Changed XML sequencer to add a problem to the monitor everywhere that the logger was used, and changed the i18n messages to be a bit more precise.

Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryI18n.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryI18n.java	2008-06-11 09:14:08 UTC (rev 266)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/RepositoryI18n.java	2008-06-11 14:39:43 UTC (rev 267)
@@ -106,8 +106,10 @@
 
     // XML Sequencer
     public static I18n errorSequencingXmlDocument;
+    public static I18n fatalErrorSequencingXmlDocument;
     public static I18n sequencingXmlDocument;
     public static I18n canceledSequencingXmlDocument;
+    public static I18n warningSequencingXmlDocument;
 
     public static I18n interruptedWhileConnectingToFederationConfigurationRepository;
     public static I18n interruptedWhileClosingConnectionToFederationConfigurationRepository;

Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/xml/XmlSequencer.java
===================================================================
--- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/xml/XmlSequencer.java	2008-06-11 09:14:08 UTC (rev 266)
+++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/xml/XmlSequencer.java	2008-06-11 14:39:43 UTC (rev 267)
@@ -105,8 +105,9 @@
             reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
             // Parse XML document
             reader.parse(new InputSource(stream));
-        } catch (Exception err) {
-            LOGGER.error(err, RepositoryI18n.errorSequencingXmlDocument);
+        } catch (Exception error) {
+            LOGGER.error(error, RepositoryI18n.fatalErrorSequencingXmlDocument, error);
+            monitor.getProblems().addError(error, RepositoryI18n.fatalErrorSequencingXmlDocument, error);
         } finally {
             monitor.done();
         }
@@ -353,7 +354,8 @@
          */
         @Override
         public void error( SAXParseException error ) {
-            LOGGER.error(error, RepositoryI18n.errorSequencingXmlDocument);
+            LOGGER.error(error, RepositoryI18n.errorSequencingXmlDocument, error);
+            monitor.getProblems().addError(error, RepositoryI18n.errorSequencingXmlDocument, error);
         }
 
         /**
@@ -388,7 +390,8 @@
          */
         @Override
         public void fatalError( SAXParseException error ) {
-            LOGGER.error(error, RepositoryI18n.errorSequencingXmlDocument);
+            LOGGER.error(error, RepositoryI18n.fatalErrorSequencingXmlDocument);
+            monitor.getProblems().addError(error, RepositoryI18n.fatalErrorSequencingXmlDocument, error);
         }
 
         private Name getCommentContentName() {
@@ -684,8 +687,9 @@
          * @see org.xml.sax.helpers.DefaultHandler#warning(org.xml.sax.SAXParseException)
          */
         @Override
-        public void warning( SAXParseException error ) {
-            LOGGER.warn(error, RepositoryI18n.errorSequencingXmlDocument);
+        public void warning( SAXParseException warning ) {
+            LOGGER.warn(warning, RepositoryI18n.warningSequencingXmlDocument);
+            monitor.getProblems().addWarning(warning, RepositoryI18n.warningSequencingXmlDocument, warning);
         }
     }
 

Modified: trunk/dna-repository/src/main/resources/org/jboss/dna/repository/RepositoryI18n.properties
===================================================================
--- trunk/dna-repository/src/main/resources/org/jboss/dna/repository/RepositoryI18n.properties	2008-06-11 09:14:08 UTC (rev 266)
+++ trunk/dna-repository/src/main/resources/org/jboss/dna/repository/RepositoryI18n.properties	2008-06-11 14:39:43 UTC (rev 267)
@@ -92,9 +92,11 @@
 
 invalidRepositoryNodePath = The repository node path "{0}" is not valid: {1}
 
-errorSequencingXmlDocument = An error occurred while sequencing XML:
+errorSequencingXmlDocument = An error was received while sequencing XML: {0}
+fatalErrorSequencingXmlDocument = A fatal error was received while sequencing XML: {0}
 sequencingXmlDocument = Sequencing XML
 canceledSequencingXmlDocument = Canceled sequencing XML
+warningSequencingXmlDocument = A warning was received while sequencing XML: {0}
 
 interruptedWhileConnectingToFederationConfigurationRepository = Interrupted while connecting to federation configuration repository for "{0}" repository
 interruptedWhileClosingConnectionToFederationConfigurationRepository = Interrupted while closing connection to federation configuration repository for "{0}" repository