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;