JBossWS SVN: r14034 - stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:40:02 -0400 (Thu, 07 Apr 2011)
New Revision: 14034
Modified:
stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml
Log:
Add dependency on servlet api to jbossws-spi module declaration
Modified: stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml
===================================================================
--- stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml 2011-04-07 13:38:37 UTC (rev 14033)
+++ stack/cxf/branches/asoldano/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml 2011-04-07 13:40:02 UTC (rev 14034)
@@ -30,6 +30,7 @@
<dependencies>
<module name="javax.api"/>
+ <module name="javax.servlet.api"/>
<module name="javax.xml.stream.api"/>
<module name="javax.xml.ws.api"/>
<module name="org.jboss.logging"/>
13 years, 1 month
JBossWS SVN: r14033 - stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:38:37 -0400 (Thu, 07 Apr 2011)
New Revision: 14033
Modified:
stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
Log:
CXF servlet extensions now implement ServletDelegate
Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java
===================================================================
--- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-07 13:37:29 UTC (rev 14032)
+++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFNonSpringServletExt.java 2011-04-07 13:38:37 UTC (rev 14033)
@@ -21,7 +21,10 @@
*/
package org.jboss.wsf.stack.cxf;
+import java.io.IOException;
+
import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,6 +36,7 @@
import org.apache.cxf.transport.servlet.ServletController;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.ServletDelegate;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.transport.ServletHelper;
@@ -43,7 +47,7 @@
* @since 16-Jun-2010
*
*/
-public class CXFNonSpringServletExt extends CXFNonSpringServlet
+public class CXFNonSpringServletExt extends CXFNonSpringServlet implements ServletDelegate
{
protected Endpoint endpoint;
@@ -95,4 +99,46 @@
{
ServletHelper.callPreDestroy(endpoint);
}
+
+ @Override
+ public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doHead(request, response);
+ }
+
+ @Override
+ public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doGet(request, response);
+ }
+
+ @Override
+ public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doPost(request, response);
+ }
+
+ @Override
+ public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doPut(request, response);
+ }
+
+ @Override
+ public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doDelete(request, response);
+ }
+
+ @Override
+ public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.service(request, response);
+ }
}
Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java
===================================================================
--- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-07 13:37:29 UTC (rev 14032)
+++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2011-04-07 13:38:37 UTC (rev 14033)
@@ -21,7 +21,10 @@
*/
package org.jboss.wsf.stack.cxf;
+import java.io.IOException;
+
import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,6 +36,7 @@
import org.apache.cxf.transport.servlet.ServletController;
import org.apache.cxf.transport.servlet.ServletTransportFactory;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.ServletDelegate;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.transport.ServletHelper;
@@ -44,7 +48,7 @@
*
* @since 21-Apr-2007
*/
-public class CXFServletExt extends CXFServlet
+public class CXFServletExt extends CXFServlet implements ServletDelegate
{
protected Endpoint endpoint;
@@ -95,6 +99,46 @@
{
ServletHelper.callPreDestroy(endpoint);
}
-
+ @Override
+ public void doHead(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doHead(request, response);
+ }
+
+ @Override
+ public void doGet(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doGet(request, response);
+ }
+
+ @Override
+ public void doPost(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doPost(request, response);
+ }
+
+ @Override
+ public void doPut(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doPut(request, response);
+ }
+
+ @Override
+ public void doDelete(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.doDelete(request, response);
+ }
+
+ @Override
+ public void service(HttpServletRequest request, HttpServletResponse response, ServletContext context)
+ throws ServletException, IOException
+ {
+ this.service(request, response);
+ }
}
13 years, 1 month
JBossWS SVN: r14032 - stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:37:29 -0400 (Thu, 07 Apr 2011)
New Revision: 14032
Modified:
stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
Log:
Set proper TCCL in BusDeploymentAspect now that it does not come with the ws impl modules as dependencies
Modified: stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-04-07 13:29:17 UTC (rev 14031)
+++ stack/cxf/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-04-07 13:37:29 UTC (rev 14032)
@@ -72,7 +72,7 @@
BusHolder holder = null;
//set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes
- SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
+ SecurityActions.setContextClassLoader(new DelegateClassLoader(dep.getRuntimeClassLoader(), origClassLoader));
if (jbosswsCxfXml != null) // Spring available
{
URL cxfServletURL = null;
13 years, 1 month
JBossWS SVN: r14031 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:29:17 -0400 (Thu, 07 Apr 2011)
New Revision: 14031
Added:
stack/cxf/branches/asoldano/
Log:
Branching for working on classloading changes related to avoidind exposing ws implementation classes to user classpath on AS7
13 years, 1 month
JBossWS SVN: r14030 - common/branches/asoldano/src/main/java/org/jboss/wsf/common/invocation.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:27:13 -0400 (Thu, 07 Apr 2011)
New Revision: 14030
Modified:
common/branches/asoldano/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXWS.java
Log:
Avoid going through SPIResolver for getting a ResourceInjector for JSE invocation handling
Modified: common/branches/asoldano/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXWS.java
===================================================================
--- common/branches/asoldano/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXWS.java 2011-04-07 13:25:56 UTC (rev 14029)
+++ common/branches/asoldano/src/main/java/org/jboss/wsf/common/invocation/InvocationHandlerJAXWS.java 2011-04-07 13:27:13 UTC (rev 14030)
@@ -26,13 +26,9 @@
import org.jboss.wsf.common.injection.InjectionHelper;
import org.jboss.wsf.common.injection.PreDestroyHolder;
import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.invocation.ResourceInjector;
-import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
/**
@@ -69,10 +65,7 @@
if (injectionsMD != null)
InjectionHelper.injectResources(targetBean, injectionsMD, endpoint.getJNDIContext());
- final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- final ResourceInjectorFactory resourceInjectorFactory = spiProvider.getSPI(ResourceInjectorFactory.class);
- final ResourceInjector wsContextInjector = resourceInjectorFactory.newResourceInjector();
- wsContextInjector.inject(targetBean, ThreadLocalAwareWebServiceContext.getInstance());
+ InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAwareWebServiceContext.getInstance());
this.log.debug("Calling postConstruct method on JAXWS JSE endpoint: " + targetBean);
InjectionHelper.callPostConstructMethod(targetBean);
13 years, 1 month
JBossWS SVN: r14029 - in common/branches/asoldano/src/main/java/org/jboss/wsf/framework: management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:25:56 -0400 (Thu, 07 Apr 2011)
New Revision: 14029
Modified:
common/branches/asoldano/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
common/branches/asoldano/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
Log:
Use server integration classloader for endpoint registry lookup and add option for providing classloader to be used for SPI resolution
Modified: common/branches/asoldano/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- common/branches/asoldano/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2011-04-07 13:22:17 UTC (rev 14028)
+++ common/branches/asoldano/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2011-04-07 13:25:56 UTC (rev 14029)
@@ -49,55 +49,55 @@
*/
class DefaultSPIProvider extends SPIProvider
{
-
/**
- * Gets the specified SPI.
+ * Gets the specified SPI, using the provided classloader
*/
- public <T> T getSPI(Class<T> spiType)
+ @Override
+ public <T> T getSPI(Class<T> spiType, ClassLoader loader)
{
T returnType = null;
// SPIs provided by framework, defaults can be overridden
if (DeploymentModelFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultDeploymentModelFactory.class);
+ returnType = loadService(spiType, DefaultDeploymentModelFactory.class, loader);
}
else if (EndpointMetricsFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultEndpointMetricsFactory.class);
+ returnType = loadService(spiType, DefaultEndpointMetricsFactory.class, loader);
}
else if (LifecycleHandlerFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class);
+ returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class, loader);
}
else if (ResourceInjectorFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultResourceInjectorFactory.class);
+ returnType = loadService(spiType, DefaultResourceInjectorFactory.class, loader);
}
else if (ServiceRefHandlerFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class);
+ returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class, loader);
}
else if (SecurityAdaptorFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultSecurityAdapterFactory.class);
+ returnType = loadService(spiType, DefaultSecurityAdapterFactory.class, loader);
}
else if (EndpointRegistryFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultEndpointRegistryFactory.class);
+ returnType = loadService(spiType, DefaultEndpointRegistryFactory.class, loader);
}
else if (Deployer.class.equals(spiType))
{
- returnType = loadService(spiType, DeployerJBoss6.class);
+ returnType = loadService(spiType, DeployerJBoss6.class, loader);
}
else if (JMSEndpointResolver.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultJMSEndpointResolver.class);
+ returnType = loadService(spiType, DefaultJMSEndpointResolver.class, loader);
}
else
{
// SPI provided by either container or stack integration that has no default implementation
- returnType = (T)loadService(spiType, null);
+ returnType = (T)loadService(spiType, null, loader);
}
if (returnType == null)
@@ -108,10 +108,10 @@
// Load SPI implementation through ServiceLoader
@SuppressWarnings("unchecked")
- private <T> T loadService(Class<T> spiType, Class<?> defaultImpl)
+ private <T> T loadService(Class<T> spiType, Class<?> defaultImpl, ClassLoader loader)
{
final String defaultImplName = defaultImpl != null ? defaultImpl.getName() : null;
- return (T)ServiceLoader.loadService(spiType.getName(), defaultImplName);
+ return (T)ServiceLoader.loadService(spiType.getName(), defaultImplName, loader);
}
}
Modified: common/branches/asoldano/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
===================================================================
--- common/branches/asoldano/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java 2011-04-07 13:22:17 UTC (rev 14028)
+++ common/branches/asoldano/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java 2011-04-07 13:25:56 UTC (rev 14029)
@@ -25,6 +25,7 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.ioc.IoCContainerProxy;
import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
import org.jboss.wsf.spi.management.EndpointRegistry;
@@ -62,8 +63,9 @@
{
try
{
- final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+ final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class, cl);
final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
EndpointRegistry registry = null;
13 years, 1 month
JBossWS SVN: r14028 - in common/trunk/src/main/java/org/jboss/wsf/framework: management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:22:17 -0400 (Thu, 07 Apr 2011)
New Revision: 14028
Modified:
common/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
common/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
Log:
Rollback revisions 14026, 14025 which are meant for asoldano branch - sorry
Modified: common/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2011-04-07 13:17:28 UTC (rev 14027)
+++ common/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2011-04-07 13:22:17 UTC (rev 14028)
@@ -49,55 +49,55 @@
*/
class DefaultSPIProvider extends SPIProvider
{
+
/**
- * Gets the specified SPI, using the provided classloader
+ * Gets the specified SPI.
*/
- @Override
- public <T> T getSPI(Class<T> spiType, ClassLoader loader)
+ public <T> T getSPI(Class<T> spiType)
{
T returnType = null;
// SPIs provided by framework, defaults can be overridden
if (DeploymentModelFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultDeploymentModelFactory.class, loader);
+ returnType = loadService(spiType, DefaultDeploymentModelFactory.class);
}
else if (EndpointMetricsFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultEndpointMetricsFactory.class, loader);
+ returnType = loadService(spiType, DefaultEndpointMetricsFactory.class);
}
else if (LifecycleHandlerFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class, loader);
+ returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class);
}
else if (ResourceInjectorFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultResourceInjectorFactory.class, loader);
+ returnType = loadService(spiType, DefaultResourceInjectorFactory.class);
}
else if (ServiceRefHandlerFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class, loader);
+ returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class);
}
else if (SecurityAdaptorFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultSecurityAdapterFactory.class, loader);
+ returnType = loadService(spiType, DefaultSecurityAdapterFactory.class);
}
else if (EndpointRegistryFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultEndpointRegistryFactory.class, loader);
+ returnType = loadService(spiType, DefaultEndpointRegistryFactory.class);
}
else if (Deployer.class.equals(spiType))
{
- returnType = loadService(spiType, DeployerJBoss6.class, loader);
+ returnType = loadService(spiType, DeployerJBoss6.class);
}
else if (JMSEndpointResolver.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultJMSEndpointResolver.class, loader);
+ returnType = loadService(spiType, DefaultJMSEndpointResolver.class);
}
else
{
// SPI provided by either container or stack integration that has no default implementation
- returnType = (T)loadService(spiType, null, loader);
+ returnType = (T)loadService(spiType, null);
}
if (returnType == null)
@@ -108,10 +108,10 @@
// Load SPI implementation through ServiceLoader
@SuppressWarnings("unchecked")
- private <T> T loadService(Class<T> spiType, Class<?> defaultImpl, ClassLoader loader)
+ private <T> T loadService(Class<T> spiType, Class<?> defaultImpl)
{
final String defaultImplName = defaultImpl != null ? defaultImpl.getName() : null;
- return (T)ServiceLoader.loadService(spiType.getName(), defaultImplName, loader);
+ return (T)ServiceLoader.loadService(spiType.getName(), defaultImplName);
}
}
Modified: common/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java 2011-04-07 13:17:28 UTC (rev 14027)
+++ common/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java 2011-04-07 13:22:17 UTC (rev 14028)
@@ -25,7 +25,6 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
-import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.ioc.IoCContainerProxy;
import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
import org.jboss.wsf.spi.management.EndpointRegistry;
@@ -63,9 +62,8 @@
{
try
{
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class, cl);
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
EndpointRegistry registry = null;
13 years, 1 month
JBossWS SVN: r14027 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:17:28 -0400 (Thu, 07 Apr 2011)
New Revision: 14027
Added:
common/branches/asoldano/
Log:
Branching for working on classloading changes related to avoidind exposing ws implementation classes to user classpath on AS7 (-r 14024)
13 years, 1 month
JBossWS SVN: r14026 - common/trunk/src/main/java/org/jboss/wsf/framework/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:15:07 -0400 (Thu, 07 Apr 2011)
New Revision: 14026
Modified:
common/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
Log:
Use server integration classloader for endoint registry lookup
Modified: common/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java 2011-04-07 13:14:31 UTC (rev 14025)
+++ common/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java 2011-04-07 13:15:07 UTC (rev 14026)
@@ -25,6 +25,7 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
import org.jboss.wsf.spi.ioc.IoCContainerProxy;
import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
import org.jboss.wsf.spi.management.EndpointRegistry;
@@ -62,8 +63,9 @@
{
try
{
- final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+ final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class, cl);
final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
EndpointRegistry registry = null;
13 years, 1 month
JBossWS SVN: r14025 - common/trunk/src/main/java/org/jboss/wsf/framework.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-04-07 09:14:31 -0400 (Thu, 07 Apr 2011)
New Revision: 14025
Modified:
common/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
Log:
Adding option for providing classloader to be used for SPI resolution
Modified: common/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2011-04-07 13:12:36 UTC (rev 14024)
+++ common/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2011-04-07 13:14:31 UTC (rev 14025)
@@ -49,55 +49,55 @@
*/
class DefaultSPIProvider extends SPIProvider
{
-
/**
- * Gets the specified SPI.
+ * Gets the specified SPI, using the provided classloader
*/
- public <T> T getSPI(Class<T> spiType)
+ @Override
+ public <T> T getSPI(Class<T> spiType, ClassLoader loader)
{
T returnType = null;
// SPIs provided by framework, defaults can be overridden
if (DeploymentModelFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultDeploymentModelFactory.class);
+ returnType = loadService(spiType, DefaultDeploymentModelFactory.class, loader);
}
else if (EndpointMetricsFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultEndpointMetricsFactory.class);
+ returnType = loadService(spiType, DefaultEndpointMetricsFactory.class, loader);
}
else if (LifecycleHandlerFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class);
+ returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class, loader);
}
else if (ResourceInjectorFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultResourceInjectorFactory.class);
+ returnType = loadService(spiType, DefaultResourceInjectorFactory.class, loader);
}
else if (ServiceRefHandlerFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class);
+ returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class, loader);
}
else if (SecurityAdaptorFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultSecurityAdapterFactory.class);
+ returnType = loadService(spiType, DefaultSecurityAdapterFactory.class, loader);
}
else if (EndpointRegistryFactory.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultEndpointRegistryFactory.class);
+ returnType = loadService(spiType, DefaultEndpointRegistryFactory.class, loader);
}
else if (Deployer.class.equals(spiType))
{
- returnType = loadService(spiType, DeployerJBoss6.class);
+ returnType = loadService(spiType, DeployerJBoss6.class, loader);
}
else if (JMSEndpointResolver.class.equals(spiType))
{
- returnType = loadService(spiType, DefaultJMSEndpointResolver.class);
+ returnType = loadService(spiType, DefaultJMSEndpointResolver.class, loader);
}
else
{
// SPI provided by either container or stack integration that has no default implementation
- returnType = (T)loadService(spiType, null);
+ returnType = (T)loadService(spiType, null, loader);
}
if (returnType == null)
@@ -108,10 +108,10 @@
// Load SPI implementation through ServiceLoader
@SuppressWarnings("unchecked")
- private <T> T loadService(Class<T> spiType, Class<?> defaultImpl)
+ private <T> T loadService(Class<T> spiType, Class<?> defaultImpl, ClassLoader loader)
{
final String defaultImplName = defaultImpl != null ? defaultImpl.getName() : null;
- return (T)ServiceLoader.loadService(spiType.getName(), defaultImplName);
+ return (T)ServiceLoader.loadService(spiType.getName(), defaultImplName, loader);
}
}
13 years, 1 month