cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r814102 - in /cxf/branches/2.2.x-fixes: ./ tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Date Sat, 12 Sep 2009 01:18:32 GMT
Author: dkulp
Date: Sat Sep 12 01:18:32 2009
New Revision: 814102

URL: http://svn.apache.org/viewvc?rev=814102&view=rev
Log:
Merged revisions 814100 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r814100 | dkulp | 2009-09-11 21:15:10 -0400 (Fri, 11 Sep 2009) | 1 line
  
  Make sure sys id is set during validation
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 12 01:18:32 2009
@@ -1 +1 @@
-/cxf/trunk:813943,813953,814011
+/cxf/trunk:813943,813953,814011,814100

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=814102&r1=814101&r2=814102&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++ cxf/branches/2.2.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Sat Sep 12 01:18:32 2009
@@ -383,10 +383,9 @@
                     throw new RuntimeException(e);
                 }
                 Element ele = docs[0].getDocumentElement();
-    
                 ele = removeImportElement(ele);
                 if (context.get(ToolConstants.CFG_VALIDATE_WSDL) != null) {
-                    validateSchema(ele);
+                    validateSchema(ele, docs[0].getDocumentURI());
                 }           
                 InputSource is = new InputSource((InputStream)null);
                 //key = key.replaceFirst("#types[0-9]+$", "");
@@ -431,7 +430,7 @@
                 Element ele = sci.getElement();
                 ele = removeImportElement(ele);
                 if (context.get(ToolConstants.CFG_VALIDATE_WSDL) != null) {
-                    validateSchema(ele);
+                    validateSchema(ele, sci.getSystemId());
                 }           
                 InputSource is = new InputSource((InputStream)null);
                 //key = key.replaceFirst("#types[0-9]+$", "");
@@ -635,9 +634,9 @@
     }
 
     
-    public void validateSchema(Element ele) throws ToolException {
+    public void validateSchema(Element ele, String uri) throws ToolException {
         SchemaFactory schemaFact = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-        DOMSource domSrc = new DOMSource(ele);
+        DOMSource domSrc = new DOMSource(ele, uri);
         try {
             schemaFact.newSchema(domSrc);
         } catch (SAXException e) {



Mime
View raw message