[jboss-svn-commits] JBossWS SVN: r677 - trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema

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

Author: heiko.braun at jboss.com
Date: 2006-08-03 10:33:57 -0400 (Thu, 03 Aug 2006)
New Revision: 677

Modified:
   trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java
Log:
delegate to JKBossEntityResolver

Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java	2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java	2006-08-03 14:33:57 UTC (rev 677)
@@ -72,8 +72,27 @@
    {
       log.trace("Resolve entity: " + resId);
 
+      // First try the JBossEntityResolver
+      String publicId = resId.getPublicId();
+      String systemId = resId.getLiteralSystemId();
+      String namespace = resId.getNamespace();
       try
       {
+         String publicURI = (publicId != null ? publicId : namespace);
+         InputSource inputSource = resolver.resolveEntity(publicURI, systemId);
+         if (inputSource != null)
+         {
+            XMLInputSource source = getXMLInputSource(inputSource, resId);
+            return source;
+         }         
+      }
+      catch (Exception ex)
+      {
+         log.trace(ex);
+      }      
+      
+      try
+      {
          String expandedSysId = resId.getExpandedSystemId();
          if (expandedSysId != null)
          {
@@ -88,11 +107,10 @@
 
       try
       {
-         String literalSysId = resId.getLiteralSystemId();
-         if (literalSysId != null)
+         if (systemId != null)
          {
-            log.trace("Use LiteralSystemId: " + literalSysId);
-            return getXMLInputSource(new URL(literalSysId), resId);
+            log.trace("Use LiteralSystemId: " + systemId);
+            return getXMLInputSource(new URL(systemId), resId);
          }
       }
       catch (IOException e)