You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/11/17 15:01:25 UTC
svn commit: r1036043 - in /geronimo/server/branches/2.2/plugins/jetty7: ./
geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/
geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/
Author: genspring
Date: Wed Nov 17 14:01:25 2010
New Revision: 1036043
URL: http://svn.apache.org/viewvc?rev=1036043&view=rev
Log:
GERONIMO-5668 upgrade to Jetty 7.2.1.v20101111, patch from Trygve
Modified:
geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
geronimo/server/branches/2.2/plugins/jetty7/pom.xml
Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java?rev=1036043&r1=1036042&r2=1036043&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java Wed Nov 17 14:01:25 2010
@@ -69,9 +69,9 @@ public class ClusteredSessionManager ext
}
@Override
- protected void removeSession(String idInCluster) {
+ protected boolean removeSession(String idInCluster) {
synchronized (idToSession) {
- idToSession.remove(idInCluster);
+ return idToSession.remove(idInCluster) != null;
}
}
@@ -141,21 +141,17 @@ public class ClusteredSessionManager ext
} catch (SessionAlreadyExistException e) {
throw (IllegalStateException) new IllegalStateException().initCause(e);
}
- initValues();
+
}
protected ClusteredSession(org.apache.geronimo.clustering.Session session) {
super(System.currentTimeMillis(), 0L, session.getSessionId());
this.session = session;
- initValues();
- }
- @Override
- protected Map newAttributeMap() {
- return session.getState();
}
+
@Override
protected String getClusterId() {
return super.getClusterId();
Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java?rev=1036043&r1=1036042&r2=1036043&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java Wed Nov 17 14:01:25 2010
@@ -116,7 +116,7 @@ public class AbstractWebModuleTest exten
final AccessControlContext acc = ContextManager.registerSubjectShort(subject, null, null);
securityHandlerFactory = new ServerAuthenticationGBean(new Authenticator() {
public Authentication validateRequest(ServletRequest request, ServletResponse response, boolean mandatory) throws ServerAuthException {
- return new UserAuthentication(this, new GeronimoUserIdentity(subject, new GeronimoUserPrincipal("foo"), acc));
+ return new UserAuthentication(this.getAuthMethod(), new GeronimoUserIdentity(subject, new GeronimoUserPrincipal("foo"), acc));
}// most likely validatedUser is not needed here.
public boolean secureResponse(ServletRequest request, ServletResponse response, boolean mandatory, Authentication.User validatedUser) throws ServerAuthException {
Modified: geronimo/server/branches/2.2/plugins/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/pom.xml?rev=1036043&r1=1036042&r2=1036043&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/pom.xml Wed Nov 17 14:01:25 2010
@@ -37,7 +37,7 @@
</description>
<properties>
- <jettyVersion>7.2.0.v20101020</jettyVersion>
+ <jettyVersion>7.2.1.v20101111</jettyVersion>
</properties>
<dependencyManagement>