Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Michael Gorovoy 2011-07-20 19:32:15 -04:00
parent 0cc914c4bb 281bb12689
commit d18bae4fe8
14 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-policy/src/main/config/lib/policy/jetty-jmx.policy
View File

@ -1,6 +1,6 @@
// This file contains permissions related to jmx support
grant codeBase "file:${jetty.home}/lib/-" {
grant codeBase "file:${jetty.home}${/}lib${/}-" {
// related to using JMX
permission javax.management.MBeanTrustPermission "register";

2
jetty-policy/src/main/config/lib/policy/jetty-start.policy
View File

@ -6,7 +6,7 @@
// doPrivledged freeing any further permissions being required to this
// module.
grant codeBase "file:${jetty.home}/start.jar" {
grant codeBase "file:${jetty.home}${/}start.jar" {
permission java.io.FilePermission "${jetty.home}${/}-", "read";

2
jetty-policy/src/main/config/lib/policy/jetty-work.policy
View File

@ -9,7 +9,7 @@
// provided.
grant codeBase "file:${jetty.home}/work/-" {
grant codeBase "file:${jetty.home${/}work${/}-" {
permission java.io.FilePermission "${jetty.home}${/}webapps${/}-", "read"; // Ought to go up a specific codebase
permission java.io.FilePermission "${jetty.home}${/}work${/}-", "read";
permission java.util.PropertyPermission "org.eclipse.jetty.util.log.class", "read";

2
jetty-policy/src/main/config/lib/policy/jetty.policy
View File

@ -4,7 +4,7 @@
// Review of this file is recommended and possible tweaking of the codeBase
// is likely in the future.
grant codeBase "file:${jetty.home}/lib/-" {
grant codeBase "file:${jetty.home}${/}lib${/}-" {
permission java.lang.RuntimePermission "getClassLoader";

6
jetty-policy/src/main/config/lib/policy/temp-dirs.policy
View File

@ -6,7 +6,7 @@
//
// the tmp directory is where webapps are unpacked by default so setup their restricted permissions
//
grant codeBase "file:${java.io.tmpdir}/-" {
grant codeBase "file:${java.io.tmpdir}${/}" {
permission java.io.FilePermission "${jetty.home}${/}webapps${/}-", "read"; // Ought to go up a specific codebases
permission java.io.FilePermission "${java.io.tmpdir}${/}-", "read";
@ -19,10 +19,10 @@ grant codeBase "file:${java.io.tmpdir}/-" {
//
// some operating systems have tmp as a symbolic link to /private/tmp
//
grant codeBase "file:/private${java.io.tmpdir}/-" {
grant codeBase "file:/private${java.io.tmpdir}${/}-" {
permission java.io.FilePermission "${jetty.home}${/}webapps${/}-", "read"; // Ought to go up a specific codebase
permission java.io.FilePermission "/private/${java.io.tmpdir}/-", "read";
permission java.io.FilePermission "/private/${java.io.tmpdir}${/}-", "read";
permission java.util.PropertyPermission "org.eclipse.jetty.util.log.class", "read";
permission java.util.PropertyPermission "org.eclipse.jetty.util.log.stderr.DEBUG", "read";
permission java.util.PropertyPermission "org.eclipse.jetty.util.log.IGNORED", "read";

11
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
View File

@ -18,7 +18,6 @@ import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionContext;
import javax.servlet.http.HttpSessionEvent;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
/**
@ -126,13 +125,13 @@ public abstract class AbstractSession implements AbstractSessionManager.SessionI
}
/* ------------------------------------------------------------ */
@SuppressWarnings({ "rawtypes", "unchecked" })
public Enumeration getAttributeNames()
@SuppressWarnings({ "unchecked" })
public Enumeration<String> getAttributeNames()
{
synchronized (this)
{
checkValid();
List names=_attributes==null?Collections.EMPTY_LIST:new ArrayList(_attributes.keySet());
List<String> names=_attributes==null?Collections.EMPTY_LIST:new ArrayList<String>(_attributes.keySet());
return Collections.enumeration(names);
}
}
@ -491,7 +490,7 @@ public abstract class AbstractSession implements AbstractSessionManager.SessionI
synchronized(this)
{
HttpSessionEvent event = new HttpSessionEvent(this);
for (Iterator iter = _attributes.values().iterator(); iter.hasNext();)
for (Iterator<Object> iter = _attributes.values().iterator(); iter.hasNext();)
{
Object value = iter.next();
if (value instanceof HttpSessionActivationListener)
@ -509,7 +508,7 @@ public abstract class AbstractSession implements AbstractSessionManager.SessionI
synchronized(this)
{
HttpSessionEvent event = new HttpSessionEvent(this);
for (Iterator iter = _attributes.values().iterator(); iter.hasNext();)
for (Iterator<Object> iter = _attributes.values().iterator(); iter.hasNext();)
{
Object value = iter.next();
if (value instanceof HttpSessionActivationListener)

6
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionIdManager.java
View File

@ -15,23 +15,17 @@ package org.eclipse.jetty.server.session;
import java.lang.ref.WeakReference;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.eclipse.jetty.server.SessionIdManager;
import org.eclipse.jetty.util.MultiMap;
/* ------------------------------------------------------------ */
/**

4
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
View File

@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
import java.util.Timer;
@ -32,7 +31,6 @@ import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@ -513,7 +511,7 @@ public class HashSessionManager extends AbstractSessionManager
*/
DataInputStream in = new DataInputStream(is);
String clusterId = in.readUTF();
String nodeId = in.readUTF();
in.readUTF(); // nodeId
long created = in.readLong();
long accessed = in.readLong();
int requests = in.readInt();

1
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
View File

@ -9,7 +9,6 @@ import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;

3
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
View File

@ -39,7 +39,6 @@ import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@ -650,7 +649,7 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
private void scavenge ()
{
Connection connection = null;
List expiredSessionIds = new ArrayList();
List<String> expiredSessionIds = new ArrayList<String>();
try
{
if (__log.isDebugEnabled()) __log.debug("Scavenge sweep started at "+System.currentTimeMillis());

13
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
View File

@ -24,7 +24,6 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
@ -38,7 +37,6 @@ import javax.servlet.http.HttpSessionListener;
import org.eclipse.jetty.server.SessionIdManager;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.LazyList;
import org.eclipse.jetty.util.log.Log;
/**
@ -75,7 +73,7 @@ public class JDBCSessionManager extends AbstractSessionManager
protected String __updateSessionAccessTime;
protected String __sessionTableRowId;
private ConcurrentHashMap _sessions;
private ConcurrentHashMap<String, AbstractSession> _sessions;
protected long _saveIntervalSec = 60; //only persist changes to session access times every 60 secs
/**
@ -400,7 +398,7 @@ public class JDBCSessionManager extends AbstractSessionManager
}
@Override
public Class resolveClass (java.io.ObjectStreamClass cl) throws IOException, ClassNotFoundException
public Class<?> resolveClass (java.io.ObjectStreamClass cl) throws IOException, ClassNotFoundException
{
try
{
@ -603,7 +601,7 @@ public class JDBCSessionManager extends AbstractSessionManager
prepareTables();
_sessions = new ConcurrentHashMap();
_sessions = new ConcurrentHashMap<String, AbstractSession>();
super.doStart();
}
@ -771,7 +769,7 @@ public class JDBCSessionManager extends AbstractSessionManager
*
* @param sessionIds
*/
protected void expire (List sessionIds)
protected void expire (List<?> sessionIds)
{
//don't attempt to scavenge if we are shutting down
if (isStopping() || isStopped())
@ -780,7 +778,7 @@ public class JDBCSessionManager extends AbstractSessionManager
//Remove any sessions we already have in memory that match the ids
Thread thread=Thread.currentThread();
ClassLoader old_loader=thread.getContextClassLoader();
ListIterator itor = sessionIds.listIterator();
ListIterator<?> itor = sessionIds.listIterator();
try
{
@ -852,6 +850,7 @@ public class JDBCSessionManager extends AbstractSessionManager
final AtomicReference<Exception> _exception = new AtomicReference<Exception>();
Runnable load = new Runnable()
{
@SuppressWarnings("unchecked")
public void run()
{
SessionData data = null;

1
jetty-server/src/main/java/org/eclipse/jetty/server/session/jmx/AbstractSessionManagerMBean.java
View File

@ -16,7 +16,6 @@
package org.eclipse.jetty.server.session.jmx;
import org.eclipse.jetty.jmx.ObjectMBean;
import org.eclipse.jetty.server.handler.AbstractHandlerContainer;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.jmx.AbstractHandlerMBean;

2
jetty-server/src/main/resources/org/eclipse/jetty/server/session/jmx/AbstractSessionManager-mbean.properties
View File

@ -2,7 +2,7 @@ AbstractSessionManager: Abstract Session Manager
httpOnly: True if cookies use the http only flag
idManager: MObject:RO:The ID Manager instance
maxCookieAge: if greater than zero, the time in seconds a session cookie will last for
maxInactiveInterval: default maximim time in seconds a session may be idle
maxInactiveInterval: default maximum time in seconds a session may be idle
refreshCookieAge: The time in seconds after which a session cookie is re-set
secureCookies: If true, the secure cookie flag is set on session cookies
sessionCookie: The set session cookie

5
tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractTestServer.java
View File

@ -105,4 +105,9 @@ public abstract class AbstractTestServer
return context;
}
public Server getServer()
{
return _server;
}
}