[jboss-svn-commits] JBossWS SVN: r620 - in branches/jbossws-1.0/src/main/java/org/jboss/ws: jaxb metadata/wsdl

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

Author: heiko.braun at jboss.com
Date: 2006-07-19 08:44:57 -0400 (Wed, 19 Jul 2006)
New Revision: 620

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBSupport.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/SchemaBindingBuilder.java
   branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
Log:
use local entity resolver that registeres wsa resources

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBSupport.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBSupport.java	2006-07-19 11:09:04 UTC (rev 619)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBSupport.java	2006-07-19 12:44:57 UTC (rev 620)
@@ -12,9 +12,11 @@
 import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
 import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
 import org.jboss.ws.WSException;
+import org.jboss.util.xml.JBossEntityResolver;
 import org.w3c.dom.Element;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
+import org.xml.sax.EntityResolver;
 
 import javax.xml.namespace.QName;
 import java.util.Map;
@@ -103,4 +105,13 @@
          }
       };
    }
+
+   /**
+    * Create an entity resolver that has local entites registered.
+    */
+   public static JBossEntityResolver createEntityResolver() {
+      JBossEntityResolver resolver = new JBossEntityResolver();
+      resolver.registerLocalEntity("http://www.w3.org/2005/08/addressing", "schema/ws-addr.xsd");      
+      return resolver;
+   }
 }

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/SchemaBindingBuilder.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/SchemaBindingBuilder.java	2006-07-19 11:09:04 UTC (rev 619)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/SchemaBindingBuilder.java	2006-07-19 12:44:57 UTC (rev 620)
@@ -47,6 +47,7 @@
 import org.jboss.xb.binding.metadata.ValueMetaData;
 import org.jboss.xb.binding.sunday.unmarshalling.*;
 import org.jboss.xb.binding.sunday.unmarshalling.impl.runtime.RtElementHandler;
+import org.jboss.util.xml.JBossEntityResolver;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 import org.xml.sax.Attributes;
@@ -71,7 +72,8 @@
     */
    public SchemaBinding buildSchemaBinding(XSModel model, JavaWsdlMapping wsdlMapping)
    {
-      SchemaBinding schemaBinding = XsdBinder.bind(model, new DefaultSchemaResolver());
+      JBossEntityResolver resolver = JBossXBSupport.createEntityResolver();
+      SchemaBinding schemaBinding = XsdBinder.bind(model, new DefaultSchemaResolver(resolver));
 
       schemaBinding.setIgnoreLowLine(false);
       schemaBinding.setIgnoreUnresolvedFieldOrClass(false);

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java	2006-07-19 11:09:04 UTC (rev 619)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java	2006-07-19 12:44:57 UTC (rev 620)
@@ -43,6 +43,7 @@
 import org.jboss.util.xml.JBossEntityResolver;
 import org.jboss.ws.Constants;
 import org.jboss.ws.WSException;
+import org.jboss.ws.jaxb.JBossXBSupport;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.EntityResolver;
@@ -102,7 +103,7 @@
       if (wsdlLocation == null)
          throw new IllegalArgumentException("URL cannot be null");
 
-      EntityResolver entityResolver = new JBossEntityResolver();
+      EntityResolver entityResolver = JBossXBSupport.createEntityResolver();
       
       log.debug("parse: " + wsdlLocation.toExternalForm());
       WSDLDefinitions wsdlDefinitions = null;