Attachment 165610 Details for Bug 306773 – proposed patch v2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed patch v2

wseTimeoutPatch2.txt (text/plain), 7.37 KB, created by Mark Hutchinson

on 2010-04-21 13:47:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Hutchinson

Created: 2010-04-21 13:47:43 EDT

Size: 7.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.ws.explorer
>Index: src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java,v
>retrieving revision 1.1
>diff -u -r1.1 Controller.java
>--- src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java	5 Sep 2007 20:57:39 -0000	1.1
>+++ src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java	21 Apr 2010 17:37:59 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2001, 2005 IBM Corporation and others.
>+ * Copyright (c) 2001, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,17 +7,21 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ * 20100414   306773 mahutch@ca.ibm.com - Mark Hutchinson, make session time out configurable
>  *******************************************************************************/
> 
> package org.eclipse.wst.ws.internal.explorer.platform.perspective;
> 
> import javax.servlet.ServletContext;
>+
>+import org.eclipse.core.runtime.Platform;
> import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
> import org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine;
> import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
> import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
> import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
> import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
>+import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
> 
> public class Controller extends MessageProvider
> {
>@@ -221,4 +225,17 @@
>   {
>     history_.dump();
>   }
>+  
>+  public final int getSessionTimeoutInMinutes() {
>+	  
>+	  String property = System.getProperty("org.eclipse.wst.ws.exlorer.sessionTimeout");
>+	  if (property!= null) {
>+		  try {
>+			  return Integer.parseInt(property);
>+		  } catch (NumberFormatException e) {
>+			  //do nothing, will check the preferences instead
>+		  }
>+	  }
>+	  return Platform.getPreferencesService().getInt(ExplorerPlugin.ID,"sessionTimeout",30, null);
>+  }
> }
>Index: wsexplorer-properties/explorer.properties
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties,v
>retrieving revision 1.5
>diff -u -r1.5 explorer.properties
>--- wsexplorer-properties/explorer.properties	26 Mar 2008 18:53:25 -0000	1.5
>+++ wsexplorer-properties/explorer.properties	21 Apr 2010 17:37:59 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2001, 2006 IBM Corporation and others.
>+# Copyright (c) 2001, 2010 IBM Corporation and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
> #
> # Contributors:
> #     IBM Corporation - initial API and implementation
>+# 20100414   306773 mahutch@ca.ibm.com - Mark Hutchinson, make session time out configurable
> ###############################################################################
> 
> TITLE_WSEXPLORER=Web Services Explorer
>@@ -183,6 +184,6 @@
> FORM_TITLE_IMPORT_TO_WORKBENCH=Import to Workbench Form
> 
> # SessionTimedOut message
>-MSG_ERROR_SESSION_TIMED_OUT=This session of Web Service Explorer has timed out after 30 minutes of inactivity to free up memory resources.
>+MSG_ERROR_SESSION_TIMED_OUT=This session of Web Service Explorer has timed out after %1 minutes of inactivity to free up memory resources.
> MSG_ERROR_RESTART_SESSION=Relaunch the Web Service Explorer to test your Web service.
> 
>Index: wsexplorer/actions/SessionTimedOut.jsp
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.ws.explorer/wsexplorer/actions/SessionTimedOut.jsp,v
>retrieving revision 1.1
>diff -u -r1.1 SessionTimedOut.jsp
>--- wsexplorer/actions/SessionTimedOut.jsp	26 Mar 2008 18:53:25 -0000	1.1
>+++ wsexplorer/actions/SessionTimedOut.jsp	21 Apr 2010 17:37:59 -0000
>@@ -1,6 +1,6 @@
> <%
> /*******************************************************************************
>- * Copyright (c) 2000, 2004,2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -8,6 +8,7 @@
>  * 
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ * 20100414   306773 mahutch@ca.ibm.com - Mark Hutchinson, make session time out configurable
>  *******************************************************************************/
> %>
> <%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" %>
>@@ -20,7 +21,7 @@
> </head>
> <body>
> <center>
>-<%=controller.getMessage("MSG_ERROR_SESSION_TIMED_OUT")%>
>+<%=controller.getMessage("MSG_ERROR_SESSION_TIMED_OUT", Integer.toString(controller.getSessionTimeoutInMinutes()))%>
> <br>
> <%=controller.getMessage("MSG_ERROR_RESTART_SESSION")%>
> </center>
>Index: wsexplorer/wsexplorer.jsp
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.wst.ws.explorer/wsexplorer/wsexplorer.jsp,v
>retrieving revision 1.3
>diff -u -r1.3 wsexplorer.jsp
>--- wsexplorer/wsexplorer.jsp	26 Mar 2008 18:53:26 -0000	1.3
>+++ wsexplorer/wsexplorer.jsp	21 Apr 2010 17:37:59 -0000
>@@ -1,6 +1,6 @@
> <%
> /*******************************************************************************
>- * Copyright (c) 2001, 2004 IBM Corporation and others.
>+ * Copyright (c) 2001, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -8,6 +8,7 @@
>  * 
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ * 20100414   306773 mahutch@ca.ibm.com - Mark Hutchinson, make session time out configurable
>  *******************************************************************************/
> %>
> <%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
>@@ -38,7 +39,7 @@
> 	    application.setAttribute(sessionId,session);
>     
> 	    // Set Max inactivity time out value to 30mins.
>-	    session.setMaxInactiveInterval(1800);
>+	    session.setMaxInactiveInterval(controller.getSessionTimeoutInMinutes() * 60);
> 	
> 	    // LaunchOptionManager (below) handles most options,
> 	    // but need to get state and install locations earlier,

Flags:

keith.chong.ca: iplog+

Actions: View | Diff

Attachments on bug 306773: 162727 | 164877 | 165610