Author: alessio.soldano(a)jboss.com Date: 2011-10-11 02:50:41 -0400 (Tue, 11 Oct 2011) New Revision: 15068 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java Log: [JBWS-3366] Merging changes from 2.0.0.Beta10 tag - Adding jaxrpc integration classloader retrieval method in ClassLoaderProvider - Adding flag for deployment/classloader type in ServletDelegateFactory Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-10-10 14:23:55 UTC (rev 15067) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/classloading/ClassLoaderProvider.java 2011-10-11 06:50:41 UTC (rev 15068) @@ -46,6 +46,12 @@ { return getContextClassLoader(); } + + @Override + public ClassLoader getServerJAXRPCIntegrationClassLoader() + { + return getContextClassLoader(); + } }; public static void setDefaultProvider(ClassLoaderProvider p) @@ -66,12 +72,19 @@ public abstract ClassLoader getWebServiceSubsystemClassLoader(); /** - * Return the ClassLoader instance having visibility over the all server side ws libraries + * Return the ClassLoader instance having visibility over the all server side ws libraries (for JAXWS usage) * * @return */ public abstract ClassLoader getServerIntegrationClassLoader(); + /** + * Return the ClassLoader instance having visibility over the all server side ws libraries (for JAXRPC usage) + * + * @return + */ + public abstract ClassLoader getServerJAXRPCIntegrationClassLoader(); + static ClassLoader getContextClassLoader() { if (System.getSecurityManager() == null) Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2011-10-10 14:23:55 UTC (rev 15067) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2011-10-11 06:50:41 UTC (rev 15068) @@ -30,5 +30,5 @@ */ public interface ServletDelegateFactory { - public ServletDelegate newServletDelegate(String delegateClassName); + public ServletDelegate newServletDelegate(String delegateClassName, boolean isJaxWs); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-10-10 14:23:55 UTC (rev 15067) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2011-10-11 06:50:41 UTC (rev 15068) @@ -43,6 +43,7 @@ public class WSFServlet extends HttpServlet { public static final String STACK_SERVLET_DELEGATE_CLASS = "org.jboss.wsf.spi.deployment.stackServletDelegateClass"; + public static final String INTEGRATION_CLASSLOADER = "org.jboss.wsf.spi.deployment.integrationClassLoader"; private ServletDelegate delegate = null; @@ -73,7 +74,8 @@ ClassLoader cl = clProvider.getWebServiceSubsystemClassLoader(); ServiceLoader<ServletDelegateFactory> sl = ServiceLoader.load(ServletDelegateFactory.class, cl); ServletDelegateFactory factory = sl.iterator().next(); - return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS)); + boolean isJaxWs = DeploymentType.JAXWS.toString().equals(servletConfig.getInitParameter(INTEGRATION_CLASSLOADER)); + return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS), isJaxWs); } @Override