[jboss-svn-commits] JBL Code SVN: r8361 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/listeners/config etc/schemas/xml

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2006-12-15 20:49:50 -0500 (Fri, 15 Dec 2006)
New Revision: 8361

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
   labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
Log:


Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java	2006-12-15 20:27:44 UTC (rev 8360)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ConfigurationController.java	2006-12-16 01:49:50 UTC (rev 8361)
@@ -35,7 +35,14 @@
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.parameters.ParamRepositoryFactory;
 import org.xml.sax.InputSource;
-
+/**
+ * The controller monitors changes in the jbossesb configuration file call jbossesb.xml. When
+ * changes are detected it validates the XML, and when it passes validation it goes on and
+ * generates the jbossesb-listener.xml and jbossesb-gateway.xml.
+ * 
+ * @author kstam
+ *
+ */
 public class ConfigurationController implements Runnable
 {
 	private static int SLEEP_MILLIS       = 1000; // default interval between parameter reloads
@@ -64,8 +71,9 @@
 	 * Construct a Configuration Manager from the named repository based
 	 * configuration.
 	 * 
-	 * @param p_sParameterName
-	 *            Name of the Repository entry containing the configuration.
+	 * @param configFileName - Name of the configuration repository.
+	 * @param validationName - Name of the file name used for validation (xsd or dtd).
+	 *   
 	 */
 	public ConfigurationController(String configFileName, String validationFileName)
 	{
@@ -114,9 +122,14 @@
 							Generator generator = new Generator(new ByteArrayInputStream(configXml.getBytes()));
 							generator.generate(mConfigDirectory);
 						} else {
-							mLogger.error("The configuration file "
-									+ mConfigFileName + " did not pass validation for the following reasons: "
-									+ validator.getValidationResults());
+							StringBuffer buffer = new StringBuffer("The configuration file "
+									+ mConfigFileName + " did not pass validation for the following reasons: ");
+							int i=0;
+						    for (String error: validator.getValidationResults())
+							{
+								buffer.append("** " + ++i + ". "+ error + "\n");
+							}
+						    mLogger.error(buffer);
 							mLogger.info("The current configuration is kept in place until "
 									+ " validation passes.");
 						}

Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd	2006-12-15 20:27:44 UTC (rev 8360)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd	2006-12-16 01:49:50 UTC (rev 8361)
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Generated by Turbo XML 2.4.1.100. Conforms to w3c http://www.w3.org/2001/XMLSchema-->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	 targetNamespace="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
-	 xmlns:jesb="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
+<xsd:schema 
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	 xmlns:jesb="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
+	 targetNamespace="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.xsd"
 	 elementFormDefault="qualified">