Author: alessio.soldano(a)jboss.com
Date: 2011-04-16 21:54:10 -0400 (Sat, 16 Apr 2011)
New Revision: 14124
Modified:
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
Log:
[JBWS-3242] Allow for looking up jbossws-entities.properties
Modified: common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2011-04-15
13:03:51 UTC (rev 14123)
+++
common/trunk/src/main/java/org/jboss/ws/core/utils/JBossWSEntityResolver.java 2011-04-17
01:54:10 UTC (rev 14124)
@@ -36,6 +36,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.xml.JBossEntityResolver;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -103,7 +104,10 @@
{
public Properties run()
{
- InputStream is = classLoader.getResourceAsStream(entitiesResource);
+ //use a delegate classloader: first try lookup using the provided
classloader,
+ //otherwise use server integration classloader which has the default
configuration
+ final ClassLoader intCl =
ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ InputStream is = new DelegateClassLoader(intCl,
classLoader).getResourceAsStream(entitiesResource);
// get stream
if (is == null)
throw new IllegalArgumentException("Resource " +
entitiesResource + " not found");
Show replies by date