Permalink
Browse files

Use expressions for socket-bindings in mixed domain tests, they are s…

…upported for all versions
  • Loading branch information...
1 parent 027f370 commit 38085fb1330e82016653626061fd9073fce711cc @kabir kabir committed with bstansberry Jan 7, 2013
Showing with 11 additions and 4 deletions.
  1. +11 −4 testsuite/mixed-domain/src/test/resources/master-config/domain.xml
View
15 testsuite/mixed-domain/src/test/resources/master-config/domain.xml
@@ -1423,19 +1423,25 @@
<remote-destination host="localhost" port="25"/>
</outbound-socket-binding>
</socket-binding-group>
- <socket-binding-group name="full-ha-sockets" default-interface="public">
+ <!--
+ Use expressions in places they are allowed since expressions should be allowd on all versions.
+ The defaults will be used
+ -->
+ <socket-binding-group name="full-ha-sockets" default-interface="${test.not.set.anywhere:public}">
<!-- Needed for server groups using the 'full-ha' profile -->
<socket-binding name="ajp" port="8009"/>
- <socket-binding name="http" port="8080"/>
+ <!-- use expressions here -->
+ <socket-binding name="http" port="${test.not.set.anywhere:8080}" fixed-port="${test.not.set.anywhere:false}"/>
<socket-binding name="https" port="8443"/>
<socket-binding name="jacorb" interface="unsecure" port="3528"/>
<socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
- <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
+ <socket-binding name="jgroups-mping" port="${test.not.set.anywhere:0}" multicast-address="230.0.0.4" multicast-port="45700"/>
<socket-binding name="jgroups-tcp" port="7600"/>
<socket-binding name="jgroups-tcp-fd" port="57600"/>
<socket-binding name="jgroups-udp" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/>
<socket-binding name="jgroups-udp-fd" port="54200"/>
<socket-binding name="messaging" port="5445"/>
+ <!-- use expressions here -->
<socket-binding name="messaging-group" port="0" multicast-address="${jboss.messaging.group.address:231.7.7.7}" multicast-port="${jboss.messaging.group.port:9876}"/>
<socket-binding name="messaging-throughput" port="5455"/>
<socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/>
@@ -1445,7 +1451,8 @@
<socket-binding name="txn-recovery-environment" port="4712"/>
<socket-binding name="txn-status-manager" port="4713"/>
<outbound-socket-binding name="mail-smtp">
- <remote-destination host="localhost" port="25"/>
+ <!-- use expressions here -->
+ <remote-destination host="${test.not.set.anywhere:localhost}" port="${test.not.set.anywhere:25}"/>
</outbound-socket-binding>
</socket-binding-group>
</socket-binding-groups>

0 comments on commit 38085fb

Please sign in to comment.