Author: mwringe
Date: 2009-05-26 11:20:12 -0500 (Tue, 26 May 2009)
New Revision: 1955
Modified:
core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss51xStandaloneLocalConfiguration.java
core/trunk/containers/jboss/src/main/resources/org/codehaus/cargo/container/internal/resources/jboss51x/bindings-jboss-beans.xml
Log:
Fixing binding support for jboss51x
Modified: core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss51xStandaloneLocalConfiguration.java
===================================================================
--- core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss51xStandaloneLocalConfiguration.java 2009-05-19 21:21:12 UTC (rev 1954)
+++ core/trunk/containers/jboss/src/main/java/org/codehaus/cargo/container/jboss/JBoss51xStandaloneLocalConfiguration.java 2009-05-26 16:20:12 UTC (rev 1955)
@@ -130,11 +130,10 @@
}
String[] configFiles = new String[]
- {"jboss-log4j.xml", "jboss-service.xml", "bindings-jboss-beans.xml"};
+ {"jboss-log4j.xml", "jboss-service.xml"};
// Copy configuration files from cargo resources directory with token replacement
- String[] cargoConfigFiles = new String[] {"jboss-log4j.xml", "jboss-service.xml",
- "bindings-jboss-beans.xml"};
+ String[] cargoConfigFiles = new String[] {"jboss-log4j.xml", "jboss-service.xml"};
for (int i = 0; i < cargoConfigFiles.length; i++)
{
getResourceUtils().copyResource(
@@ -157,6 +156,11 @@
getResourceUtils().copyResource(
RESOURCE_PATH + jbossContainer.getId() + "/" + "server.xml",
new File(deployDir + "/jbossweb.sar/", "server.xml"), filterChain);
+
+ getResourceUtils().copyResource(
+ RESOURCE_PATH + jbossContainer.getId() + "/" + "bindings-jboss-beans.xml",
+ new File(confDir + "/bindingservice.beans/META-INF",
+ "bindings-jboss-beans.xml"), filterChain);
// Copy the files within the JBoss Deployers directory to the cargo deployers directory
copyExternalResources(
Modified: core/trunk/containers/jboss/src/main/resources/org/codehaus/cargo/container/internal/resources/jboss51x/bindings-jboss-beans.xml
===================================================================
--- core/trunk/containers/jboss/src/main/resources/org/codehaus/cargo/container/internal/resources/jboss51x/bindings-jboss-beans.xml 2009-05-19 21:21:12 UTC (rev 1954)
+++ core/trunk/containers/jboss/src/main/resources/org/codehaus/cargo/container/internal/resources/jboss51x/bindings-jboss-beans.xml 2009-05-26 16:20:12 UTC (rev 1955)
@@ -1,43 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- The actual SBM from which services obtain binding information -->
+ <bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
- <classloader><inject bean="bindings-classloader:0.0.0"/></classloader>
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.system:service=ServiceBindingManager", exposedInterface=org.jboss.services.binding.ServiceBindingManagerMBean.class, registerDirectly=true)</annotation>
+
+ <!-- Here we use the ServiceBindingManagementObject as a factory to create the SBM -->
+ <constructor factoryMethod="getServiceBindingManager">
+ <factory bean="ServiceBindingManagementObject"/>
+ </constructor>
- <classloader name="bindings-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
- <root>${jboss.common.lib.url}jboss-bindingservice.jar</root>
- </classloader>
+ </bean>
- <bean name="ServiceBindingManager" class="org.jboss.services.binding.ServiceBindingManager">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.system:service=ServiceBindingManager", exposedInterface=org.jboss.services.binding.ServiceBindingManagerMBean.class, registerDirectly=true)</annotation>
-
+ <!-- Provides management tools with a ProfileService ManagementView
+ interface to the SBM and its components -->
+ <bean name="ServiceBindingManagementObject"
+ class="org.jboss.services.binding.managed.ServiceBindingManagementObject">
+
<constructor>
<!-- The name of the set of bindings to use for this server -->
<parameter>${jboss.service.binding.set:ports-default}</parameter>
-
- <!-- The named sets of bindings -->
+
+ <!-- The binding sets -->
<parameter>
- <bean name="ServiceBindingStore" class="org.jboss.services.binding.impl.PojoServiceBindingStore">
-
- <!-- Base bindings that are used to create bindings for each set -->
- <property name="standardBindings"><inject bean="StandardBindings"/></property>
-
- <!-- The sets of bindings -->
- <property name="serviceBindingSets">
- <set>
- <inject bean="PortsDefaultBindings"/>
- <inject bean="Ports01Bindings"/>
- <inject bean="Ports02Bindings"/>
- <inject bean="Ports03Bindings"/>
- </set>
- </property>
- </bean>
+ <set>
+ <inject bean="PortsDefaultBindings"/>
+ <inject bean="Ports01Bindings"/>
+ <inject bean="Ports02Bindings"/>
+ <inject bean="Ports03Bindings"/>
+ </set>
</parameter>
+
+ <!-- Base binding metadata that is used to create bindings for each set -->
+ <parameter><inject bean="StandardBindings"/></parameter>
+
</constructor>
-
</bean>
-
+
+
<!-- The ports-default bindings are obtained by taking the base bindings and adding 0 to each port value -->
<bean name="PortsDefaultBindings" class="org.jboss.services.binding.impl.ServiceBindingSet">
<constructor>
@@ -182,23 +184,24 @@
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=HAJNDI</property>
- <property name="bindingName">AutoDiscoveryMulticastAddress</property>
+ <property name="bindingName">AutoDiscovery</property>
<property name="hostName">${jboss.partition.udpGroup:230.0.0.4}</property>
+ <property name="port">1102</property>
<property name="description">Multicast socket on which HA-JNDI listens for auto-discovery requests from clients</property>
<!-- This address should not be changed between different
binding sets; all nodes need to listen on the same
multicast address -->
<property name="fixedHostName">true</property>
+ <!-- This port should not be changed between different
+ binding sets; all nodes need to listen on the same port -->
+ <property name="fixedPort">true</property>
</bean>
<bean class="org.jboss.services.binding.ServiceBindingMetadata">
<property name="serviceName">jboss:service=HAJNDI</property>
- <property name="bindingName">AutoDiscoveryPort</property>
- <property name="port">1102</property>
- <property name="description">Multicast socket on which HA-JNDI listens for auto-discovery requests from clients</property>
- <!-- This port should not be changed between different
- binding sets; all nodes need to listen on the same port -->
- <property name="fixedPort">true</property>
+ <property name="bindingName">AutoDiscoveryInterface</property>
+ <property name="hostName">${jboss.bind.address}</property>
+ <property name="description">Interface for multicast socket on which HA-JNDI listens for auto-discovery requests from clients</property>
</bean>
<!-- ********************* deploy/cluster/ha-legacy-service.xml ****************** -->
---------------------------------------------------------------------
To unsubscribe from this list, please visit:
http://xircles.codehaus.org/manage_email
