Permalink
Browse files

AS7-3993 Fix multicast XSLT transforms

  • Loading branch information...
1 parent 52b686c commit 5cf6c694c32b0819a7e7f24ca7b1f7aff47f73ee @stuartwdouglas committed Mar 2, 2012
@@ -65,6 +65,7 @@
<ant antfile="${basedir}/../src/test/scripts/clustering-build.xml">
<property name="node0" value="${node0}"/> <!-- inheritAll="true" doesn't work. -->
<property name="node1" value="${node1}"/>
+ <property name="udpGroup" value="${udpGroup}"/>
<target name="build-clustering-udp"/>
</ant>
</target>
@@ -139,15 +140,15 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>clustering.integration.tests.jdbc.cachestore.profile</id>
<activation>
<property>
<name>!ts.noClustering</name>
</property>
</activation>
-
+
<!--
Server configuration executions.
-->
@@ -26,7 +26,7 @@
<ts.config-as.add-port-offset name="jbossas-clustering-udp-1" offset="100" nativePort="9999" httpPort="9990"/>
</target>
-
+
<target name="build-clustering-udp-jdbc-store" description="Builds server configuration for UDP tests with jdbc-store enabled">
<echo message="Building config clustering-udp-0-jdbc-store"/>
@@ -185,19 +185,19 @@
</move>
</sequential>
</macrodef>
-
-
+
+
<!--
Add a new cache container to the Infinispan subsystem.
The container definition is loaded from a file.
- -->
+ -->
<macrodef name="ts.config-as.add-cache-container" description="Add a cache container to the Infinispan subsystem">
<attribute name="name" default="jbossas"/>
<attribute name="output.dir" default="${project.build.directory}"/>
<attribute name="config.dir.name" default="standalone/configuration"/>
<attribute name="containerdef" default="cache-container.xml"/>
-
+
<sequential>
<echo message="Adding a cache container to Infinispan subsystem for config @{name}"/>
@@ -225,7 +225,7 @@
</move>
</sequential>
</macrodef>
-
+
@@ -60,51 +60,39 @@
</xsl:template>
<!-- Change UDP multicast addresses. -->
- <xsl:template match="//d:socket-binding-group[@name='standard-sockets']/d:socket-binding[@name='jgroups-udp']">
- <xsl:copy>
- <xsl:attribute name="multicast-address">
- <xsl:value-of select="$udpMcastAddress"/>
- </xsl:attribute>
- <xsl:apply-templates select="node()|@*"/>
- </xsl:copy>
+ <xsl:template match="//d:socket-binding-group[@name='standard-sockets']/d:socket-binding[@name='jgroups-udp']/@multicast-address">
+ <xsl:attribute name="multicast-address">
+ <xsl:value-of select="$udpMcastAddress"/>
+ </xsl:attribute>
</xsl:template>
<!-- Change diagnostics multicast addresses. -->
- <xsl:template match="//d:socket-binding-group[@name='standard-sockets']/d:socket-binding[@name='jgroups-diagnostics']">
- <xsl:copy>
- <xsl:attribute name="multicast-address">
- <xsl:value-of select="$diagnosticsMcastAddress"/>
- </xsl:attribute>
- <xsl:apply-templates select="node()|@*"/>
- </xsl:copy>
+ <xsl:template match="//d:socket-binding-group[@name='standard-sockets']/d:socket-binding[@name='jgroups-diagnostics']/@multicast-address">
+ <xsl:attribute name="multicast-address">
+ <xsl:value-of select="$diagnosticsMcastAddress"/>
+ </xsl:attribute>
</xsl:template>
<!-- Change MPING multicast addresses. -->
- <xsl:template match="//d:socket-binding-group[@name='standard-sockets']/d:socket-binding[@name='jgroups-mping']">
- <xsl:copy>
- <xsl:attribute name="multicast-address">
- <xsl:value-of select="$mpingMcastAddress"/>
- </xsl:attribute>
- <xsl:apply-templates select="node()|@*"/>
- </xsl:copy>
+ <xsl:template match="//d:socket-binding-group[@name='standard-sockets']/d:socket-binding[@name='jgroups-mping']/@multicast-address">
+ <xsl:attribute name="multicast-address">
+ <xsl:value-of select="$mpingMcastAddress"/>
+ </xsl:attribute>
</xsl:template>
<!-- Change modcluster multicast addresses. -->
- <xsl:template match="//d:socket-binding-group[@name='standard-sockets']/d:socket-binding[@name='modcluster']">
- <xsl:copy>
- <xsl:attribute name="multicast-address">
- <xsl:value-of select="$modclusterMcastAddress"/>
- </xsl:attribute>
- <xsl:apply-templates select="node()|@*"/>
- </xsl:copy>
+ <xsl:template match="//d:socket-binding-group[@name='standard-sockets']/d:socket-binding[@name='modcluster']/@multicast-address">
+ <xsl:attribute name="multicast-address">
+ <xsl:value-of select="$modclusterMcastAddress"/>
+ </xsl:attribute>
</xsl:template>
-
+
<!-- Change WSDL host. -->
<xsl:template match="//ws11:wsdl-host">
<xsl:copy>${jboss.bind.address:<xsl:value-of select="$publicIPAddress"/>}</xsl:copy>
</xsl:template>
-
-
+
+
<!-- Copy everything else. -->
<xsl:template match="node()|@*">

0 comments on commit 5cf6c69

Please sign in to comment.