User: janb
Date: 02/02/19 21:33:43
Modified: jetty/src/main/org/mortbay/http/handler DumpHandler.java
HTAccessHandler.java NotFoundHandler.java
NullHandler.java ProxyHandler.java
ResourceHandler.java SecurityHandler.java
Log:
Updating to latest Jetty with tag JBOSS_20020220222111
Revision Changes Path
1.3 +9 -8 contrib/jetty/src/main/org/mortbay/http/handler/DumpHandler.java
Index: DumpHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/handler/DumpHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DumpHandler.java 10 Feb 2002 17:57:43 -0000 1.2
+++ DumpHandler.java 20 Feb 2002 05:33:43 -0000 1.3
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: DumpHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+// $Id: DumpHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
// ========================================================================
package org.mortbay.http.handler;
@@ -8,9 +8,11 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.Collection;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -30,7 +32,7 @@
* Dumps GET and POST requests.
* Useful for testing and debugging.
*
- * @version $Id: DumpHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+ * @version $Id: DumpHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class DumpHandler extends NullHandler
@@ -61,7 +63,7 @@
response.setField(HttpFields.__ContentType,
HttpFields.__TextHtml);
- ChunkableOutputStream out = response.getOutputStream();
+ OutputStream out = response.getOutputStream();
ByteArrayOutputStream buf = new ByteArrayOutputStream(2048);
Writer writer = new OutputStreamWriter(buf,StringUtil.__ISO_8859_1);
writer.write("<HTML><H1>Dump HttpHandler</H1>");
@@ -137,14 +139,13 @@
}
- Collection attributes=request.getAttributeNames();
- if (attributes!=null && attributes.size()>0)
+ Enumeration attributes=request.getAttributeNames();
+ if (attributes!=null && attributes.hasMoreElements())
{
writer.write("</PRE>\n<H3>Attributes:</H3>\n<PRE>");
- Iterator a=attributes.iterator();
- while(a.hasNext())
+ while(attributes.hasMoreElements())
{
- String attr=a.next().toString();
+ String attr=attributes.nextElement().toString();
writer.write(attr);
writer.write("=");
writer.write(request.getAttribute(attr).toString());
1.2 +4 -5
contrib/jetty/src/main/org/mortbay/http/handler/HTAccessHandler.java
Index: HTAccessHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/handler/HTAccessHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTAccessHandler.java 17 Jan 2002 01:23:19 -0000 1.1
+++ HTAccessHandler.java 20 Feb 2002 05:33:43 -0000 1.2
@@ -29,15 +29,14 @@
import org.mortbay.util.URI;
import org.mortbay.util.UnixCrypt;
-
-
-
-
/* ------------------------------------------------------------ */
/** Handler to authenticate access using the Apache's .htaccess files.
*
* @version HTAccessHandler v1.0a
- * @authors Van den Broeke Iris, Deville Daniel, Dubois Roger, Greg Wilkins
+ * @author Van den Broeke Iris
+ * @author Deville Daniel
+ * @author Dubois Roger
+ * @author Greg Wilkins
*
*/
public class HTAccessHandler extends NullHandler
1.3 +0 -0
contrib/jetty/src/main/org/mortbay/http/handler/NotFoundHandler.java
Index: NotFoundHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/handler/NotFoundHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NotFoundHandler.java 10 Feb 2002 17:57:43 -0000 1.2
+++ NotFoundHandler.java 20 Feb 2002 05:33:43 -0000 1.3
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: NotFoundHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+// $Id: NotFoundHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
// ========================================================================
package org.mortbay.http.handler;
@@ -22,7 +22,7 @@
/** Handler for resources that were not found.
* Implements OPTIONS and TRACE methods for the server.
*
- * @version $Id: NotFoundHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+ * @version $Id: NotFoundHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class NotFoundHandler extends NullHandler
1.3 +4 -3 contrib/jetty/src/main/org/mortbay/http/handler/NullHandler.java
Index: NullHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/handler/NullHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NullHandler.java 10 Feb 2002 17:57:43 -0000 1.2
+++ NullHandler.java 20 Feb 2002 05:33:43 -0000 1.3
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: NullHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+// $Id: NullHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
// ========================================================================
package org.mortbay.http.handler;
@@ -9,6 +9,7 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.io.OutputStream;
import org.mortbay.http.ChunkableOutputStream;
import org.mortbay.util.Code;
import org.mortbay.http.HttpContext;
@@ -24,7 +25,7 @@
/** Base HTTP Handler.
* This No-op handler is a good base for other handlers
*
- * @version $Id: NullHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+ * @version $Id: NullHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
* @author Greg Wilkins (gregw)
*/
abstract public class NullHandler implements HttpHandler
@@ -81,7 +82,7 @@
// Handle TRACE by returning request header
response.setField(HttpFields.__ContentType,
HttpFields.__MessageHttp);
- ChunkableOutputStream out = response.getOutputStream();
+ OutputStream out = response.getOutputStream();
ByteArrayOutputStream buf = new ByteArrayOutputStream(2048);
Writer writer = new OutputStreamWriter(buf,StringUtil.__ISO_8859_1);
writer.write(request.toString());
1.3 +3 -3
contrib/jetty/src/main/org/mortbay/http/handler/ProxyHandler.java
Index: ProxyHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/handler/ProxyHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProxyHandler.java 10 Feb 2002 17:57:43 -0000 1.2
+++ ProxyHandler.java 20 Feb 2002 05:33:43 -0000 1.3
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ProxyHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+// $Id: ProxyHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
// ========================================================================
package org.mortbay.http.handler;
@@ -29,7 +29,7 @@
* Dumps GET and POST requests.
* Useful for testing and debugging.
*
- * @version $Id: ProxyHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+ * @version $Id: ProxyHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class ProxyHandler extends NullHandler
@@ -136,7 +136,7 @@
// At this point we are committed to sending a response!!!!
request.setHandled(true);
response.setState(HttpMessage.__MSG_SENT);
- ChunkableOutputStream out=response.getOutputStream();
+ OutputStream out=response.getOutputStream();
// Forward 100 responses
while (resLine.startsWith("100"))
1.3 +31 -30
contrib/jetty/src/main/org/mortbay/http/handler/ResourceHandler.java
Index: ResourceHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/handler/ResourceHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceHandler.java 10 Feb 2002 17:57:43 -0000 1.2
+++ ResourceHandler.java 20 Feb 2002 05:33:43 -0000 1.3
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: ResourceHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+// $Id: ResourceHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
// ---------------------------------------------------------------------------
package org.mortbay.http.handler;
@@ -43,7 +43,7 @@
* A simple memory cache is also provided to reduce file I/O.
* HTTP/1.1 ranges are supported.
*
- * @version $Id: ResourceHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+ * @version $Id: ResourceHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
* @author Nuno Pregui�a
* @author Greg Wilkins
*/
@@ -264,7 +264,6 @@
" RESOURCE=",resource);
// check filename
-
String method=request.getMethod();
if (method.equals(HttpRequest.__GET) ||
method.equals(HttpRequest.__POST) ||
@@ -354,7 +353,7 @@
buf.append('?');
buf.append(q);
}
- response.setField(HttpFields.__Location,
URI.addPaths(buf.toString(),"/"));
+ response.getHttpMessage().setField(HttpFields.__Location,
URI.addPaths(buf.toString(),"/"));
response.sendError(302);
return;
}
@@ -405,7 +404,7 @@
// check any modified headers.
long date=0;
- if ((date=request.getDateField(HttpFields.__IfUnmodifiedSince))>0)
+ if
((date=request.getHttpMessage().getDateField(HttpFields.__IfUnmodifiedSince))>0)
{
if (resource.lastModified() > date)
{
@@ -414,7 +413,7 @@
}
}
- if ((date=request.getDateField(HttpFields.__IfModifiedSince))>0)
+ if
((date=request.getHttpMessage().getDateField(HttpFields.__IfModifiedSince))>0)
{
if (resource.lastModified() <= date)
{
@@ -446,8 +445,9 @@
try
{
- int toRead = request.getIntField(HttpFields.__ContentLength);
- InputStream in = request.getInputStream();
+ HttpMessage facade = request.getHttpMessage();
+ int toRead = facade.getContentLength();
+ InputStream in = facade.getInputStream();
OutputStream fos = resource.getOutputStream();
final int bufSize = 1024;
@@ -542,7 +542,7 @@
return;
}
- String newPath = Resource.canonicalPath(request.getField("New-uri"));
+ String newPath =
Resource.canonicalPath(request.getHttpMessage().getField("New-uri"));
if (newPath==null)
{
response.sendError(response.__405_Method_Not_Allowed,
@@ -621,7 +621,7 @@
sb.append(HttpRequest.__OPTIONS);
_allowHeader = sb.toString();
}
- response.setField(HttpFields.__Allow, _allowHeader);
+ response.getHttpMessage().setField(HttpFields.__Allow, _allowHeader);
}
@@ -638,14 +638,14 @@
// see if there are any range headers
Enumeration reqRanges =
request.getDotVersion()>0
- ?request.getFieldValues(HttpFields.__Range)
+ ?request.getHttpMessage().getFieldValues(HttpFields.__Range)
:null;
if (!writeHeaders || reqRanges == null || !reqRanges.hasMoreElements())
{
// if there were no ranges, send entire entity
if (writeHeaders) data.writeHeaders(request,response, resLength);
- data.writeBytes(response.getOutputStream(), 0, resLength);
+ data.writeBytes(response.getHttpMessage().getOutputStream(), 0,
resLength);
request.setHandled(true);
return;
}
@@ -681,11 +681,11 @@
response.setStatus(response.__416_Requested_Range_Not_Satisfiable);
response.setReason((String)response.__statusMsg
.get(new
Integer(response.__416_Requested_Range_Not_Satisfiable)));
- response.setField(
+ response.getHttpMessage().setField(
HttpFields.__ContentRange,
InclusiveByteRange.to416HeaderRangeString(resLength)
);
- data.writeBytes(response.getOutputStream(), 0, resLength);
+ data.writeBytes(response.getHttpMessage().getOutputStream(), 0,
resLength);
request.setHandled(true);
return;
}
@@ -701,9 +701,9 @@
response.setStatus(response.__206_Partial_Content);
response.setReason((String)response.__statusMsg
.get(new Integer(response.__206_Partial_Content)));
- response.setField(HttpFields.__ContentRange,
+ response.getHttpMessage().setField(HttpFields.__ContentRange,
singleSatisfiableRange.toHeaderRangeString(resLength));
- data.writeBytes(response.getOutputStream(),
+ data.writeBytes(response.getHttpMessage().getOutputStream(),
singleSatisfiableRange.getFirst(resLength),
singleLength);
request.setHandled(true);
@@ -724,11 +724,11 @@
// send an old style multipart/x-byteranges Content-Type. This
// keeps Netscape and acrobat happy. This is what Apache does.
String ctp;
- if (request.containsField(HttpFields.__RequestRange))
+ if (request.getHttpMessage().containsField(HttpFields.__RequestRange))
ctp = "multipart/x-byteranges; boundary=";
else
ctp = "multipart/byteranges; boundary=";
- response.setField(HttpFields.__ContentType, ctp+multi.getBoundary());
+ response.getHttpMessage().setContentType(ctp+multi.getBoundary());
rit = validRanges.listIterator();
while (rit.hasNext())
@@ -805,8 +805,7 @@
Code.debug("sendDirectory: "+file);
String base = URI.addPaths(request.getPath(),"/");
- response.setField(HttpFields.__ContentType,
- "text/html");
+ response.getHttpMessage().setContentType("text/html");
if (request.getMethod().equals(HttpRequest.__HEAD))
{
// Bail out here otherwise we build the page fruitlessly and get
@@ -855,7 +854,7 @@
out.write("</TD></TR>\n");
}
out.write("</TABLE>\n");
- out.writeTo(response.getOutputStream());
+ out.writeTo(response.getHttpMessage().getOutputStream());
request.setHandled(true);
}
else
@@ -942,12 +941,13 @@
/* ------------------------------------------------------------ */
public void writeHeaders(HttpRequest request, HttpResponse response, long
count)
{
- response.setField(HttpFields.__ContentType,encoding);
+ HttpMessage facade = response.getHttpMessage();
+ facade.setContentType(encoding);
if (length != -1)
- response.setIntField(HttpFields.__ContentLength, (int) count);
-
response.setDateField(HttpFields.__LastModified,resource.lastModified());
+ facade.setContentLength((int)count);
+ facade.setDateField(HttpFields.__LastModified,resource.lastModified());
if (_acceptRanges && request.getDotVersion()>0)
- response.setField(HttpFields.__AcceptRanges,"bytes");
+ facade.setField(HttpFields.__AcceptRanges,"bytes");
}
/* ------------------------------------------------------------ */
@@ -1099,18 +1099,19 @@
throws IOException
{
Code.debug("HIT: ",resource);
- response.setField(HttpFields.__ContentType,encoding);
+ HttpMessage facade = response.getHttpMessage();
+ facade.setContentType(encoding);
if (count != -1)
{
if (count==bytes.length)
- response.setField(HttpFields.__ContentLength,sizeString);
+ facade.setField(HttpFields.__ContentLength,sizeString);
else
- response.setIntField(HttpFields.__ContentLength,(int)count);
+ facade.setContentLength((int)count);
}
- response.setField(HttpFields.__LastModified,lastModifiedString);
+ facade.setField(HttpFields.__LastModified,lastModifiedString);
if (_acceptRanges && request.getDotVersion()>0)
- response.setField(HttpFields.__AcceptRanges,"bytes");
+ facade.setField(HttpFields.__AcceptRanges,"bytes");
}
/* ------------------------------------------------------------ */
1.3 +0 -0
contrib/jetty/src/main/org/mortbay/http/handler/SecurityHandler.java
Index: SecurityHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/http/handler/SecurityHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityHandler.java 10 Feb 2002 17:57:43 -0000 1.2
+++ SecurityHandler.java 20 Feb 2002 05:33:43 -0000 1.3
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1999 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: SecurityHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+// $Id: SecurityHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
// ========================================================================
package org.mortbay.http.handler;
@@ -33,7 +33,7 @@
/* ------------------------------------------------------------ */
/** Handler to enforce SecurityConstraints.
*
- * @version $Id: SecurityHandler.java,v 1.2 2002/02/10 17:57:43 olegnitz Exp $
+ * @version $Id: SecurityHandler.java,v 1.3 2002/02/20 05:33:43 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class SecurityHandler extends NullHandler
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development