User: patriot1burke
Date: 01/06/20 11:25:09
Modified: src/main/org/jboss/metadata Tag: Branch_2_4
XmlFileLoader.java
Log:
unintelligable error messages when standardjboss.xml was bogus
Revision Changes Path
No revision
No revision
1.15.2.1 +35 -11 jboss/src/main/org/jboss/metadata/XmlFileLoader.java
Index: XmlFileLoader.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/metadata/XmlFileLoader.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- XmlFileLoader.java 2001/06/15 17:03:12 1.15
+++ XmlFileLoader.java 2001/06/20 18:25:09 1.15.2.1
@@ -25,17 +25,24 @@
import org.xml.sax.SAXParseException;
import org.jboss.ejb.DeploymentException;
+import org.jboss.logging.Logger;
/**
* XmlFileLoader class is used to read ejb-jar.xml, standardjboss.xml, jboss.xml
* files, process them using DTDs and create ApplicationMetaData object for
future using
*
* @see <related>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Wolfgang Werner</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Darius Davidavicius</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
- * @version $Revision: 1.15 $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>
+ * @version $Revision: 1.15.2.1 $
+ *
+ * Revisions:
+ * 20010620 Bill Burke: Print an error message when failing to load
standardjboss.xml
+ * or jboss.xml. It was a pain to debug a standardjboss.xml
+ * syntax error.
*/
public class XmlFileLoader {
// Constants -----------------------------------------------------
@@ -141,22 +148,39 @@
if (defaultJbossUrl == null) {
throw new DeploymentException("no standardjboss.xml found");
}
-
- Document defaultJbossDocument = getDocumentFromURL(defaultJbossUrl);
- metaData.setUrl(defaultJbossUrl);
- metaData.importJbossXml(defaultJbossDocument.getDocumentElement());
+ Document defaultJbossDocument = null;
+ try
+ {
+ defaultJbossDocument = getDocumentFromURL(defaultJbossUrl);
+
+ metaData.setUrl(defaultJbossUrl);
+ metaData.importJbossXml(defaultJbossDocument.getDocumentElement());
+ }
+ catch (Exception ex)
+ {
+ Logger.error("failed to load standardjboss.xml. There could be a
syntax error.");
+ throw ex;
+ }
// Load jboss.xml
// if this file is provided, then we override the defaults
- URL jbossUrl = getClassLoader().getResource("META-INF/jboss.xml");
-
- if (jbossUrl != null) {
-// Logger.debug(jbossUrl.toString() + " found. Overriding
defaults");
+ try
+ {
+ URL jbossUrl = getClassLoader().getResource("META-INF/jboss.xml");
+
+ if (jbossUrl != null) {
+ // Logger.debug(jbossUrl.toString() + "
found. Overriding defaults");
Document jbossDocument = getDocumentFromURL(jbossUrl);
-
+
metaData.setUrl(jbossUrl);
metaData.importJbossXml(jbossDocument.getDocumentElement());
+ }
+ }
+ catch (Exception ex)
+ {
+ Logger.error("failed to load jboss.xml. There could be a syntax
error.");
+ throw ex;
}
return metaData;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
