Author: alessio.soldano(a)jboss.com Date: 2011-10-11 02:58:56 -0400 (Tue, 11 Oct 2011) New Revision: 15069 Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ModuleClassLoaderProvider.java Log: [JBWS-3366] Merging changes from 4.0.0.Beta1 tag: - updating to latest spi Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java =================================================================== --- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2011-10-11 06:50:41 UTC (rev 15068) +++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2011-10-11 06:58:56 UTC (rev 15069) @@ -36,7 +36,7 @@ public class ServletDelegateFactoryImpl implements ServletDelegateFactory { @Override - public ServletDelegate newServletDelegate(String servletClassName) { + public ServletDelegate newServletDelegate(String servletClassName, boolean isJaxWs) { try { ClassLoader classLoader = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); Class<?> clazz = classLoader.loadClass(servletClassName); Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ModuleClassLoaderProvider.java =================================================================== --- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ModuleClassLoaderProvider.java 2011-10-11 06:50:41 UTC (rev 15068) +++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ModuleClassLoaderProvider.java 2011-10-11 06:58:56 UTC (rev 15069) @@ -61,4 +61,10 @@ ClassLoaderProvider.setDefaultProvider(new ModuleClassLoaderProvider()); } + @Override + public ClassLoader getServerJAXRPCIntegrationClassLoader() + { + throw new RuntimeException("JAXRPC Integration not available on AS 7.0.x"); + } + }