You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/10/25 16:55:33 UTC
svn commit: r1402178 -
/cxf/branches/2.5.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Author: dkulp
Date: Thu Oct 25 14:55:32 2012
New Revision: 1402178
URL: http://svn.apache.org/viewvc?rev=1402178&view=rev
Log:
Merged revisions 1401768 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1401768 | dkulp | 2012-10-24 12:38:31 -0400 (Wed, 24 Oct 2012) | 10 lines
Merged revisions 1401763 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1401763 | dkulp | 2012-10-24 12:25:02 -0400 (Wed, 24 Oct 2012) | 2 lines
[CXF-4598] Problem with resolving imports/includes with validation turned on.
........
........
Modified:
cxf/branches/2.5.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Modified: cxf/branches/2.5.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.5.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1402178&r1=1402177&r2=1402178&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Thu Oct 25 14:55:32 2012
@@ -641,7 +641,6 @@ public class JAXBDataBinding implements
throw new RuntimeException(e);
}
Element ele = docs[0].getDocumentElement();
- ele = removeImportElement(ele, key, catalog);
if (context.get(ToolConstants.CFG_VALIDATE_WSDL) != null) {
String uri = null;
try {
@@ -651,6 +650,7 @@ public class JAXBDataBinding implements
}
validateSchema(ele, uri, catalog);
}
+ ele = removeImportElement(ele, key, catalog);
try {
docs[0].setDocumentURI(key);
} catch (Throwable t) {
@@ -716,10 +716,10 @@ public class JAXBDataBinding implements
}
ids.add(key);
Element ele = sci.getElement();
- ele = removeImportElement(ele, key, catalog);
if (context.get(ToolConstants.CFG_VALIDATE_WSDL) != null) {
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);