costin 02/04/03 15:56:08
Modified: jk/java/org/apache/jk/common HandlerRequest.java
JkInputStream.java WorkerDummy.java
jk/java/org/apache/jk/core MsgContext.java
jk/java/org/apache/jk/server/tomcat33 JkRequest33.java
Worker33.java
jk/java/org/apache/jk/server/tomcat40 JkRequest40.java
Worker40.java
Log:
Use Coyote Request insetead of the old BaseRequest.
This is the first step in merging jk2 java with coyote, and removing
the duplicated code.
Revision Changes Path
1.8 +21 -16
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java
Index: HandlerRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/HandlerRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HandlerRequest.java 27 Feb 2002 06:41:18 -0000 1.7
+++ HandlerRequest.java 3 Apr 2002 23:56:08 -0000 1.8
@@ -70,6 +70,8 @@
import org.apache.tomcat.util.http.*;
import org.apache.tomcat.util.buf.*;
+import org.apache.coyote.Request;
+import org.apache.coyote.*;
/**
* Handle messages related with basic request information.
@@ -391,9 +393,9 @@
throws IOException
{
// FORWARD_REQUEST handler
- BaseRequest req=(BaseRequest)ep.getRequest();
+ Request req=(Request)ep.getRequest();
if( req==null ) {
- req=new BaseRequest();
+ req=new Request();
ep.setRequest( req );
}
@@ -422,18 +424,21 @@
req.setServerPort(msg.getInt());
boolean isSSL = msg.getByte() != 0;
- if( isSSL ) req.setSecure( true );
+ if( isSSL ) {
+ // XXX req.setSecure( true );
+ req.scheme().setString("https");
+ }
decodeHeaders( ep, msg, req, tmpMB );
decodeAttributes( ep, msg, req, tmpMB );
- if(req.getSecure() ) {
- req.setScheme(req.SCHEME_HTTPS);
- }
+// if(req.getSecure() ) {
+// req.setScheme(req.SCHEME_HTTPS);
+// }
// set cookies on request now that we have all headers
- req.cookies().setHeaders(req.headers());
+ req.getCookies().setHeaders(req.getMimeHeaders());
// Check to see if there should be a body packet coming along
// immediately after
@@ -450,7 +455,7 @@
return OK;
}
- private int decodeAttributes( MsgContext ep, Msg msg, BaseRequest req,
+ private int decodeAttributes( MsgContext ep, Msg msg, Request req,
MessageBytes tmpMB) {
boolean moreAttr=true;
@@ -494,12 +499,12 @@
// ignore server
msg.getBytes( tmpMB );
} else {
- msg.getBytes(req.remoteUser());
+ msg.getBytes(req.getRemoteUser());
}
break;
case SC_A_AUTH_TYPE :
- msg.getBytes(req.authType());
+ msg.getBytes(req.getAuthType());
break;
case SC_A_QUERY_STRING :
@@ -507,11 +512,11 @@
break;
case SC_A_JVM_ROUTE :
- msg.getBytes(req.jvmRoute());
+ msg.getBytes(req.getWorkerId());
break;
case SC_A_SSL_CERT :
- req.setSecure( true );
+ req.scheme().setString( "https" );
// Transform the string into certificate.
msg.getBytes(tmpMB);
String certString = tmpMB.toString();
@@ -537,14 +542,14 @@
break;
case SC_A_SSL_CIPHER :
- req.setSecure( true );
+ req.scheme().setString( "https" );
msg.getBytes(tmpMB);
req.setAttribute("javax.servlet.request.cipher_suite",
tmpMB.toString());
break;
case SC_A_SSL_SESSION :
- req.setSecure( true );
+ req.scheme().setString( "https" );
msg.getBytes(tmpMB);
req.setAttribute("javax.servlet.request.ssl_session",
tmpMB.toString());
@@ -564,10 +569,10 @@
return 200;
}
- private void decodeHeaders( MsgContext ep, Msg msg, BaseRequest req,
+ private void decodeHeaders( MsgContext ep, Msg msg, Request req,
MessageBytes tmpMB ) {
// Decode headers
- MimeHeaders headers = req.headers();
+ MimeHeaders headers = req.getMimeHeaders();
int hCount = msg.getInt();
for(int i = 0 ; i < hCount ; i++) {
1.4 +1 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java
Index: JkInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JkInputStream.java 27 Feb 2002 06:41:18 -0000 1.3
+++ JkInputStream.java 3 Apr 2002 23:56:08 -0000 1.4
@@ -70,7 +70,6 @@
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;
import org.apache.jk.core.*;
@@ -230,7 +229,7 @@
log.debug("doRead2: " + pos + " " + len + " " +
blen + " " + c);
if( log.isTraceEnabled() )
- log.trace("Data: \n" + new String( b, off, len ));
+ log.trace("Data: \n" + new String( b, off, (len<blen-1)?len:blen-1
));
toCopy -= c;
1.5 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java
Index: WorkerDummy.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WorkerDummy.java 6 Feb 2002 17:48:52 -0000 1.4
+++ WorkerDummy.java 3 Apr 2002 23:56:08 -0000 1.5
@@ -94,7 +94,7 @@
MessageBytes body=new MessageBytes();
private int headersMsgNote;
- public int invoke( Msg in, MsgContext ep ) // BaseRequest req, Channel ch,
Endpoint ep )
+ public int invoke( Msg in, MsgContext ep )
throws IOException
{
MsgAjp msg=(MsgAjp)ep.getNote( headersMsgNote );
1.2 +5 -4
jakarta-tomcat-connectors/jk/java/org/apache/jk/core/MsgContext.java
Index: MsgContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/core/MsgContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MsgContext.java 6 Feb 2002 17:27:03 -0000 1.1
+++ MsgContext.java 3 Apr 2002 23:56:08 -0000 1.2
@@ -67,7 +67,6 @@
import java.security.*;
import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.http.BaseRequest;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.HttpMessages;
import org.apache.tomcat.util.buf.HexUtils;
@@ -84,7 +83,7 @@
public class MsgContext {
private Object notes[]=new Object[32];
private Channel ch;
- private BaseRequest req;
+ private Object req;
private WorkerEnv wEnv;
public final Object getNote( int id ) {
@@ -114,11 +113,13 @@
this.ch=ch;
}
- public final void setRequest( BaseRequest req ) {
+ /** The high level request object associated with this context
+ */
+ public final void setRequest( Object req ) {
this.req=req;
}
- public final BaseRequest getRequest() {
+ public final Object getRequest() {
return req;
}
1.4 +13 -11
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkRequest33.java
Index: JkRequest33.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkRequest33.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JkRequest33.java 6 Feb 2002 17:51:44 -0000 1.3
+++ JkRequest33.java 3 Apr 2002 23:56:08 -0000 1.4
@@ -74,16 +74,18 @@
import org.apache.tomcat.util.log.*;
import org.apache.tomcat.util.http.*;
-class JkRequest33 extends Request
+import org.apache.coyote.Request;
+
+class JkRequest33 extends org.apache.tomcat.core.Request
{
- BaseRequest ajpReq;
+ org.apache.coyote.Request ajpReq;
MsgContext ep;
JkInputStream jkIS;
- public JkRequest33(BaseRequest ajpReq)
+ public JkRequest33(org.apache.coyote.Request ajpReq)
{
- headers = ajpReq.headers();
+ headers = ajpReq.getMimeHeaders();
methodMB=ajpReq.method();
protoMB=ajpReq.protocol();
uriMB = ajpReq.requestURI();
@@ -125,36 +127,36 @@
public void setRemoteUser( String s ) {
super.setRemoteUser(s);
- ajpReq.remoteUser().setString(s);
+ ajpReq.getRemoteUser().setString(s);
}
public String getRemoteUser() {
- String s=ajpReq.remoteUser().toString();
+ String s=ajpReq.getRemoteUser().toString();
if( s == null )
s=super.getRemoteUser();
return s;
}
public String getAuthType() {
- return ajpReq.authType().toString();
+ return ajpReq.getAuthType().toString();
}
public void setAuthType(String s ) {
- ajpReq.authType().setString(s);
+ ajpReq.getAuthType().setString(s);
}
public String getJvmRoute() {
- return ajpReq.jvmRoute().toString();
+ return ajpReq.getWorkerId().toString();
}
public void setJvmRoute(String s ) {
- ajpReq.jvmRoute().setString(s);
+ ajpReq.getWorkerId().setString(s);
}
// XXX scheme
public boolean isSecure() {
- return ajpReq.getSecure();
+ return "https".equalsIgnoreCase( ajpReq.scheme().toString());
}
// -------------------- Attributes --------------------
1.4 +2 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/Worker33.java
Index: Worker33.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/Worker33.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Worker33.java 6 Feb 2002 17:51:44 -0000 1.3
+++ Worker33.java 3 Apr 2002 23:56:08 -0000 1.4
@@ -99,11 +99,11 @@
this.cm=cm;
}
- public int invoke( Msg msg, MsgContext ep ) // BaseRequest req, Channel ch,
Endpoint ep )
+ public int invoke( Msg msg, MsgContext ep )
throws IOException
{
d("Incoming request " );
- BaseRequest req=ep.getRequest();
+ org.apache.coyote.Request req=(org.apache.coyote.Request)ep.getRequest();
Channel ch=ep.getChannel();
JkRequest33 treq=(JkRequest33)req.getNote( reqNote );
JkResponse33 tres;
1.4 +11 -12
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/JkRequest40.java
Index: JkRequest40.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/JkRequest40.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JkRequest40.java 6 Feb 2002 17:52:27 -0000 1.3
+++ JkRequest40.java 3 Apr 2002 23:56:08 -0000 1.4
@@ -61,7 +61,7 @@
import java.io.*;
import java.util.List;
-import java.util.Iterator;
+import java.util.Enumeration;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
@@ -74,7 +74,6 @@
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;
import org.apache.jk.core.*;
@@ -108,7 +107,7 @@
this.ep=ep;
}
- void setBaseRequest(BaseRequest ajp) throws UnsupportedEncodingException {
+ void setRequest(org.apache.coyote.Request 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)
@@ -120,15 +119,15 @@
setServerName(ajp.serverName().toString());
setServerPort(ajp.getServerPort());
- String remoteUser = ajp.remoteUser().toString();
+ String remoteUser = ajp.getRemoteUser().toString();
if (remoteUser != null) {
setUserPrincipal(new Ajp13Principal(remoteUser));
}
- setAuthType(ajp.authType().toString());
+ setAuthType(ajp.getAuthType().toString());
setQueryString(ajp.queryString().toString());
- setScheme(ajp.getScheme());
- setSecure(ajp.getSecure());
+ setScheme(ajp.scheme().toString());
+ setSecure("https".equalsIgnoreCase( ajp.scheme().toString()));
setContentLength(ajp.getContentLength());
String contentType = ajp.contentType().toString();
@@ -136,7 +135,7 @@
setContentType(contentType);
}
- MimeHeaders mheaders = ajp.headers();
+ MimeHeaders mheaders = ajp.getMimeHeaders();
int nheaders = mheaders.size();
for (int i = 0; i < nheaders; ++i) {
MessageBytes name = mheaders.getName(i);
@@ -144,13 +143,13 @@
addHeader(name.toString(), value.toString());
}
- Iterator itr = ajp.getAttributeNames();
- while (itr.hasNext()) {
- String name = (String)itr.next();
+ Enumeration itr = ajp.getAttributes().keys();
+ while (itr.hasMoreElements()) {
+ String name = (String)itr.nextElement();
setAttribute(name, ajp.getAttribute(name));
}
- addCookies(ajp.cookies());
+ addCookies(ajp.getCookies());
}
// public Object getAttribute(String name) {
1.5 +2 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/Worker40.java
Index: Worker40.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/Worker40.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Worker40.java 6 Feb 2002 17:52:27 -0000 1.4
+++ Worker40.java 3 Apr 2002 23:56:08 -0000 1.5
@@ -98,7 +98,7 @@
{
d("Incoming request " );
- BaseRequest req=ep.getRequest();
+ org.apache.coyote.Request req=(org.apache.coyote.Request)ep.getRequest();
Channel ch=ep.getChannel();
JkRequest40 treq=(JkRequest40)req.getNote( reqNote );
JkResponse40 tres;
@@ -111,7 +111,7 @@
}
tres=(JkResponse40)treq.getResponse();
treq.setEndpoint( ch, ep );
- treq.setBaseRequest( req );
+ treq.setRequest( req );
tres.setEndpoint( ch, ep );
try {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
