[jbossws-commits] JBossWS SVN: r3817 - in branches/jbossws-2.0/integration: spi/src/main/java/org/jboss/ws/integration and 1 other directory.
Author: thomas.diesler(a)jboss.com
Date: 2007-07-07 10:20:56 -0400 (Sat, 07 Jul 2007)
New Revision: 3817
Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java
Log:
Account for backward compatible bean name 'ServiceRefHandler'
Modified:
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
---
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-06
19:21:05 UTC (rev 3816)
+++
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-07
14:20:56 UTC (rev 3817)
@@ -36,6 +36,9 @@
<!-- Bind Service objects in client environment context -->
<bean name="WSServiceRefHandler"
class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
+ <!-- Note, JBoss_4_2_0_GA uses this hardcoded bean name -->
+ <bean name="ServiceRefHandler"
class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/>
+
<!-- Locate the single instance of the kernel -->
<bean name="WSKernelLocator"
class="org.jboss.ws.integration.KernelLocator">
<property name="kernel"><inject
bean="jboss.kernel:service=Kernel"/></property>
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-07-06
19:21:05 UTC (rev 3816)
+++
branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-07
14:20:56 UTC (rev 3817)
@@ -54,7 +54,7 @@
{
Kernel kernel = KernelLocator.getKernel();
KernelRegistry registry = kernel.getRegistry();
- KernelRegistryEntry entry = registry.getEntry("WSServiceRefHandler");
+ KernelRegistryEntry entry = registry.getEntry(ServiceRefHandler.BEAN_NAME);
ServiceRefHandler handler = (ServiceRefHandler)entry.getTarget();
// Try legancy JBossAS-4.2 name