Attachment #165610 for bug #306773

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




/*******************************************************************************
 * 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

 *
 * 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
{

  {
    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);
  }
}

Lines 1-5 Link Here

(-)wsexplorer-properties/explorer.properties (-2 / +3 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2001, 2006 IBM Corporation and others.	2	# Copyright (c) 2001, 2010 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	#	7	#
8	# Contributors:	8	# Contributors:
9	# IBM Corporation - initial API and implementation	9	# IBM Corporation - initial API and implementation
		10	# 20100414 306773 mahutch@ca.ibm.com - Mark Hutchinson, make session time out configurable
10	###############################################################################	11	###############################################################################
11		12
12	TITLE_WSEXPLORER=Web Services Explorer	13	TITLE_WSEXPLORER=Web Services Explorer
Lines 183-188 Link Here
183	FORM_TITLE_IMPORT_TO_WORKBENCH=Import to Workbench Form	184	FORM_TITLE_IMPORT_TO_WORKBENCH=Import to Workbench Form
184		185
185	# SessionTimedOut message	186	# SessionTimedOut message
186	MSG_ERROR_SESSION_TIMED_OUT=This session of Web Service Explorer has timed out after 30 minutes of inactivity to free up memory resources.	187	MSG_ERROR_SESSION_TIMED_OUT=This session of Web Service Explorer has timed out after %1 minutes of inactivity to free up memory resources.
187	MSG_ERROR_RESTART_SESSION=Relaunch the Web Service Explorer to test your Web service.	188	MSG_ERROR_RESTART_SESSION=Relaunch the Web Service Explorer to test your Web service.
188		189




<%
/*******************************************************************************
 * 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

 * 
 * 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" %>

</head>
<body>
<center>
<%=controller.getMessage("MSG_ERROR_SESSION_TIMED_OUT", Integer.toString(controller.getSessionTimeoutInMinutes()))%>
<br>
<%=controller.getMessage("MSG_ERROR_RESTART_SESSION")%>
</center>




<%
/*******************************************************************************
 * 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

 * 
 * 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.*,

	    application.setAttribute(sessionId,session);
    
	    // Set Max inactivity time out value to 30mins.
	    session.setMaxInactiveInterval(controller.getSessionTimeoutInMinutes() * 60);
	
	    // LaunchOptionManager (below) handles most options,
	    // but need to get state and install locations earlier,

Return to bug 306773

Lines 1-5 Link Here

(-)src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java (-1 / +18 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2001, 2005 IBM Corporation and others.	2	* Copyright (c) 2001, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-23 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* 20100414 306773 mahutch@ca.ibm.com - Mark Hutchinson, make session time out configurable
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.wst.ws.internal.explorer.platform.perspective;	13	package org.eclipse.wst.ws.internal.explorer.platform.perspective;
13		14
14	import javax.servlet.ServletContext;	15	import javax.servlet.ServletContext;
		16
		17	import org.eclipse.core.runtime.Platform;
15	import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;	18	import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
16	import org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine;	19	import org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine;
17	import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;	20	import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
18	import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;	21	import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
19	import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;	22	import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
20	import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;	23	import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
		24	import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
21		25
22	public class Controller extends MessageProvider	26	public class Controller extends MessageProvider
23	{	27	{
Lines 221-224 Link Here
221	{	225	{
222	history_.dump();	226	history_.dump();
223	}	227	}
		228
		229	public final int getSessionTimeoutInMinutes() {
		230
		231	String property = System.getProperty("org.eclipse.wst.ws.exlorer.sessionTimeout");
		232	if (property!= null) {
		233	try {
		234	return Integer.parseInt(property);
		235	} catch (NumberFormatException e) {
		236	//do nothing, will check the preferences instead
		237	}
		238	}
		239	return Platform.getPreferencesService().getInt(ExplorerPlugin.ID,"sessionTimeout",30, null);
		240	}
224	}	241	}

Lines 1-6 Link Here

(-)wsexplorer/actions/SessionTimedOut.jsp (-2 / +3 lines)
1	<%	1	<%
2	/*******************************************************************************	2	/*******************************************************************************
3	* Copyright (c) 2000, 2004,2008 IBM Corporation and others.	3	* Copyright (c) 2000, 2010 IBM Corporation and others.
4	* All rights reserved. This program and the accompanying materials	4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0	5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at	6	* which accompanies this distribution, and is available at
Lines 8-13 Link Here
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
		11	* 20100414 306773 mahutch@ca.ibm.com - Mark Hutchinson, make session time out configurable
11	*******************************************************************************/	12	*******************************************************************************/
12	%>	13	%>
13	<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" %>	14	<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" %>
Lines 20-26 Link Here
20	</head>	21	</head>
21	<body>	22	<body>
22	<center>	23	<center>
23	<%=controller.getMessage("MSG_ERROR_SESSION_TIMED_OUT")%>	24	<%=controller.getMessage("MSG_ERROR_SESSION_TIMED_OUT", Integer.toString(controller.getSessionTimeoutInMinutes()))%>
24	<br>	25	<br>
25	<%=controller.getMessage("MSG_ERROR_RESTART_SESSION")%>	26	<%=controller.getMessage("MSG_ERROR_RESTART_SESSION")%>
26	</center>	27	</center>

Lines 1-6 Link Here

(-)wsexplorer/wsexplorer.jsp (-2 / +3 lines)
1	<%	1	<%
2	/*******************************************************************************	2	/*******************************************************************************
3	* Copyright (c) 2001, 2004 IBM Corporation and others.	3	* Copyright (c) 2001, 2010 IBM Corporation and others.
4	* All rights reserved. This program and the accompanying materials	4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0	5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at	6	* which accompanies this distribution, and is available at
Lines 8-13 Link Here
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* IBM Corporation - initial API and implementation	10	* IBM Corporation - initial API and implementation
		11	* 20100414 306773 mahutch@ca.ibm.com - Mark Hutchinson, make session time out configurable
11	*******************************************************************************/	12	*******************************************************************************/
12	%>	13	%>
13	<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,	14	<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
Lines 38-44 Link Here
38	application.setAttribute(sessionId,session);	39	application.setAttribute(sessionId,session);
39		40
40	// Set Max inactivity time out value to 30mins.	41	// Set Max inactivity time out value to 30mins.
41	session.setMaxInactiveInterval(1800);	42	session.setMaxInactiveInterval(controller.getSessionTimeoutInMinutes() * 60);
42		43
43	// LaunchOptionManager (below) handles most options,	44	// LaunchOptionManager (below) handles most options,
44	// but need to get state and install locations earlier,	45	// but need to get state and install locations earlier,