[jbossws-commits] JBossWS SVN: r12794 - in framework/trunk/src/main/java/org/jboss/wsf/framework: management and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2010-08-13 07:48:08 -0400 (Fri, 13 Aug 2010)
New Revision: 12794

Removed:
   framework/trunk/src/main/java/org/jboss/wsf/framework/http/
Modified:
   framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
   framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
Log:
[JBWS-3106] get rid of broken HTTP SPI

Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java	2010-08-13 11:44:46 UTC (rev 12793)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java	2010-08-13 11:48:08 UTC (rev 12794)
@@ -24,7 +24,6 @@
 import org.jboss.wsf.framework.deployment.DefaultDeploymentAspectManagerFactory;
 import org.jboss.wsf.framework.deployment.DefaultDeploymentModelFactory;
 import org.jboss.wsf.framework.deployment.DefaultLifecycleHandlerFactory;
-import org.jboss.wsf.framework.http.DefaultHttpContextFactory;
 import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory;
 import org.jboss.wsf.framework.management.DefaultEndpointMetricsFactory;
 import org.jboss.wsf.framework.management.DefaultEndpointRegistryFactory;
@@ -37,7 +36,6 @@
 import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
 import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
 import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory;
-import org.jboss.wsf.spi.http.HttpContextFactory;
 import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
 import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
 import org.jboss.wsf.spi.management.EndpointMetricsFactory;
@@ -74,10 +72,6 @@
       {
          returnType = loadService(spiType, DefaultEndpointMetricsFactory.class);
       }
-      else if (HttpContextFactory.class.equals(spiType))
-      {
-         returnType = loadService(spiType, DefaultHttpContextFactory.class);
-      }
       else if (LifecycleHandlerFactory.class.equals(spiType))
       {
          returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class);

Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java	2010-08-13 11:44:46 UTC (rev 12793)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java	2010-08-13 11:48:08 UTC (rev 12794)
@@ -21,8 +21,10 @@
  */
 package org.jboss.wsf.framework.management;
 
+import org.jboss.logging.Logger;
 import org.jboss.wsf.spi.SPIProvider;
 import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.WSFException;
 import org.jboss.wsf.spi.ioc.IoCContainerProxy;
 import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
 import org.jboss.wsf.spi.management.EndpointRegistry;
@@ -37,8 +39,10 @@
 public final class DefaultEndpointRegistryFactory extends EndpointRegistryFactory
 {
 
+   private Logger log = Logger.getLogger(DefaultEndpointRegistryFactory.class);
    /** The bean name in the kernel registry. */
    private static final String BEAN_NAME = "WSEndpointRegistry";
+   private static final EndpointRegistry fallbackRegistry = new DefaultEndpointRegistry();;
 
    /**
     * Constructor.
@@ -55,11 +59,19 @@
     */
    public EndpointRegistry getEndpointRegistry()
    {
-      final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
-      final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
-      final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
-      
-      return iocContainer.getBean(DefaultEndpointRegistryFactory.BEAN_NAME, EndpointRegistry.class);
+      try
+      {
+         final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+         final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+         final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
+         
+         return iocContainer.getBean(DefaultEndpointRegistryFactory.BEAN_NAME, EndpointRegistry.class);
+      }
+      catch (WSFException e)
+      {
+         log.warn("Unable to get WSEndpointRegistry from IoC, using default one");
+         return fallbackRegistry; // JSE environment
+      }
    }
 
 }