From 7fcd2cde2ff70238c9f8b6282c3f6ab67df4a702 Mon Sep 17 00:00:00 2001
From: Jeff Mesnil <jmesnil@gmail.com>
Date: Tue, 4 Oct 2016 10:13:22 +0200
Subject: [PATCH] [WFLY-7256] Fix persistent configuration differences

* fix order of messaging and undertow XML attributes in the subsystem
  templates

JIRA: https://issues.jboss.org/browse/WFLY-7256
---
 .../main/resources/subsystem-templates/messaging-activemq.xml | 4 ++--
 .../resources/subsystem-templates/undertow-load-balancer.xml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/messaging-activemq/src/main/resources/subsystem-templates/messaging-activemq.xml b/messaging-activemq/src/main/resources/subsystem-templates/messaging-activemq.xml
index 66b467086c44..9508d0f97626 100644
--- a/messaging-activemq/src/main/resources/subsystem-templates/messaging-activemq.xml
+++ b/messaging-activemq/src/main/resources/subsystem-templates/messaging-activemq.xml
@@ -70,8 +70,8 @@
         </replacement>
         <replacement placeholder="REMOTE-CONNECTION-FACTORY">
             <connection-factory name="RemoteConnectionFactory"
-                                connectors="http-connector"
-                                entries="java:jboss/exported/jms/RemoteConnectionFactory" />
+                                entries="java:jboss/exported/jms/RemoteConnectionFactory"
+                                connectors="http-connector" />
         </replacement>
     </supplement>
     <supplement name="ha">
diff --git a/undertow/src/main/resources/subsystem-templates/undertow-load-balancer.xml b/undertow/src/main/resources/subsystem-templates/undertow-load-balancer.xml
index 1fb812267eec..ab032cbcf011 100644
--- a/undertow/src/main/resources/subsystem-templates/undertow-load-balancer.xml
+++ b/undertow/src/main/resources/subsystem-templates/undertow-load-balancer.xml
@@ -43,7 +43,7 @@
     <socket-binding name="http" port="${jboss.http.port:8080}"/>
     <socket-binding name="https" port="${jboss.https.port:8443}"/>
     <socket-binding name="mcmp-management" interface="private" port="${jboss.mcmp.port:8090}" />
-    <socket-binding name="modcluster" interface="private" multicast-port="23364" multicast-address="224.0.1.105" />
+    <socket-binding name="modcluster" interface="private" multicast-address="224.0.1.105" multicast-port="23364"/>
     <interface name="private">
         <inet-address value="${jboss.bind.address.private:127.0.0.1}"/>
     </interface>