costin 01/11/26 08:56:19
Modified: jk/java/org/apache/ajp AjpHandler.java RequestHandler.java
jk/java/org/apache/ajp/test TestAjp13.java
jk/java/org/apache/ajp/tomcat4 Ajp13Processor.java
Ajp13Request.java
Removed: jk/java/org/apache/ajp AjpRequest.java
Log:
Remove AjpRequest, it contained only the 'javaRoute' which is now included in
util/http/BaseRequest. This simplifies the code ( fewer classes, simpler model )
Revision Changes Path
1.4 +10 -9 jakarta-tomcat-connectors/jk/java/org/apache/ajp/AjpHandler.java
Index: AjpHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/AjpHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AjpHandler.java 2001/11/21 20:49:54 1.3
+++ AjpHandler.java 2001/11/26 16:56:19 1.4
@@ -70,31 +70,32 @@
import org.apache.tomcat.util.http.*;
import org.apache.tomcat.util.buf.*;
-
/**
* Base class for handlers of Ajp messages. Jk provide a simple bidirectional
* communication mechanism between the web server and a servlet container. It is
* based on messages that are passed between the 2 server, using a single
* thread on each side.
*
- * Both sides must be prepared to deal with unknown packages ( by responding with
- * an "message unknown" message ). The container and server may register new
- * message types, implementing special features or specialized implementations
- * for the "base" messages.
+ * The container side must be able to deal with at least the "REQUEST FORWARD",
+ * the server side must be able to deal with at least "HEADERS", "BODY",
+ * "END" messages.
*
- * The container side must be able to deal with at least the "REQUEST FORWARD", and
- * the server side must be able to deal with at least "HEADERS", "BODY", "END"
messages.
- *
+ * @author Henri Gomez
* @author Costin Manolache
*/
public class AjpHandler
{
public static final int UNKNOWN=-1;
+ Ajp13 channel;
+ public void init( Ajp13 channel ) {
+ this.channel=channel;
+ }
+
/** Execute the callback
*/
public int handleAjpMessage( int type, Ajp13 channel,
- Ajp13Packet ajp, AjpRequest req )
+ Ajp13Packet ajp, BaseRequest req )
throws IOException
{
return UNKNOWN;
1.7 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java
Index: RequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestHandler.java 2001/11/21 20:49:54 1.6
+++ RequestHandler.java 2001/11/26 16:56:19 1.7
@@ -218,7 +218,7 @@
// -------------------- Incoming message --------------------
public int handleAjpMessage( int type, Ajp13 channel,
- Ajp13Packet ajp, AjpRequest req )
+ Ajp13Packet ajp, BaseRequest req )
throws IOException
{
switch( type ) {
1.7 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/ajp/test/TestAjp13.java
Index: TestAjp13.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/test/TestAjp13.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestAjp13.java 2001/11/21 20:49:55 1.6
+++ TestAjp13.java 2001/11/26 16:56:19 1.7
@@ -169,7 +169,7 @@
Socket socket = server.accept();
Ajp13 ajp13 = new Ajp13();
MimeHeaders headers = new MimeHeaders();
- AjpRequest request = new AjpRequest();
+ BaseRequest request = new BaseRequest();
ajp13.setSocket(socket);
boolean moreRequests = true;
1.4 +6 -6
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java
Index: Ajp13Processor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Ajp13Processor.java 2001/09/27 10:28:12 1.3
+++ Ajp13Processor.java 2001/11/26 16:56:19 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java,v
1.3 2001/09/27 10:28:12 hgomez Exp $
- * $Revision: 1.3 $
- * $Date: 2001/09/27 10:28:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java,v
1.4 2001/11/26 16:56:19 costin Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/11/26 16:56:19 $
*
* ====================================================================
*
@@ -98,11 +98,11 @@
import org.apache.catalina.util.StringParser;
import org.apache.ajp.Ajp13;
-import org.apache.ajp.AjpRequest;
+import org.apache.tomcat.util.http.BaseRequest;
/**
* @author Kevin Seguin
- * @version $Revision: 1.3 $ $Date: 2001/09/27 10:28:12 $
+ * @version $Revision: 1.4 $ $Date: 2001/11/26 16:56:19 $
*/
final class Ajp13Processor
@@ -140,7 +140,7 @@
// ----------------------------------------------------- Instance Variables
private Ajp13Logger logger = new Ajp13Logger();
- private AjpRequest ajpRequest = new AjpRequest();
+ private BaseRequest ajpRequest = new BaseRequest();
/**
* Is there a new socket available?
1.5 +2 -2
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Request.java
Index: Ajp13Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Request.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Ajp13Request.java 2001/06/25 16:00:41 1.4
+++ Ajp13Request.java 2001/11/26 16:56:19 1.5
@@ -72,10 +72,10 @@
import org.apache.catalina.Globals;
import org.apache.catalina.util.RequestUtil;
-import org.apache.ajp.AjpRequest;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.Cookies;
import org.apache.tomcat.util.http.ServerCookie;
+import org.apache.tomcat.util.http.BaseRequest;
import org.apache.tomcat.util.http.MimeHeaders;
public class Ajp13Request extends HttpRequestBase {
@@ -99,7 +99,7 @@
super.recycle();
}
- void setAjpRequest(AjpRequest ajp) throws UnsupportedEncodingException {
+ void setAjpRequest(BaseRequest ajp) throws UnsupportedEncodingException {
// XXX make this guy wrap AjpRequest so
// we're more efficient (that's the whole point of
// all of the MessageBytes in AjpRequest)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
