From e907a9aa6d325ac0b8400c07a3bcb8f644278458 Mon Sep 17 00:00:00 2001
From: Bill Burke <bburke@redhat.com>
Date: Mon, 11 Sep 2017 17:21:30 -0400
Subject: [PATCH] put back elytron and resteasy providers

---
 .../main/resources/configuration/domain/subsystems.xml   | 2 ++
 .../resources/configuration/standalone/subsystems-ha.xml | 1 +
 .../resources/configuration/standalone/subsystems.xml    | 1 +
 distribution/server-dist/assembly.xml                    | 9 ++++++---
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml
index f55e800fc3..7a841483af 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml
@@ -33,6 +33,7 @@
         <subsystem>naming.xml</subsystem>
         <subsystem>remoting.xml</subsystem>
         <subsystem>request-controller.xml</subsystem>
+        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
         <subsystem>transactions.xml</subsystem>
@@ -59,6 +60,7 @@
         <subsystem>naming.xml</subsystem>
         <subsystem>remoting.xml</subsystem>
         <subsystem>request-controller.xml</subsystem>
+        <subsystem supplement="domain-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
         <subsystem>transactions.xml</subsystem>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml
index 4b0c22d89e..e19734cf21 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml
@@ -38,6 +38,7 @@
         <subsystem>remoting.xml</subsystem>
         <subsystem>request-controller.xml</subsystem>
         <subsystem>security-manager.xml</subsystem>
+        <subsystem supplement="standalone-wildfly">elytron.xml</subsystem>
         <subsystem>security.xml</subsystem>
         <subsystem>transactions.xml</subsystem>
         <subsystem supplement="ha">undertow.xml</subsystem>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
index c33f0f4e6a..a1a5035ab3 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
@@ -36,6 +36,7 @@
        <subsystem>remoting.xml</subsystem>
        <subsystem>request-controller.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/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml
index 478a14ca1e..f966cff11e 100755
--- a/distribution/server-dist/assembly.xml
+++ b/distribution/server-dist/assembly.xml
@@ -33,7 +33,7 @@
             <includes>
                 <include>**/module.xml</include>
             </includes>
-            <!-- unused resteasy providers eat up memory -->
+            <!-- unused resteasy providers eat up memory, can't remove them as it my effect RH-SSO patching
             <excludes>
                 <exclude>**/jose-jwt/**</exclude>
                 <exclude>**/resteasy-atom-provider/**</exclude>
@@ -45,6 +45,7 @@
                 <exclude>**/resteasy-yaml-provider/**</exclude>
                 <exclude>**/jettison/**</exclude>
             </excludes>
+            -->
         </fileSet>
         <fileSet>
             <directory>target/${project.build.finalName}</directory>
@@ -52,9 +53,10 @@
             <filtered>false</filtered>
             <excludes>
                 <exclude>bin/*.sh</exclude>
-                <!-- jboss-client.jar unused  Keycloak is not an app server. -->
+                <!-- jboss-client.jar unused  Unfortunately, this may screw up our patch process so it can't be removed.
                 <exclude>bin/client/README-EJB-JMS.txt</exclude>
                 <exclude>bin/client/jboss-client.jar</exclude>
+                 -->
                 <exclude>module.xml</exclude>
                 <exclude>welcome-content/**</exclude>
                 <exclude>appclient/**</exclude>
@@ -64,7 +66,7 @@
                 <exclude>themes/**</exclude>
                 <exclude>version.txt</exclude>
                 <exclude>${profileExcludes}</exclude>
-                <!-- unused resteasy providers eat up memory -->
+                <!-- unused resteasy providers eat up memory can't remove them as it my effect RH-SSO patching
                 <exclude>**/jose-jwt/**</exclude>
                 <exclude>**/resteasy-atom-provider/**</exclude>
                 <exclude>**/resteasy-crypto/**</exclude>
@@ -74,6 +76,7 @@
                 <exclude>**/resteasy-spring/**</exclude>
                 <exclude>**/resteasy-yaml-provider/**</exclude>
                 <exclude>**/jettison/**</exclude>
+                 -->
             </excludes>
         </fileSet>