diff -rupN messaging/src/main/java/org/jboss/as/messaging/HornetQService.java messaging-patched/src/main/java/org/jboss/as/messaging/HornetQService.java --- messaging/src/main/java/org/jboss/as/messaging/HornetQService.java 2012-03-09 22:05:48.000000000 +0400 +++ messaging-patched/src/main/java/org/jboss/as/messaging/HornetQService.java 2013-01-22 20:40:16.000000000 +0400 @@ -132,8 +132,11 @@ class HornetQService implements Service< host = binding.getDestinationAddress().getHostName(); port = binding.getDestinationPort(); } - tc.getParams().put(HOST, host); - tc.getParams().put(PORT, String.valueOf(port)); + Map params = tc.getParams(); + if (!params.containsKey(HOST)) { + params.put(HOST, host); + } + params.put(PORT, String.valueOf(port)); } } } diff -rupN messaging/src/main/java/org/jboss/as/messaging/MessagingSubsystemParser.java messaging-patched/src/main/java/org/jboss/as/messaging/MessagingSubsystemParser.java --- messaging/src/main/java/org/jboss/as/messaging/MessagingSubsystemParser.java 2012-03-09 22:05:48.000000000 +0400 +++ messaging-patched/src/main/java/org/jboss/as/messaging/MessagingSubsystemParser.java 2013-01-22 21:26:41.000000000 +0400 @@ -1186,6 +1186,13 @@ public class MessagingSubsystemParser im break; case VALUE: value = reader.getAttributeValue(n); + if ((value != null) && (value.matches("[$][{][\\w\\.]*[}]"))) { + String prop = value.substring(2, value.length() - 1); + prop = System.getProperty(prop); + if ((prop != null) && (!prop.isEmpty())) { + value = prop; + } + } break; default: throw unexpectedAttribute(reader, n);