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 2007/11/06 01:49:58 UTC
svn commit: r592213 - in /incubator/cxf/branches/2.0.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
Author: dkulp
Date: Mon Nov 5 16:49:52 2007
New Revision: 592213
URL: http://svn.apache.org/viewvc?rev=592213&view=rev
Log:
Merged revisions 592181 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r592181 | dkulp | 2007-11-05 18:28:44 -0500 (Mon, 05 Nov 2007) | 2 lines
Allow lookup of URL's for resources loaded from the BusApplicationContextResourceResolver
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java?rev=592213&r1=592212&r2=592213&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java Mon Nov 5 16:49:52 2007
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import org.apache.cxf.resource.ResourceResolver;
@@ -54,12 +55,23 @@
public <T> T resolve(String resourceName, Class<T> resourceType) {
if (resourceName == null) {
return null;
- }
- try {
+ }
+ try {
return resourceType.cast(context.getBean(resourceName, resourceType));
} catch (NoSuchBeanDefinitionException def) {
- return null;
+ //ignore
+ }
+ try {
+ if (URL.class.isAssignableFrom(resourceType)) {
+ Resource r = context.getResource(resourceName);
+ if (r != null && r.exists()) {
+ return resourceType.cast(r.getURL());
+ }
+ }
+ } catch (IOException e) {
+ //ignore
}
+ return null;
}