| commit | a3fe0bf776c31765fdfa8b8be470bb375844c43f | [log] [tgz] |
|---|---|---|
| author | Haihong Xu <xuhaihong@apache.org> | Thu May 17 08:26:15 2012 +0000 |
| committer | Haihong Xu <xuhaihong@apache.org> | Thu May 17 08:26:15 2012 +0000 |
| tree | 07b5e7fe50b98c3a18f8e3ccbcee125e8e9a525d | |
| parent | 95414474c13e9aa5c1c2e96508b2a870b5fc06ab [diff] |
GERONIMO-6352 session configuration info is not serialized correctly git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/trunk@1339513 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java b/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java index 3b80138..e56f857 100644 --- a/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java +++ b/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
@@ -271,6 +271,8 @@ cookieConfigInfo.maxAge = sessionConfig.getCookieConfig().getMaxAge() != null? sessionConfig.getCookieConfig().getMaxAge(): -1; sessionConfigInfo.sessionCookieConfig = cookieConfigInfo; } + webAppInfo.sessionConfig = sessionConfigInfo; + break; } for (WelcomeFileList welcomeFileList: webApp.getWelcomeFileList()) {
diff --git a/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java b/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java index 21e068d..ee1a70e 100644 --- a/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java +++ b/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java
@@ -20,6 +20,7 @@ package org.apache.geronimo.web.info; +import java.io.Serializable; import java.util.EnumSet; import javax.servlet.SessionTrackingMode; @@ -27,7 +28,7 @@ /** * @version $Rev:$ $Date:$ */ -public class SessionConfigInfo { +public class SessionConfigInfo implements Serializable{ public int sessionTimeoutMinutes; public SessionCookieConfigInfo sessionCookieConfig;
diff --git a/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java b/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java index 51dff99..88eb358 100644 --- a/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java +++ b/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java
@@ -20,10 +20,12 @@ package org.apache.geronimo.web.info; +import java.io.Serializable; + /** * @version $Rev:$ $Date:$ */ -public class SessionCookieConfigInfo { +public class SessionCookieConfigInfo implements Serializable{ public String name; public String comment;