Author: tchemit Date: 2014-05-05 08:24:12 +0200 (Mon, 05 May 2014) New Revision: 3909 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3909 Log: fix dep + clean code Modified: trunk/pollen-rest-api/pom.xml trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/security/DefaultPollenSecurityContext.java Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2014-05-04 22:01:05 UTC (rev 3908) +++ trunk/pollen-rest-api/pom.xml 2014-05-05 06:24:12 UTC (rev 3909) @@ -64,6 +64,11 @@ </dependency> <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web</artifactId> </dependency> Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java 2014-05-04 22:01:05 UTC (rev 3908) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java 2014-05-05 06:24:12 UTC (rev 3909) @@ -152,7 +152,10 @@ @Override public PollenSecurityContext newSecurityContext(SessionToken sessionToken, PollenPrincipal mainPrincipal) { - return DefaultPollenSecurityContext.newContext(sessionToken, mainPrincipal); + DefaultPollenSecurityContext securityContext = new DefaultPollenSecurityContext(); + securityContext.setSessionToken(sessionToken); + securityContext.setMainPrincipal(mainPrincipal); + return securityContext; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/security/DefaultPollenSecurityContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/security/DefaultPollenSecurityContext.java 2014-05-04 22:01:05 UTC (rev 3908) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/security/DefaultPollenSecurityContext.java 2014-05-05 06:24:12 UTC (rev 3909) @@ -59,13 +59,6 @@ */ protected PollenPrincipal mainPrincipal; - public static PollenSecurityContext newContext(SessionToken sessionToken, PollenPrincipal mainPrincipal) { - DefaultPollenSecurityContext result = new DefaultPollenSecurityContext(); - result.setSessionToken(sessionToken); - result.setMainPrincipal(mainPrincipal); - return result; - } - @Override public PollenPrincipal getMainPrincipal() { return mainPrincipal; @@ -102,14 +95,18 @@ } public void setSessionToken(SessionToken sessionToken) { + this.sessionToken = sessionToken; // force to reload subject this.subject = null; + } public void setMainPrincipal(PollenPrincipal mainPrincipal) { + this.mainPrincipal = mainPrincipal; // force to reload subject this.subject = null; + } }