Fixed location of map-groups-to-roles attribute for AddSecurityRealm …

…offline command
wildfly-extras · Feb 23, 2016 · e939ae2 · e939ae2
1 parent e72ea50
commit e939ae2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/...java/org/wildfly/extras/creaper/commands/security/realms/AddPropertiesAuthentication.java b/...java/org/wildfly/extras/creaper/commands/security/realms/AddPropertiesAuthentication.java
@@ -79,10 +79,10 @@ public Builder plainText(Boolean plainText) {
         @Override
         public AddPropertiesAuthentication build() {
             if (path == null) {
-                throw new IllegalArgumentException("Path of the security domain must be specified as non null value");
+                throw new IllegalArgumentException("Path of the property file must be specified as non null value");
             }
             if (path.isEmpty()) {
-                throw new IllegalArgumentException("Path of the security domain must not be empty value");
+                throw new IllegalArgumentException("Path of the property file must not be empty value");
             }
             return new AddPropertiesAuthentication(this);
         }

diff --git a/...ain/resources/org/wildfly/extras/creaper/commands/security/realms/AddSecurityRealm.groovy b/...ain/resources/org/wildfly/extras/creaper/commands/security/realms/AddSecurityRealm.groovy
@@ -1,8 +1,11 @@
 realmAttrs = ['name': atrSecurityRealmName]
-if (atrMapGroupsToRoles != null) realmAttrs['map-groups-to-roles'] = atrMapGroupsToRoles
 
 def realmDefinition = {
-    'security-realm'(realmAttrs)
+    'security-realm'(realmAttrs) {
+        if (atrMapGroupsToRoles != null) {
+            'authorization'(['map-groups-to-roles': atrMapGroupsToRoles])
+        }
+    }
 }
 
 def existingSecurityRealm = management.'security-realms'.'security-realm'.find { it.'@name' == atrSecurityRealmName }

diff --git a/...java/org/wildfly/extras/creaper/commands/security/realms/AddSecurityRealmOfflineTest.java b/...java/org/wildfly/extras/creaper/commands/security/realms/AddSecurityRealmOfflineTest.java
@@ -38,7 +38,9 @@ public class AddSecurityRealmOfflineTest {
             + "<server xmlns=\"urn:jboss:domain:1.7\">\n"
             + "    <management>\n"
             + "        <security-realms>\n"
-            + "            <security-realm name=\"creaperSecRealm\" map-groups-to-roles=\"true\"/>\n"
+            + "            <security-realm name=\"creaperSecRealm\">\n"
+            + "                <authorization map-groups-to-roles=\"true\"/>"
+            + "            </security-realm>\n"
             + "        </security-realms>\n"
             + "    </management>\n"
             + "</server>";