cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1401763 - /cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Date Wed, 24 Oct 2012 16:25:02 GMT
Author: dkulp
Date: Wed Oct 24 16:25:02 2012
New Revision: 1401763

URL: http://svn.apache.org/viewvc?rev=1401763&view=rev
Log:
[CXF-4598] Problem with resolving imports/includes with validation turned on.

Modified:
    cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java

Modified: cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1401763&r1=1401762&r2=1401763&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++ cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Wed Oct 24 16:25:02 2012
@@ -640,7 +640,6 @@ public class JAXBDataBinding implements 
                     throw new RuntimeException(e);
                 }
                 Element ele = docs[0].getDocumentElement();
-                ele = removeImportElement(ele, key, catalog);
                 if (context.fullValidateWSDL()) {
                     String uri = null;
                     try {
@@ -650,6 +649,7 @@ public class JAXBDataBinding implements 
                     }
                     validateSchema(ele, uri, catalog);
                 }
+                ele = removeImportElement(ele, key, catalog);
                 try {
                     docs[0].setDocumentURI(key);
                 } catch (Throwable t) {
@@ -715,10 +715,10 @@ public class JAXBDataBinding implements 
                 }
                 ids.add(key);
                 Element ele = sci.getElement();
-                ele = removeImportElement(ele, key, catalog);
                 if (context.fullValidateWSDL()) {
                     validateSchema(ele, sci.getSystemId(), catalog);
                 }
+                ele = removeImportElement(ele, key, catalog);
                 InputSource is = new InputSource((InputStream)null);
                 //key = key.replaceFirst("#types[0-9]+$", "");
                 is.setSystemId(key);



Mime
View raw message