From c3f1bd5a254b40f68899c9ff975bbd37e422133a Mon Sep 17 00:00:00 2001
From: Takashi Mogi <tmogi001@users.noreply.github.com>
Date: Fri, 21 Sep 2018 12:56:04 +0900
Subject: [PATCH] KEYCLOAK-8342 Add core-management module to standalone and
 standaloen-ha

---
 .../configuration/standalone/subsystems-ha.xml    |  1 +
 .../configuration/standalone/subsystems.xml       |  1 +
 .../content/bin/migrate-standalone-ha.cli         | 15 +++++++++++++++
 .../resources/content/bin/migrate-standalone.cli  | 15 +++++++++++++++
 4 files changed, 32 insertions(+)

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 a0fed67d5e..cd52002a30 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
@@ -21,6 +21,7 @@
     <subsystems>
         <subsystem>logging.xml</subsystem>
         <subsystem>bean-validation.xml</subsystem>
+        <subsystem>core-management.xml</subsystem>
         <subsystem supplement="default">keycloak-datasources.xml</subsystem>
         <subsystem>deployment-scanner.xml</subsystem>
         <subsystem>ee.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 cf2d9d55ec..7c40a0e953 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
@@ -21,6 +21,7 @@
    <subsystems>
        <subsystem>logging.xml</subsystem>
        <subsystem>bean-validation.xml</subsystem>
+       <subsystem>core-management.xml</subsystem>
        <subsystem supplement="default">keycloak-datasources.xml</subsystem>
        <subsystem>deployment-scanner.xml</subsystem>
        <subsystem>ee.xml</subsystem>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
index e59194f0c0..ddcde93e31 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone-ha.cli
@@ -527,4 +527,19 @@ if (outcome == success) of /subsystem=keycloak-server/spi=connectionsInfinispan/
   echo
 end-if
 
+# Migrate from 4.4.0 to 4.5.0
+if (outcome == failed) of /subsystem=core-management/:read-resource
+    try
+        echo Trying to add core-management extension
+        /extension=org.wildfly.extension.core-management/:add
+        echo
+    catch
+        echo Wasn't able to add core-management extension, it should be already added by migrate-domain-standalone.cli
+        echo
+    end-try
+    echo Adding subsystem core-management
+    /subsystem=core-management/:add
+    echo
+end-if
+
 echo *** End Migration ***
\ No newline at end of file
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli
index 479fc1a9d4..a34fb56e57 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/bin/migrate-standalone.cli
@@ -434,4 +434,19 @@ if (outcome == success) of /subsystem=keycloak-server/spi=connectionsInfinispan/
   echo
 end-if
 
+# Migrate from 4.4.0 to 4.5.0
+if (outcome == failed) of /subsystem=core-management/:read-resource
+    try
+        echo Trying to add core-management extension
+        /extension=org.wildfly.extension.core-management/:add
+        echo
+    catch
+        echo Wasn't able to add core-management extension, it should be already added by migrate-domain-standalone.cli
+        echo
+    end-try
+    echo Adding subsystem core-management
+    /subsystem=core-management/:add
+    echo
+end-if
+
 echo *** End Migration ***
\ No newline at end of file