You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/01 11:23:36 UTC
tomee git commit: better fallback for wsdl location - our default
algorithm playing with URL can fail where classloader abstract more things
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 2edc90fa2 -> 7165993a8
better fallback for wsdl location - our default algorithm playing with URL can fail where classloader abstract more things
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7165993a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7165993a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7165993a
Branch: refs/heads/tomee-1.7.x
Commit: 7165993a8ca149fb255130d804e8a03d600b4d4f
Parents: 2edc90f
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Dec 1 11:23:21 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Dec 1 11:23:21 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/WsDeployer.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7165993a/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
index e97eb23..8070d2a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
@@ -416,10 +416,21 @@ public class WsDeployer implements DynamicDeployer {
wsdlUrl = new URL(baseUrl, wsdlFile);
}
+
final Definition definition = readWsdl(wsdlUrl);
module.getAltDDs().put(wsdlFile, definition);
return definition;
} catch (final Exception e) {
+ if (module.getClassLoader() != null) {
+ final URL wsdlUrl = module.getClassLoader().getResource(wsdlFile.startsWith("classpath:") ? wsdlFile.substring("classpath:".length()) : wsdlFile);
+ try {
+ final Definition definition = readWsdl(wsdlUrl);
+ module.getAltDDs().put(wsdlFile, definition);
+ return definition;
+ } catch (final OpenEJBException e1) {
+ // no-op
+ }
+ }
logger.error("Unable to read wsdl file " + wsdlFile);
}