[jboss-cvs] JBossAS SVN: r63432 - trunk/server/src/main/org/jboss/metadata/serviceref.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-08 14:04:39 -0400 (Fri, 08 Jun 2007)
New Revision: 63432

Modified:
   trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
Log:
User ServiceRefHandlerFactory

Modified: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-06-08 18:04:17 UTC (rev 63431)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefDelegate.java	2007-06-08 18:04:39 UTC (rev 63432)
@@ -26,14 +26,10 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.registry.KernelRegistry;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
 import org.jboss.logging.Logger;
-import org.jboss.ws.integration.FactoryLoader;
-import org.jboss.ws.integration.KernelLocator;
 import org.jboss.ws.integration.ServiceRefElement;
 import org.jboss.ws.integration.ServiceRefHandler;
+import org.jboss.ws.integration.ServiceRefHandlerFactory;
 import org.jboss.ws.integration.ServiceRefMetaData;
 import org.jboss.ws.integration.UnifiedVirtualFile;
 import org.jboss.xb.binding.UnmarshallingContext;
@@ -57,23 +53,11 @@
    {
       if (delegate == null)
       {
-         Kernel kernel = KernelLocator.getKernel();
-         if (kernel != null)
-         {
-            KernelRegistry registry = kernel.getRegistry();
-            KernelRegistryEntry entry = registry.getEntry(ServiceRefHandler.BEAN_NAME);
-            delegate = (ServiceRefHandler)entry.getTarget();
-         }
-         else
-         {
-            String propName = ServiceRefHandler.class.getName();
-            String defaultImpl = "org.jboss.ws.core.client.ServiceRefHandlerImpl";
-            delegate = (ServiceRefHandler)FactoryLoader.loadFactory(propName, defaultImpl);
-         }
+         delegate = ServiceRefHandlerFactory.getServiceRefHandler();
       }
 
       if (delegate == null)
-         log.warn("Not registered: " + ServiceRefHandler.BEAN_NAME);
+         log.warn("ServiceRefHandler not available");
    }
 
    public ServiceRefMetaData newServiceRefMetaData()