Merge pull request #10434 from darranl/WFLY-9238

[WFLY-9238] Move the 'elytron' subsystem to the correct location in the configuration when sorted alphabetically.
wildfly · Aug 18, 2017 · bb557ea · bb557ea
2 parents 25e7381 + 8166c3d
commit bb557ea
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/feature-pack/src/main/resources/configuration/domain/subsystems.xml b/feature-pack/src/main/resources/configuration/domain/subsystems.xml
@@ -10,6 +10,7 @@
         <subsystem>datasources.xml</subsystem>
         <subsystem>ee.xml</subsystem>
         <subsystem>ejb3.xml</subsystem>
+        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem>infinispan.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
@@ -25,7 +26,6 @@
         <subsystem>resource-adapters.xml</subsystem>
         <subsystem>request-controller.xml</subsystem>
         <subsystem>sar.xml</subsystem>
-        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
         <subsystem>transactions.xml</subsystem>
@@ -42,6 +42,7 @@
         <subsystem>datasources.xml</subsystem>
         <subsystem>ee.xml</subsystem>
         <subsystem supplement="ha">ejb3.xml</subsystem>
+        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem supplement="ha">infinispan.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
@@ -59,7 +60,6 @@
         <subsystem>resource-adapters.xml</subsystem>
         <subsystem>request-controller.xml</subsystem>
         <subsystem>sar.xml</subsystem>
-        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
         <subsystem>singleton.xml</subsystem>
@@ -77,6 +77,7 @@
         <subsystem>datasources.xml</subsystem>
         <subsystem supplement="full">ee.xml</subsystem>
         <subsystem supplement="full">ejb3.xml</subsystem>
+        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem>infinispan.xml</subsystem>
         <subsystem>iiop-openjdk.xml</subsystem>
@@ -95,7 +96,6 @@
         <subsystem>resource-adapters.xml</subsystem>
         <subsystem>request-controller.xml</subsystem>
         <subsystem>sar.xml</subsystem>
-        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
         <subsystem>transactions.xml</subsystem>
@@ -112,6 +112,7 @@
         <subsystem>datasources.xml</subsystem>
         <subsystem supplement="full">ee.xml</subsystem>
         <subsystem supplement="full-ha">ejb3.xml</subsystem>
+        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem supplement="ha">infinispan.xml</subsystem>
         <subsystem>iiop-openjdk.xml</subsystem>
@@ -132,7 +133,6 @@
         <subsystem>resource-adapters.xml</subsystem>
         <subsystem>request-controller.xml</subsystem>
         <subsystem>sar.xml</subsystem>
-        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
         <subsystem>singleton.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/host/subsystems.xml b/feature-pack/src/main/resources/configuration/host/subsystems.xml
@@ -25,7 +25,7 @@
 <config>
     <subsystems>
         <subsystem>core-management.xml</subsystem>
-        <subsystem>jmx.xml</subsystem>
         <subsystem supplement="host">elytron.xml</subsystem>
+        <subsystem>jmx.xml</subsystem>
     </subsystems>
 </config>
diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-full-ha.xml
@@ -10,6 +10,7 @@
         <subsystem>deployment-scanner.xml</subsystem>
         <subsystem supplement="full">ee.xml</subsystem>
         <subsystem supplement="full-ha">ejb3.xml</subsystem>
+        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem supplement="ha">infinispan.xml</subsystem>
         <subsystem>iiop-openjdk.xml</subsystem>
@@ -31,7 +32,6 @@
         <subsystem>request-controller.xml</subsystem>
         <subsystem>sar.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
-        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>singleton.xml</subsystem>
         <subsystem>transactions.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-full.xml
@@ -10,6 +10,7 @@
         <subsystem>deployment-scanner.xml</subsystem>
         <subsystem supplement="full">ee.xml</subsystem>
         <subsystem supplement="full">ejb3.xml</subsystem>
+        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem>infinispan.xml</subsystem>
         <subsystem>iiop-openjdk.xml</subsystem>
@@ -29,7 +30,6 @@
         <subsystem>request-controller.xml</subsystem>
         <subsystem>sar.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
-        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>transactions.xml</subsystem>
         <subsystem>undertow.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml
@@ -10,6 +10,7 @@
         <subsystem>deployment-scanner.xml</subsystem>
         <subsystem>ee.xml</subsystem>
         <subsystem supplement="ha">ejb3.xml</subsystem>
+        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem supplement="ha">infinispan.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
@@ -28,7 +29,6 @@
         <subsystem>request-controller.xml</subsystem>
         <subsystem>sar.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
-        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>singleton.xml</subsystem>
         <subsystem>transactions.xml</subsystem>

diff --git a/feature-pack/src/main/resources/configuration/standalone/subsystems.xml b/feature-pack/src/main/resources/configuration/standalone/subsystems.xml
@@ -10,6 +10,7 @@
         <subsystem>deployment-scanner.xml</subsystem>
         <subsystem>ee.xml</subsystem>
         <subsystem>ejb3.xml</subsystem>
+        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem>infinispan.xml</subsystem>
         <subsystem>jaxrs.xml</subsystem>
@@ -26,7 +27,6 @@
         <subsystem>request-controller.xml</subsystem>
         <subsystem>sar.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
-        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>transactions.xml</subsystem>
         <subsystem>undertow.xml</subsystem>

diff --git a/servlet-feature-pack/src/main/resources/configuration/domain/subsystems.xml b/servlet-feature-pack/src/main/resources/configuration/domain/subsystems.xml
@@ -5,11 +5,11 @@
         <subsystem supplement="no-console">logging.xml</subsystem>
         <subsystem>core-management.xml</subsystem>
         <subsystem supplement="web-build">ee.xml</subsystem>
+        <subsystem supplement="domain">elytron.xml</subsystem>
         <subsystem>io.xml</subsystem>
         <subsystem>jmx.xml</subsystem>
         <subsystem supplement="web-build">naming.xml</subsystem>
         <subsystem>request-controller.xml</subsystem>
-        <subsystem supplement="domain">elytron.xml</subsystem>
         <subsystem supplement="web-build">security.xml</subsystem>
         <subsystem>undertow.xml</subsystem>
     </subsystems>

diff --git a/servlet-feature-pack/src/main/resources/configuration/host/subsystems.xml b/servlet-feature-pack/src/main/resources/configuration/host/subsystems.xml
@@ -25,7 +25,7 @@
 <config>
     <subsystems>
         <subsystem>core-management.xml</subsystem>
-        <subsystem>jmx.xml</subsystem>
         <subsystem supplement="host">elytron.xml</subsystem>
+        <subsystem>jmx.xml</subsystem>
     </subsystems>
 </config>
diff --git a/servlet-feature-pack/src/main/resources/configuration/standalone/subsystems.xml b/servlet-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
@@ -6,11 +6,11 @@
        <subsystem>core-management.xml</subsystem>
        <subsystem>deployment-scanner.xml</subsystem>
        <subsystem supplement="web-build">ee.xml</subsystem>
+       <subsystem>elytron.xml</subsystem>
        <subsystem>io.xml</subsystem>
        <subsystem>jmx.xml</subsystem>
        <subsystem supplement="web-build">naming.xml</subsystem>
        <subsystem>request-controller.xml</subsystem>
-       <subsystem>elytron.xml</subsystem>
        <subsystem supplement="web-build">security.xml</subsystem>
        <subsystem>security-manager.xml</subsystem>
        <subsystem>undertow.xml</subsystem>