[jbossws-commits] JBossWS SVN: r3515 - in branches/jbossws-2.0: integration/spi/src/main/java/org/jboss/ws/integration and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-06-08 15:17:32 -0400 (Fri, 08 Jun 2007) New Revision: 3515 Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java Log: Remove client runtime dependency on MC Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml =================================================================== --- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-08 18:18:46 UTC (rev 3514) +++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-08 19:17:32 UTC (rev 3515) @@ -122,8 +122,6 @@ <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss.lib}/jboss-microcontainer.jar"/> <pathelement location="${jboss.lib}/jboss-vfs.jar"/> <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.lib}/hibernate3.jar"/> Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-06-08 18:18:46 UTC (rev 3514) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-06-08 19:17:32 UTC (rev 3515) @@ -39,27 +39,38 @@ public static ServiceRefHandler getServiceRefHandler() { ServiceRefHandler handler; - Kernel kernel = KernelLocator.getKernel(); - if (kernel != null) + if (KernelLocator.getKernel() != null) { - KernelRegistry registry = kernel.getRegistry(); - KernelRegistryEntry entry = registry.getEntry("WSServiceRefHandler"); - handler = (ServiceRefHandler)entry.getTarget(); - - // Try legancy JBossAS-4.2 name - if (handler == null) - { - entry = registry.getEntry("ServiceRefHandler"); - handler = (ServiceRefHandler)entry.getTarget(); - } + handler = getServerSideServiceRefHandler(); } - // The client does not have a microkernel else { - String propName = ServiceRefHandler.class.getName(); - String defaultImpl = "org.jboss.ws.core.client.ServiceRefHandlerImpl"; - handler = (ServiceRefHandler)ServiceLoader.loadService(propName, defaultImpl); + handler = getClientSideServiceRefHandler(); } return handler; } + + private static ServiceRefHandler getServerSideServiceRefHandler() + { + Kernel kernel = KernelLocator.getKernel(); + KernelRegistry registry = kernel.getRegistry(); + KernelRegistryEntry entry = registry.getEntry("WSServiceRefHandler"); + ServiceRefHandler handler = (ServiceRefHandler)entry.getTarget(); + + // Try legancy JBossAS-4.2 name + if (handler == null) + { + entry = registry.getEntry("ServiceRefHandler"); + handler = (ServiceRefHandler)entry.getTarget(); + } + return handler; + } + + private static ServiceRefHandler getClientSideServiceRefHandler() + { + String propName = ServiceRefHandler.class.getName(); + String defaultImpl = "org.jboss.ws.core.client.ServiceRefHandlerImpl"; + ServiceRefHandler handler = (ServiceRefHandler)ServiceLoader.loadService(propName, defaultImpl); + return handler; + } } Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-06-08 18:18:46 UTC (rev 3514) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-06-08 19:17:32 UTC (rev 3515) @@ -109,7 +109,7 @@ String targetClassName = (targetClass != null ? targetClass.getName() : null); String externalName = encCtx.getNameInNamespace() + "/" + encName; - log.info("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); + log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); String serviceImplClass = null;