Rename group to role

neo4j · May 25, 2016 · da4ac2b · da4ac2b
1 parent 01b3462
commit da4ac2b
Show file tree

Hide file tree

Showing 15 changed files with 587 additions and 584 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java
@@ -499,8 +499,8 @@ private static String defaultPageCacheMemory()
             pathSetting( "unsupported.dbms.security.auth_store.location", NO_DEFAULT );
 
     @Internal
-    public static final Setting<File> group_store = // TODO: Move this to enterprise
-            pathSetting( "unsupported.dbms.security.group_store.location", NO_DEFAULT );
+    public static final Setting<File> role_store = // TODO: Move this to enterprise
+            pathSetting( "unsupported.dbms.security.role_store.location", NO_DEFAULT );
 
     @Internal
     public static final Setting<String> auth_manager = setting( "unsupported.dbms.security.auth_manager", STRING, "" );

diff --git a/...curity/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManager.java b/...curity/src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManager.java
@@ -26,9 +26,10 @@
 
 public class EnterpriseAuthManager extends ShiroAuthManager
 {
-    public EnterpriseAuthManager( UserRepository users, GroupRepository groups, PasswordPolicy passwordPolicy, Clock clock, boolean authEnabled )
+    public EnterpriseAuthManager( UserRepository userRepository, RoleRepository roleRepository,
+            PasswordPolicy passwordPolicy, Clock clock, boolean authEnabled )
     {
-        super( users, groups, passwordPolicy, clock, authEnabled );
+        super( userRepository, roleRepository, passwordPolicy, clock, authEnabled );
     }
 
     @Override

diff --git a/...src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java b/...src/main/java/org/neo4j/server/security/enterprise/auth/EnterpriseAuthManagerFactory.java
@@ -48,12 +48,12 @@ public AuthManager newInstance( Config config, LogProvider logProvider )
         final UserRepository userRepository =
                 new FileUserRepository( config.get( GraphDatabaseSettings.auth_store ).toPath(), logProvider );
 
-        final GroupRepository grouoRepository =
-                new FileGroupRepository( config.get( GraphDatabaseSettings.group_store ).toPath(), logProvider );
+        final RoleRepository roleRepository =
+                new FileRoleRepository( config.get( GraphDatabaseSettings.role_store ).toPath(), logProvider );
 
         final PasswordPolicy passwordPolicy = new BasicPasswordPolicy();
 
-        return new EnterpriseAuthManager( userRepository, grouoRepository, passwordPolicy, systemUTC(),
+        return new EnterpriseAuthManager( userRepository, roleRepository, passwordPolicy, systemUTC(),
                 config.get( GraphDatabaseSettings.auth_enabled ) );
     }
 }
diff --git a/...security/src/main/java/org/neo4j/server/security/enterprise/auth/FileGroupRepository.java b/...security/src/main/java/org/neo4j/server/security/enterprise/auth/FileGroupRepository.java