reviewed config samples to show more options and be more consistent

openanalytics · Apr 5, 2013 · ba424a2 · ba424a2
1 parent 781e6bb
commit ba424a2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/main/resources/META-INF/spring/security-beans.xml b/src/main/resources/META-INF/spring/security-beans.xml
@@ -33,11 +33,15 @@
     </global-method-security>
     -->
 
-    <!-- Configure an authentication provider that fits your needs -->
+    <!-- 
+         Below is a sample in-memory authentication provider: configure one that fits your needs.
+    -->
     <authentication-manager>
         <authentication-provider>
             <user-service>
-                <user name="user" password="user" authorities="ROLE_USER" />
+                <user name="user" password="user" authorities="ROLE_APP_USER" />
+                <user name="admin" password="admin" authorities="ROLE_APP_ADMIN" />
+                <user name="boss" password="boss" authorities="ROLE_RSB_ADMIN" />
             </user-service>
         </authentication-provider>
     </authentication-manager>

diff --git a/src/test/resources/rsb-configuration-extended.json b/src/test/resources/rsb-configuration-extended.json
@@ -70,7 +70,7 @@
         "userPrincipals":["bob","dan"]
       },
       "secure_app_2": {
-        "userRoles":["ROLE_SCIENTIST","ROLE_ANALYST"]
+        "userRoles":["ROLE_APP_USER"]
       },
       "secure_app_3": {
         "userPrincipals":["bob","dan"],
@@ -84,14 +84,14 @@
       },
       "secure_app_5": {
         "userPrincipals":["bob","dan"],
-        "userRoles":["ROLE_SCIENTIST","ROLE_ANALYST"],
+        "userRoles":["ROLE_APP_USER"],
         "adminPrincipals":["jack"],
-        "adminRoles":["ROLE_ADMIN"]
+        "adminRoles":["ROLE_APP_ADMIN"]
       }
     },
     "rsbSecurityConfiguration": {
         "adminPrincipals":["joe"],
-        "adminRoles":["ROLE_ADMIN"]
+        "adminRoles":["ROLE_USB_ADMIN"]
     },
     "applicationAwareCatalog" : true
 }
diff --git a/src/test/resources/rsb-configuration-full.json b/src/test/resources/rsb-configuration-full.json
@@ -74,7 +74,7 @@
         "userPrincipals":["bob","dan"]
       },
       "secure_app_2": {
-        "userRoles":["ROLE_SCIENTIST","ROLE_ANALYST"]
+        "userRoles":["ROLE_APP_USER"]
       },
       "secure_app_3": {
         "userPrincipals":["bob","dan"],
@@ -88,14 +88,14 @@
       },
       "secure_app_5": {
         "userPrincipals":["bob","dan"],
-        "userRoles":["ROLE_SCIENTIST","ROLE_ANALYST"],
+        "userRoles":["ROLE_APP_USER"],
         "adminPrincipals":["jack"],
-        "adminRoles":["ROLE_ADMIN"]
+        "adminRoles":["ROLE_APP_ADMIN"]
       }
     },
     "rsbSecurityConfiguration": {
         "adminPrincipals":["joe"],
-        "adminRoles":["ROLE_ADMIN"]
+        "adminRoles":["ROLE_USB_ADMIN"]
     },
     "applicationAwareCatalog" : true
 }