[CMTOOL-380] remove migration- suffix out of security configuration i…

…tems and use default names instead
wildfly · Nov 21, 2024 · 8693aaa · 8693aaa
1 parent 4f64886
commit 8693aaa
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 79 deletions.
diff --git a/...6.0/src/main/java/org/jboss/migration/wfly/task/security/LegacySecurityConfiguration.java b/...6.0/src/main/java/org/jboss/migration/wfly/task/security/LegacySecurityConfiguration.java
@@ -26,9 +26,9 @@
 
 public class LegacySecurityConfiguration {
 
-    public static final String DEFAULT_ELYTRON_APPLICATION_DOMAIN_NAME = "migration-defaultApplicationDomain";
-    public static final String DEFAULT_ELYTRON_APPLICATION_HTTP_AUTHENTICATION_FACTORY_NAME = "migration-defaultApplicationHttpAuthenticationFactory";
-    public static final String DEFAULT_ELYTRON_APPLICATION_SASL_AUTHENTICATION_FACTORY_NAME = "migration-defaultApplicationSaslAuthenticationFactory";
+    public static final String DEFAULT_ELYTRON_APPLICATION_DOMAIN_NAME = "ApplicationDomain";
+    public static final String DEFAULT_ELYTRON_APPLICATION_HTTP_AUTHENTICATION_FACTORY_NAME = "application-http-authentication";
+    public static final String DEFAULT_ELYTRON_APPLICATION_SASL_AUTHENTICATION_FACTORY_NAME = "application-sasl-authentication";
 
     private final JBossServerConfiguration targetConfiguration;
     private final Map<String, LegacySecurityRealm> legacySecurityRealms = new HashMap<>();
@@ -69,47 +69,47 @@ public void setDomainControllerRemoteSecurityRealm(String domainControllerRemote
     }
 
     public String getDefaultElytronApplicationRealmName() {
-        return "migration-defaultApplicationRealm";
+        return "ApplicationRealm";
     }
 
     public String getDefaultElytronManagementRealmName() {
-        return "migration-defaultManagementRealm";
+        return "ManagementRealm";
     }
 
     public String getDefaultElytronApplicationDomainName() {
         return DEFAULT_ELYTRON_APPLICATION_DOMAIN_NAME;
     }
 
     public String getDefaultElytronManagementDomainName() {
-        return "migration-defaultManagementDomain";
+        return "ManagementDomain";
     }
 
     public String getDefaultElytronApplicationHttpAuthenticationFactoryName() {
         return DEFAULT_ELYTRON_APPLICATION_HTTP_AUTHENTICATION_FACTORY_NAME;
     }
 
     public String getDefaultElytronManagementHttpAuthenticationFactoryName() {
-        return "migration-defaultManagementHttpAuthenticationFactory";
+        return "management-http-authentication";
     }
 
     public String getDefaultElytronApplicationSaslAuthenticationFactoryName() {
         return DEFAULT_ELYTRON_APPLICATION_SASL_AUTHENTICATION_FACTORY_NAME;
     }
 
     public String getDefaultElytronManagementSaslAuthenticationFactoryName() {
-        return "migration-defaultManagementSaslAuthenticationFactory";
+        return "management-sasl-authentication";
     }
 
     public String getDefaultElytronTLSKeyStoreName() {
-        return "migration-defaultTLSKeyStore";
+        return "applicationKS";
     }
 
     public String getDefaultElytronTLSKeyManagerName() {
-        return "migration-defaultTLSKeyManager";
+        return "applicationKM";
     }
 
     public String getDefaultElytronTLSServerSSLContextName() {
-        return "migration-defaultTLSServerSSLContext";
+        return "applicationSSC";
     }
 
     @Override