Merge branch 'release/2.0.16'

CookieSessionGrailsPlugin.groovy

@@ -25,10 +25,9 @@ import com.granicus.grails.plugins.cookiesession.CookieSessionFilter
 import com.granicus.grails.plugins.cookiesession.CookieSessionRepository
 import com.granicus.grails.plugins.cookiesession.ExceptionCondenser
 import com.granicus.grails.plugins.cookiesession.SecurityContextSessionPersistenceListener
-import org.codehaus.groovy.grails.orm.hibernate.ConfigurableLocalSessionFactoryBean
 
 class CookieSessionGrailsPlugin {
-    def version = "2.0.15"
+    def version = "2.0.16"
     def grailsVersion = "1.2.4 > *"
     def title = "Cookie Session Plugin" // Headline display name of the plugin
     def author = "Ben Lucchesi"

README.md

@@ -1,6 +1,6 @@
 # Cookie Session Grails Plugin
 
-Current Version: 2.0.15
+Current Version: 2.0.16
 
 The Cookie Session plugin enables grails applications to store session data in http cookies between requests instead of in memory on the server. Client sessions are transmitted from the browser to the application with each request and transmitted back with each response. This allows application deployments to be more stateless. Benefits of managing sessions this way include:
 
@@ -36,7 +36,7 @@ grails install-plugin cookie-session
 
 edit grails-app/conf/BuildConfig.groovy and add the following line under the plugins closure
 
-  compile ":cookie-session:2.0.15"
+  compile ":cookie-session:2.0.16"
 
 # Configuration
 The following parameters are supported directly by the cookie-session-v2 plugin. Note, additional configuration is needed for webflow and large session support. See additional instructions below.

src/groovy/com/granicus/grails/plugins/cookiesession/KryoSessionSerializer.groovy

@@ -37,7 +37,6 @@ import java.util.Collections;
 
 import org.apache.log4j.Logger;
 
-import org.codehaus.groovy.grails.commons.ConfigurationHolder as ch
 
 class KryoSessionSerializer implements SessionSerializer, InitializingBean{
 
@@ -54,8 +53,8 @@ class KryoSessionSerializer implements SessionSerializer, InitializingBean{
   void afterPropertiesSet(){
       log.trace "bean properties set, performing bean configuring bean"
 
-      if( ch.config.grails.plugin.cookiesession.containsKey('springsecuritycompatibility') ){
-        springSecurityCompatibility = ch.config.grails.plugin.cookiesession['springsecuritycompatibility']?true:false
+      if( grailsApplication.config.grails.plugin.cookiesession.containsKey('springsecuritycompatibility') ){
+        springSecurityCompatibility = grailsApplication.config.grails.plugin.cookiesession['springsecuritycompatibility']?true:false
         springSecurityPluginVersion = grailsApplication.mainContext.getBean('pluginManager').allPlugins.find{ it.name == "springSecurityCore" }.version
       }
 
@@ -186,14 +185,14 @@ public class LocaleSerializer extends Serializer<java.util.Locale> {
     log.trace "finished writing locale ${locale}"
   }
 
-  @Override
-  public Object create (Kryo kryo, Input input, Class<java.util.Locale> type) {
+//  @Override
+  public Locale create (Kryo kryo, Input input, Class<java.util.Locale> type) {
     log.trace "starting create Local"
     return read(kryo,input,type)
   }
 
   @Override
-  public Object read (Kryo kryo, Input input, Class<Locale> type) {
+  public Locale read (Kryo kryo, Input input, Class<Locale> type) {
     log.trace "starting reading Locale"
     def locale = new java.util.Locale(input.readString(),input.readString(),input.readString()) 
     log.trace "finished reading Locale: ${locale}"
@@ -216,7 +215,7 @@ public class SimpleGrantedAuthoritySerializer extends Serializer<Object> {
     log.trace "finished writing SimpleGrantedAuthority  ${grantedAuth}"
   }
 
-  @Override
+//  @Override
   public Object create (Kryo kryo, Input input, Class<Object> type) {
     log.trace "starting create SimpleGrantedAuthority" 
     return read(kryo,input,type)
@@ -250,7 +249,7 @@ public class GrantedAuthorityImplSerializer extends Serializer<Object> {
     log.trace "finished writing GrantedAuthorityImpl ${grantedAuth}"
   }
 
-  @Override
+//  @Override
   public Object create (Kryo kryo, Input input, Class<Object> type) {
     log.trace "starting create GrantedAuthorityImpl" 
     return read(kryo,input,type)
@@ -291,7 +290,7 @@ public class GrailsUserSerializer extends Serializer<Object> {
     log.trace "finished writing ${user}"
   }
 
-  @Override
+//  @Override
   public Object create (Kryo kryo, Input input, Class<Object> type) {
     log.trace "creating GrailsUser"
     return read(kryo,input,type)
@@ -344,7 +343,7 @@ public class UserSerializer extends Serializer<Object>{
     log.trace "finished writing ${user}"
   }
 
-  @Override
+//  @Override
   public Object create (Kryo kryo, Input input, Class<Object> type) {
     log.trace "creating GrailsUser"
     return read(kryo,input,type)
@@ -391,7 +390,7 @@ public class UsernamePasswordAuthenticationTokenSerializer extends Serializer<Ob
     log.trace "finsihed writing ${token}"
   }
 
-  @Override
+//  @Override
   public Object create (Kryo kryo, Input input, Class<Object> type) {
     log.trace "creating UsernamePasswordAuthenticationToken"
     return read(kryo,input,type)

src/groovy/com/granicus/grails/plugins/cookiesession/SecurityContextSessionPersistenceListener.groovy

@@ -23,7 +23,6 @@ import org.springframework.beans.factory.InitializingBean
 import com.granicus.grails.plugins.cookiesession.SessionPersistenceListener;
 import com.granicus.grails.plugins.cookiesession.SerializableSession;
 
-import org.codehaus.groovy.grails.commons.ConfigurationHolder as ch
 
 import org.apache.log4j.Logger;
 
@@ -38,8 +37,8 @@ public class SecurityContextSessionPersistenceListener implements SessionPersist
 
     void afterPropertiesSet(){
       log.trace "afterPropertiesSet()"
-      if( ch.config.grails.plugin.cookiesession.containsKey('cookiename') ){
-        cookieName = ch.config.grails.plugin.cookiesession.cookiename
+      if( grailsApplication.config.grails.plugin.cookiesession.containsKey('cookiename') ){
+        cookieName = grailsApplication.config.grails.plugin.cookiesession.cookiename
       }
 
       securityContextHolder = grailsApplication.classLoader.loadClass("org.springframework.security.core.context.SecurityContextHolder")