You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/11/18 16:53:00 UTC
svn commit: r1036503 - in /geronimo/server/trunk/plugins/jetty8:
geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/
geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/security/auth/
geronimo-jetty8/src/test/java/org...
Author: rickmcguire
Date: Thu Nov 18 15:53:00 2010
New Revision: 1036503
URL: http://svn.apache.org/viewvc?rev=1036503&view=rev
Log:
fix build breakage caused by jetty8 version change
Modified:
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/security/auth/NoneAuthenticator.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java?rev=1036503&r1=1036502&r2=1036503&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-clustering-wadi/src/main/java/org/apache/geronimo/jetty8/cluster/ClusteredSessionManager.java Thu Nov 18 15:53:00 2010
@@ -69,9 +69,10 @@ public class ClusteredSessionManager ext
}
@Override
- protected void removeSession(String idInCluster) {
+ protected boolean removeSession(String idInCluster) {
synchronized (idToSession) {
idToSession.remove(idInCluster);
+ return true;
}
}
@@ -141,18 +142,11 @@ 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(), System.currentTimeMillis(), session.getSessionId());
this.session = session;
- initValues();
- }
-
- @Override
- protected Map newAttributeMap() {
- return session.getState();
}
@Override
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/security/auth/NoneAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/security/auth/NoneAuthenticator.java?rev=1036503&r1=1036502&r2=1036503&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/security/auth/NoneAuthenticator.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/security/auth/NoneAuthenticator.java Thu Nov 18 15:53:00 2010
@@ -35,7 +35,7 @@ import org.eclipse.jetty.server.Authenti
*/
public class NoneAuthenticator implements Authenticator {
- public void setConfiguration(Configuration configuration) {
+ public void setConfiguration(AuthConfiguration configuration) {
}
public String getAuthMethod() {
Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java?rev=1036503&r1=1036502&r2=1036503&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java (original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java Thu Nov 18 15:53:00 2010
@@ -126,14 +126,14 @@ 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("test", 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 {
return true;
}
- public void setConfiguration(Configuration configuration) {
+ public void setConfiguration(AuthConfiguration configuration) {
}
public String getAuthMethod() {