From ad31bd32f747a5b1e9117d11f27ed20cc72bf367 Mon Sep 17 00:00:00 2001
From: Darran Lofthouse <darran.lofthouse@jboss.com>
Date: Tue, 5 Jan 2021 17:57:48 +0000
Subject: [PATCH] [WFCORE-5238] As the KeyStore defintions from the Elytron
 subsystem share the same KeyStore as the legacy security realm we need to use
 the same type.

---
 .../src/main/resources/feature_groups/core-domain-profile.xml | 2 +-
 .../src/main/resources/feature_groups/elytron-app.xml         | 2 +-
 elytron/src/main/resources/subsystem-templates/elytron.xml    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core-feature-pack/galleon-common/src/main/resources/feature_groups/core-domain-profile.xml b/core-feature-pack/galleon-common/src/main/resources/feature_groups/core-domain-profile.xml
index f6741db6362..3fd64f218ed 100644
--- a/core-feature-pack/galleon-common/src/main/resources/feature_groups/core-domain-profile.xml
+++ b/core-feature-pack/galleon-common/src/main/resources/feature_groups/core-domain-profile.xml
@@ -18,7 +18,7 @@
                 <param name="key-store" value="applicationKS" />
                 <param name="path" value="application.keystore" />
                 <param name="relative-to" value="jboss.domain.config.dir" />
-                <param name="type" value="PKCS12" />
+                <param name="type" value="JKS" />
                 <param name="credential-reference" value="{clear-text=password}" />
             </include>
         </feature-group>
diff --git a/core-feature-pack/galleon-common/src/main/resources/feature_groups/elytron-app.xml b/core-feature-pack/galleon-common/src/main/resources/feature_groups/elytron-app.xml
index da05a46f832..e0b67f4c09a 100644
--- a/core-feature-pack/galleon-common/src/main/resources/feature_groups/elytron-app.xml
+++ b/core-feature-pack/galleon-common/src/main/resources/feature_groups/elytron-app.xml
@@ -26,7 +26,7 @@
         <param name="key-store" value="applicationKS" />
         <param name="path" value="application.keystore" />
         <param name="relative-to" value="jboss.server.config.dir" />
-        <param name="type" value="PKCS12" />
+        <param name="type" value="JKS" />
         <param name="credential-reference" value="{clear-text=password}" />
     </feature>
     <feature spec="subsystem.elytron.key-manager">
diff --git a/elytron/src/main/resources/subsystem-templates/elytron.xml b/elytron/src/main/resources/subsystem-templates/elytron.xml
index 0f46db0a509..c580a933d8b 100644
--- a/elytron/src/main/resources/subsystem-templates/elytron.xml
+++ b/elytron/src/main/resources/subsystem-templates/elytron.xml
@@ -125,7 +125,7 @@
                 <key-stores>
                     <key-store name="applicationKS">
                         <credential-reference clear-text="password"/>
-                        <implementation type="PKCS12"/>
+                        <implementation type="JKS"/>
                         <file path="application.keystore" relative-to="jboss.domain.config.dir"/>
                     </key-store>
                 </key-stores>
@@ -250,7 +250,7 @@
                 <key-stores>
                     <key-store name="applicationKS">
                         <credential-reference clear-text="password"/>
-                        <implementation type="PKCS12"/>
+                        <implementation type="JKS"/>
                         <file path="application.keystore" relative-to="jboss.server.config.dir"/>
                     </key-store>
                 </key-stores>