You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2012/05/17 08:23:12 UTC
svn commit: r1339497 - in /geronimo/server/branches/3.0-beta/plugins/j2ee:
geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/
geronimo-web/src/main/java/org/apache/geronimo/web/info/
Author: xuhaihong
Date: Thu May 17 06:23:12 2012
New Revision: 1339497
URL: http://svn.apache.org/viewvc?rev=1339497&view=rev
Log:
GERONIMO-6352 session configuration info is not serialized correctly
Modified:
geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java
geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java
Modified: geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java?rev=1339497&r1=1339496&r2=1339497&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/WebAppInfoBuilder.java Thu May 17 06:23:12 2012
@@ -271,6 +271,8 @@ public class WebAppInfoBuilder {
cookieConfigInfo.maxAge = sessionConfig.getCookieConfig().getMaxAge() != null? sessionConfig.getCookieConfig().getMaxAge(): -1;
sessionConfigInfo.sessionCookieConfig = cookieConfigInfo;
}
+ webAppInfo.sessionConfig = sessionConfigInfo;
+ break;
}
for (WelcomeFileList welcomeFileList: webApp.getWelcomeFileList()) {
Modified: geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java?rev=1339497&r1=1339496&r2=1339497&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionConfigInfo.java Thu May 17 06:23:12 2012
@@ -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 @@ import javax.servlet.SessionTrackingMode
/**
* @version $Rev:$ $Date:$
*/
-public class SessionConfigInfo {
+public class SessionConfigInfo implements Serializable{
public int sessionTimeoutMinutes;
public SessionCookieConfigInfo sessionCookieConfig;
Modified: geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java?rev=1339497&r1=1339496&r2=1339497&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/info/SessionCookieConfigInfo.java Thu May 17 06:23:12 2012
@@ -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;