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 2014/10/27 20:45:53 UTC
git commit: [CXF-6034] Fix problems with mapping schema locations to
resolvable locations when generating the live wsdl
Repository: cxf
Updated Branches:
refs/heads/master 41c7bc2e6 -> 8c5acf358
[CXF-6034] Fix problems with mapping schema locations to resolvable locations when generating the live wsdl
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c5acf35
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c5acf35
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c5acf35
Branch: refs/heads/master
Commit: 8c5acf358164a0a4f0e0baa16d3fd792db67fce6
Parents: 41c7bc2
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Oct 27 15:45:26 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Oct 27 15:45:26 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8c5acf35/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index cdedc6d..07d96e4 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -473,6 +473,9 @@ public class WSDLGetUtils {
if (!doneSchemas.containsKey(decodedStart)) {
String resolvedSchemaLocation = resolveWithCatalogs(catalogs, start, base);
if (resolvedSchemaLocation == null) {
+ resolvedSchemaLocation = resolveWithCatalogs(catalogs, imp.getSchemaLocationURI(), base);
+ }
+ if (resolvedSchemaLocation == null) {
try {
//check to see if it's already in a URL format. If so, leave it.
new URL(start);
@@ -484,6 +487,7 @@ public class WSDLGetUtils {
} else {
if (doneSchemas.put(decodedStart, imp) == null) {
doneSchemas.put(resolvedSchemaLocation, imp);
+ doneSchemas.put(imp.getSchemaLocationURI(), imp);
updateSchemaImports(bus, imp.getReferencedSchema(), docBase, doneSchemas, base);
}
}