[parancoe] push by enricogi...@gmail.com - Different scenario for roles/groups on 2012-01-18 17:46 GMT

[para...@googlecode.com]

Revision: 9c9b49aa52ab
Author: enricogiurin <enrico...@gmail.com>
Date: Wed Jan 18 09:35:16 2012
Log: Different scenario for roles/groups
http://code.google.com/p/parancoe/source/detail?r=9c9b49aa52ab

Modified:

/plugins/parancoe-plugin-springsecurity-evolution/src/main/resources/applicationContext-plugin.xml

/plugins/parancoe-plugin-springsecurity-evolution/src/test/java/org/parancoe/plugins/securityevolution/EntitiesTest.java

/plugins/parancoe-plugin-springsecurity-evolution/src/test/java/org/parancoe/plugins/securityevolution/ParancoeUserDetailsServiceTest.java

/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/Authority.yml

/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/Group.yml

/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/User.yml

/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/log4j.properties

=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/main/resources/applicationContext-plugin.xml
Mon Jan 16 22:00:12 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/main/resources/applicationContext-plugin.xml
Wed Jan 18 09:35:16 2012
@@ -47,14 +47,14 @@
<bean id="userDetailsService"
class="org.parancoe.plugins.securityevolution.ParancoeUserDetailsService"/>

- <security:http auto-config="true" pattern="/admin/**"
use-expressions="true" access-decision-manager-ref="accessDecisionManager" >
+ <!-- <security:http auto-config="true" pattern="/admin/**"
use-expressions="true" access-decision-manager-ref="accessDecisionManager" >
<security:intercept-url pattern="*"
access="hasRole('ROLE_ADMIN')"/>
</security:http>

<security:http auto-config="true" pattern="/pages/**"
use-expressions="true" access-decision-manager-ref="accessDecisionManager" >
<security:intercept-url pattern="*" access="hasRole('ROLE_USER')"/>
- </security:http>
+ </security:http> -->

=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/test/java/org/parancoe/plugins/securityevolution/EntitiesTest.java
Mon Jan 9 09:24:24 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/test/java/org/parancoe/plugins/securityevolution/EntitiesTest.java
Wed Jan 18 09:35:16 2012
@@ -38,10 +38,10 @@

@Test
public void testGroup() {
- Group groupBasic = groupDao.findByName("basic");
- assertEquals(3, groupBasic.getUsers().size());
+ Group groupBasic = groupDao.findByName("user");
+ assertEquals(2, groupBasic.getUsers().size());
assertEquals(1, groupBasic.getAuthorities().size());
- Group groupAdmin = groupDao.findByName("admin");
+ Group groupAdmin = groupDao.findByName("administrator");
assertEquals(1, groupAdmin.getUsers().size());
assertEquals(2, groupAdmin.getAuthorities().size());
}
@@ -50,7 +50,7 @@
public void testFindAllAuthoritiesAssociatedToUsername() {
List<Authority> authorities =
authorityDao.findAllAuthoritiesAssociatedToUsername("parancoe");
assertEquals(1, authorities.size());
- assertEquals("ROLE_READ", authorities.get(0).getRole());
+ assertEquals("ROLE_USER", authorities.get(0).getRole());

authorities =
authorityDao.findAllAuthoritiesAssociatedToUsername("admin");
assertEquals(2, authorities.size());
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/test/java/org/parancoe/plugins/securityevolution/ParancoeUserDetailsServiceTest.java
Mon Jan 9 09:24:24 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/test/java/org/parancoe/plugins/securityevolution/ParancoeUserDetailsServiceTest.java
Wed Jan 18 09:35:16 2012
@@ -56,7 +56,7 @@

List<GrantedAuthority> listGA = new
ArrayList<GrantedAuthority>(parancoeUD.getAuthorities());
assertEquals(1, listGA.size());
- assertEquals("ROLE_READ", listGA.get(0).getAuthority());
+ assertEquals("ROLE_USER", listGA.get(0).getAuthority());
}

@Test
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/Authority.yml
Mon Jan 9 09:24:24 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/Authority.yml
Wed Jan 18 09:35:16 2012
@@ -16,8 +16,8 @@
# limitations under the License.
#

-- &Authority-read
- role: ROLE_READ
-
-- &Authority-write
- role: ROLE_WRITE
+- &Authority-user
+ role: ROLE_USER
+
+- &Authority-admin
+ role: ROLE_ADMIN
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/Group.yml
Mon Jan 9 09:24:24 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/Group.yml
Wed Jan 18 09:35:16 2012
@@ -16,16 +16,16 @@
# limitations under the License.
#

-- &Group-basic
- name: basic
+- &Group-user
+ name: user
description: authenticated users with basic roles
authorities:
- - *Authority-read
-
-- &Group-admin
- name: admin
+ - *Authority-user
+
+- &Group-administrator
+ name: administrator
description: authenticated users with admin roles
authorities:
- - *Authority-read
- - *Authority-write
-
+ - *Authority-user
+ - *Authority-admin
+
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/User.yml
Mon Jan 9 06:53:23 2012
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/fixtures/User.yml
Wed Jan 18 09:35:16 2012
@@ -22,7 +22,7 @@
enabled: true
locked: false
groups:
- - *Group-basic
+ - *Group-user

- &User-locked
@@ -31,7 +31,7 @@
enabled: true
locked: true
groups:
- - *Group-basic
+ - *Group-user

- &User-admin
username: admin
@@ -39,6 +39,5 @@
enabled: true
locked: true
groups:
- - *Group-basic
- - *Group-admin
-
+ - *Group-administrator
+
=======================================
---
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/log4j.properties
Sun Oct 9 21:36:59 2011
+++
/plugins/parancoe-plugin-springsecurity-evolution/src/test/resources/log4j.properties
Wed Jan 18 09:35:16 2012
@@ -4,5 +4,6 @@
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d [%p] %c: %m%n

+log4j.logger.org.parancoe.plugins.securityevolution=DEBUG
log4j.logger.org.parancoe=INFO
log4j.logger.com.mycompany.testapp=INFO