Merge pull request #303 from ArcBees/mi_gwtpSpringSimplify

Spring GWTP-Dispatch secure action simplify configuration, by providing a default value for cookieName.
ArcBees · Aug 13, 2013 · 3d79fae · 3d79fae
2 parents 00b9c88 + fed523f
commit 3d79fae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...ch-server-spring/src/main/java/com/gwtplatform/dispatch/server/spring/DispatchModule.java b/...ch-server-spring/src/main/java/com/gwtplatform/dispatch/server/spring/DispatchModule.java
@@ -21,6 +21,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
 import com.gwtplatform.dispatch.server.Dispatch;
 import com.gwtplatform.dispatch.server.actionhandlervalidator.ActionHandlerValidatorRegistry;
@@ -79,6 +80,11 @@ public ActionHandlerValidatorRegistry getActionHandlerValidatorRegistry() {
         return instance;
     }
 
+    @Bean
+    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+        return new PropertySourcesPlaceholderConfigurer();
+    }
+
     @Bean
     public Dispatch getDispatch() {
         Dispatch instance = SpringUtils.getOrCreate(context, dispatchClass);

diff --git a/...rver-spring/src/main/java/com/gwtplatform/dispatch/server/spring/DispatchServiceImpl.java b/...rver-spring/src/main/java/com/gwtplatform/dispatch/server/spring/DispatchServiceImpl.java
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.context.ServletContextAware;
@@ -41,7 +42,7 @@ public class DispatchServiceImpl extends AbstractDispatchServiceImpl implements
 
     private static final long serialVersionUID = 136176741488585959L;
 
-    @Autowired(required = false)
+    @Value("${securityCookieName:JSESSIONID}")
     protected String securityCookieName;
 
     private ServletContext servletContext;
@@ -57,10 +58,6 @@ public String getSecurityCookieName() {
         return securityCookieName;
     }
 
-    public void setSecurityCookieName(String securityCookieName) {
-        this.securityCookieName = securityCookieName;
-    }
-
     @Override
     public void handleRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {