You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/04/08 12:45:15 UTC
svn commit: r931866 - in
/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat:
./ security/ valve/
Author: xuhaihong
Date: Thu Apr 8 10:45:15 2010
New Revision: 931866
URL: http://svn.apache.org/viewvc?rev=931866&view=rev
Log:
All Geronimo Valve should support async invocation
Modified:
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/DefaultSubjectValve.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/ProtectedTargetValve.java
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=931866&r1=931865&r2=931866&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Thu Apr 8 10:45:15 2010
@@ -494,6 +494,10 @@ public class GeronimoStandardContext ext
private class SystemMethodValve extends ValveBase {
+ public SystemMethodValve(){
+ super(true);
+ }
+
public void invoke(Request request, Response response) throws IOException, ServletException {
if (request == null && response == null) {
try {
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java?rev=931866&r1=931865&r2=931866&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java Thu Apr 8 10:45:15 2010
@@ -39,6 +39,7 @@ public class SecurityValve extends Valve
private final IdentityService identityService;
public SecurityValve(Authenticator authenticator, Authorizer authorizer, IdentityService identityService) {
+ super(true);
this.authenticator = authenticator;
this.authorizer = authorizer;
this.identityService = identityService;
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/DefaultSubjectValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/DefaultSubjectValve.java?rev=931866&r1=931865&r2=931866&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/DefaultSubjectValve.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/DefaultSubjectValve.java Thu Apr 8 10:45:15 2010
@@ -35,6 +35,7 @@ public class DefaultSubjectValve extends
private final Subject defaultSubject;
public DefaultSubjectValve(Subject defaultSubject) {
+ super(true);
this.defaultSubject = defaultSubject;
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java?rev=931866&r1=931865&r2=931866&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/GeronimoBeforeAfterValve.java Thu Apr 8 10:45:15 2010
@@ -20,36 +20,36 @@ import java.io.IOException;
import javax.servlet.ServletException;
-import org.apache.catalina.Valve;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
import org.apache.geronimo.tomcat.interceptor.BeforeAfter;
public class GeronimoBeforeAfterValve extends ValveBase{
-
+
private final BeforeAfter beforeAfter;
private final int contextIndexCount;
public GeronimoBeforeAfterValve(BeforeAfter beforeAfter, int contextIndexCount) {
+ super(true);
this.beforeAfter = beforeAfter;
this.contextIndexCount = contextIndexCount;
}
public void invoke(Request request, Response response) throws IOException, ServletException {
Object context[] = new Object[contextIndexCount];
-
+
if (beforeAfter != null){
beforeAfter.before(context, request, response, BeforeAfter.EDGE_SERVLET);
}
-
+
// Pass this request on to the next valve in our pipeline
getNext().invoke(request, response);
-
+
if (beforeAfter != null){
beforeAfter.after(context, request, response, 0);
}
-
+
}
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/ProtectedTargetValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/ProtectedTargetValve.java?rev=931866&r1=931865&r2=931866&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/ProtectedTargetValve.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/valve/ProtectedTargetValve.java Thu Apr 8 10:45:15 2010
@@ -28,12 +28,13 @@ import org.apache.tomcat.util.buf.Messag
/**
* Valve that prevents access to OSGI-INF and OSGI-OPT directories.
- *
+ *
* @version $Rev$ $Date$
*/
public class ProtectedTargetValve extends ValveBase {
-
+
public ProtectedTargetValve() {
+ super(true);
}
public void invoke(Request request, Response response) throws IOException, ServletException {
@@ -48,10 +49,10 @@ public class ProtectedTargetValve extend
return;
}
}
-
- getNext().invoke(request, response);
+
+ getNext().invoke(request, response);
}
-
+
private void notFound(HttpServletResponse response) {
try {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
@@ -61,4 +62,6 @@ public class ProtectedTargetValve extend
// Ignore
}
}
+
+
}