Author: thomas.diesler(a)jboss.com Date: 2006-12-15 09:53:18 -0500 (Fri, 15 Dec 2006) New Revision: 1659 Modified: branches/tdiesler/trunk/.classpath branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToXSD.java Log: Fix handling of imported wsdl resources Modified: branches/tdiesler/trunk/.classpath =================================================================== --- branches/tdiesler/trunk/.classpath 2006-12-15 13:30:24 UTC (rev 1658) +++ branches/tdiesler/trunk/.classpath 2006-12-15 14:53:18 UTC (rev 1659) @@ -8,7 +8,7 @@ <classpathentry kind="lib" path="thirdparty/qdox.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/> - <classpathentry kind="lib" path="thirdparty/xercesImpl.jar"/> + <classpathentry kind="lib" path="thirdparty/xercesImpl.jar" sourcepath="/home/tdiesler/workspace/xerces-2_9_0/src"/> <classpathentry kind="lib" path="thirdparty/xml-apis.jar"/> <classpathentry kind="lib" path="thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/> Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToXSD.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2006-12-15 13:30:24 UTC (rev 1658) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/JavaToXSD.java 2006-12-15 14:53:18 UTC (rev 1659) @@ -31,16 +31,19 @@ import javax.xml.namespace.QName; +import org.apache.xerces.impl.xs.SchemaGrammar; import org.apache.xerces.impl.xs.XMLSchemaLoader; +import org.apache.xerces.impl.xs.XSModelImpl; +import org.apache.xerces.xni.parser.XMLInputSource; import org.apache.xerces.xs.XSModel; import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.utils.JBossWSEntityResolver; +import org.jboss.ws.core.utils.ResourceURL; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSEntityResolver; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSErrorHandler; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSStringList; import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; import org.jboss.ws.tools.helpers.JavaToXSDHelper; @@ -129,11 +132,11 @@ JBossWSEntityResolver resolver = new JBossWSEntityResolver(); JBossXSEntityResolver xsresolve = new JBossXSEntityResolver(resolver, new HashMap<String, URL>()); XMLSchemaLoader loader = (XMLSchemaLoader)schemautils.getXSLoader(xserr, xsresolve); - + XSModel xsmodel = loader.loadURI(xsdURL.toExternalForm()); if (xsmodel == null) throw new WSException("Cannot load schema: " + xsdURL); - + WSSchemaUtils sutils = WSSchemaUtils.getInstance(null, null); JBossXSModel jbxs = new JBossXSModel(); sutils.copyXSModel(xsmodel, jbxs); @@ -154,56 +157,61 @@ JBossWSEntityResolver resolver = new JBossWSEntityResolver(); JBossXSEntityResolver xsresolve = new JBossXSEntityResolver(resolver, locs); XMLSchemaLoader loader = (XMLSchemaLoader)schemautils.getXSLoader(xserr, xsresolve); - - JBossXSStringList slist = new JBossXSStringList(); - Iterator<String> keys = locs.keySet().iterator(); - while (keys.hasNext()) + + int index = 0; + SchemaGrammar[] gs = new SchemaGrammar[locs.size()]; + Iterator<String> it = locs.keySet().iterator(); + while (it.hasNext()) { - String nsURI = keys.next(); - URL orgURL = locs.get(nsURI); - URL resURL = resolveNamespaceURI(resolver, nsURI); - URL url = resURL != null ? resURL : orgURL; - log.debug("load schema: " + nsURI + "=" + url); - slist.addItem(url.toExternalForm()); + try + { + String nsURI = it.next(); + URL orgURL = locs.get(nsURI); + URL resURL = resolveNamespaceURI(resolver, nsURI); + URL url = resURL != null ? resURL : orgURL; + log.debug("Load schema: " + nsURI + "=" + url); + XMLInputSource inputSource = new XMLInputSource(null, url.toExternalForm(), null); + inputSource.setByteStream(new ResourceURL(url).openStream()); + gs[index++] = (SchemaGrammar)loader.loadGrammar(inputSource); + } + catch (Exception ex) + { + log.error("Cannot parse schema", ex); + return null; + } } - - XSModel xsmodel = loader.loadURIList(slist); - if (xsmodel == null) - throw new WSException("Cannot load schema: " + slist); + XSModel xsmodel = new XSModelImpl(gs); - //TODO: Once JBXB-33 is fixed, migrate Schema Parsing to XB - //XSModel xsmodel = Util.loadSchema(slist,this.getSchemaBindingResolver(locs)); - // Convert Xerces XSModel into r/w JBossXSModel WSSchemaUtils sutils = WSSchemaUtils.getInstance(null, null); JBossXSModel jbxs = new JBossXSModel(); sutils.copyXSModel(xsmodel, jbxs); - + return jbxs; } private URL resolveNamespaceURI(JBossWSEntityResolver resolver, String nsURI) { URL url = null; - + String resource = (String)resolver.getEntityMap().get(nsURI); if (resource != null) { ClassLoader loader = Thread.currentThread().getContextClassLoader(); url = loader.getResource(resource); - if( url == null ) + if (url == null) { - if( resource.endsWith(".dtd") ) + if (resource.endsWith(".dtd")) resource = "dtd/" + resource; - else if( resource.endsWith(".xsd") ) + else if (resource.endsWith(".xsd")) resource = "schema/" + resource; url = loader.getResource(resource); } } - + return url; } - + /** * @see org.jboss.ws.tools.interfaces.JavaToXSDIntf#setPackageNamespaceMap(java.util.Map) */ @@ -229,7 +237,8 @@ */ private SchemaBindingResolver getSchemaBindingResolver(final Map<String, URL> map) { - return new SchemaBindingResolver() { + return new SchemaBindingResolver() + { public String getBaseURI() { throw new UnsupportedOperationException("getBaseURI is not implemented.");