From 39e9cd0b8fa7a1561ebb8388d2362a306ae04ced Mon Sep 17 00:00:00 2001
From: Yeray Borges <yborgess@redhat.com>
Date: Mon, 10 Aug 2020 13:09:14 +0100
Subject: [PATCH] [WFLY-13757] Adjust the legacy feature packs to match the
 markup generated from the Galleon feature packs in order and defaults

---
 .../subsystem-templates/infinispan.xml         | 18 +++++++++---------
 .../resources/subsystem-templates/ejb3.xml     |  2 +-
 .../resources/subsystem-templates/mail.xml     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/clustering/infinispan/extension/src/main/resources/subsystem-templates/infinispan.xml b/clustering/infinispan/extension/src/main/resources/subsystem-templates/infinispan.xml
index 298f10c7f4fc..7feac876ef7e 100644
--- a/clustering/infinispan/extension/src/main/resources/subsystem-templates/infinispan.xml
+++ b/clustering/infinispan/extension/src/main/resources/subsystem-templates/infinispan.xml
@@ -14,14 +14,14 @@
                 <local-cache name="sso"/>
                 <local-cache name="routing"/>
             </cache-container>
-            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
-                <local-cache name="default"/>
-            </cache-container>
             <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
                 <local-cache name="passivation">
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
             </cache-container>
+            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
+                <local-cache name="default"/>
+            </cache-container>
             <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
                 <local-cache name="entity">
                     <object-memory size="10000"/>
@@ -50,12 +50,6 @@
                     <file-store/>
                 </distributed-cache>
             </cache-container>
-            <cache-container name="server" aliases="singleton cluster" default-cache="default" module="org.wildfly.clustering.server">
-                <transport lock-timeout="60000"/>
-                <replicated-cache name="default">
-                    <transaction mode="BATCH"/>
-                </replicated-cache>
-            </cache-container>
             <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan">
                 <transport lock-timeout="60000"/>
                 <distributed-cache name="dist">
@@ -64,6 +58,12 @@
                     <file-store/>
                 </distributed-cache>
             </cache-container>
+            <cache-container name="server" aliases="singleton cluster" default-cache="default" module="org.wildfly.clustering.server">
+                <transport lock-timeout="60000"/>
+                <replicated-cache name="default">
+                    <transaction mode="BATCH"/>
+                </replicated-cache>
+            </cache-container>
             <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
                 <transport lock-timeout="60000"/>
                 <local-cache name="local-query">
diff --git a/ejb3/src/main/resources/subsystem-templates/ejb3.xml b/ejb3/src/main/resources/subsystem-templates/ejb3.xml
index ba746b34c9d5..311208a0758e 100644
--- a/ejb3/src/main/resources/subsystem-templates/ejb3.xml
+++ b/ejb3/src/main/resources/subsystem-templates/ejb3.xml
@@ -30,7 +30,7 @@
                <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
            </data-stores>
        </timer-service>
-       <remote connectors="http-remoting-connector" thread-pool-name="default">
+       <remote cluster="ejb" connectors="http-remoting-connector" thread-pool-name="default">
            <channel-creation-options>
                <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
            </channel-creation-options>
diff --git a/mail/src/main/resources/subsystem-templates/mail.xml b/mail/src/main/resources/subsystem-templates/mail.xml
index f8e10297e38d..428d97d270c3 100644
--- a/mail/src/main/resources/subsystem-templates/mail.xml
+++ b/mail/src/main/resources/subsystem-templates/mail.xml
@@ -8,6 +8,6 @@
        </mail-session>
    </subsystem>
    <outbound-socket-binding name="mail-smtp">
-       <remote-destination host="localhost" port="25"/>
+       <remote-destination host="${jboss.mail.server.host:localhost}" port="${jboss.mail.server.port:25}"/>
    </outbound-socket-binding>
 </config>