[jboss-svn-commits] JBoss Common SVN: r2105 - common-core/trunk/src/main/java/org/jboss/util/xml

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

Author: adrian at jboss.org
Date: 2006-10-05 08:00:15 -0400 (Thu, 05 Oct 2006)
New Revision: 2105

Modified:
   common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java
Log:
Try the file location as a URI if it is not in the classpath.

Modified: common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java	2006-10-05 11:53:08 UTC (rev 2104)
+++ common-core/trunk/src/main/java/org/jboss/util/xml/JBossEntityResolver.java	2006-10-05 12:00:15 UTC (rev 2105)
@@ -319,7 +319,13 @@
          }
          else
          {
-            log.warn("Cannot load publicId from resource: " + filename);
+            log.trace("Cannot load publicId from classpath resource: " + filename);
+            
+            // Try the file name as a URI
+            inputSource = resolveSystemIDasURL(filename, trace);
+            
+            if (inputSource == null)
+               log.warn("Cannot load publicId from resource: " + filename);
          }
       }