[jbossws-commits] JBossWS SVN: r14127 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-04-16 22:02:24 -0400 (Sat, 16 Apr 2011)
New Revision: 14127

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
Log:
Load jbossws client/endpoint default config using server integration classloader


Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java	2011-04-17 02:01:05 UTC (rev 14126)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java	2011-04-17 02:02:24 UTC (rev 14127)
@@ -29,6 +29,7 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.ws.WSException;
+import org.jboss.ws.core.utils.DelegateClassLoader;
 import org.jboss.ws.core.utils.JBossWSEntityResolver;
 import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC;
 import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS;
@@ -36,6 +37,7 @@
 import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS;
 import org.jboss.wsf.common.DOMUtils;
 import org.jboss.wsf.common.ResourceLoaderAdapter;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
 import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
 import org.jboss.xb.binding.JBossXBException;
 import org.jboss.xb.binding.Unmarshaller;
@@ -61,7 +63,10 @@
    // Hide constructor
    private JBossWSConfigFactory(ClassLoader loader)
    {
-      this.loader = loader;
+      //use a delegate classloader: first try lookup using the provided classloader,
+      //otherwise use server integration classloader which has the default configuration
+      final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+      this.loader = new DelegateClassLoader(cl, loader);
    }
 
    /** Create a new instance of the factory