diff --git a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/testrealm.json b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/testrealm.json
index 26afcf9..7243991 100755
--- a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/testrealm.json
+++ b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/testrealm.json
@@ -89,7 +89,7 @@
"roles": ["manage-account"]
}
],
- "aerogear-realm": [
+ "realm-management": [
{
"username": "admin",
"roles": ["realm-admin"]
diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
index 2e229bb..8410776 100755
--- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java
+++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java
@@ -121,10 +121,16 @@ public class RealmManager {
realm.addScopeMapping(adminConsole, adminRole);
}
- public String getRealmAdminApplicationName(RealmModel realm) {
+ public String getMasterRealmAdminApplicationName(RealmModel realm) {
return realm.getName() + "-realm";
}
+ public String getRealmAdminApplicationName(RealmModel realm) {
+ return "realm-management";
+ }
+
+
+
protected void setupRealmDefaults(RealmModel realm) {
// brute force
realm.setBruteForceProtected(false); // default settings off for now todo set it on
@@ -242,7 +248,7 @@ public class RealmManager {
ApplicationManager applicationManager = new ApplicationManager(new RealmManager(identitySession));
- ApplicationModel realmAdminApp = applicationManager.createApplication(adminRealm, getRealmAdminApplicationName(realm));
+ ApplicationModel realmAdminApp = applicationManager.createApplication(adminRealm, getMasterRealmAdminApplicationName(realm));
realmAdminApp.setBearerOnly(true);
realm.setMasterAdminApp(realmAdminApp);