User: olegnitz
Date: 02/02/10 09:57:45
Modified: jetty/src/main/org/mortbay/servlet AdminServlet.java
CGI.java Debug.java Dump.java Forward.java
MultiPartRequest.java MultiPartResponse.java
NotFoundServlet.java RequestDispatchTest.java
SessionDump.java
Log:
Fresh version of Jetty and patches to Jetty plugin by Jan Bartel
Revision Changes Path
1.2 +21 -12 contrib/jetty/src/main/org/mortbay/servlet/AdminServlet.java
Index: AdminServlet.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/AdminServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AdminServlet.java 17 Jan 2002 01:23:22 -0000 1.1
+++ AdminServlet.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: AdminServlet.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: AdminServlet.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -53,19 +53,19 @@
* This is a minimal start to a administration servlet that allows
* start/stop of server components and control of debug parameters.
*
- * @version $Id: AdminServlet.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+ * @version $Id: AdminServlet.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class AdminServlet extends HttpServlet
{
- private java.util.List _servers;
+ private Collection _servers;
/* ------------------------------------------------------------ */
public void init(ServletConfig config)
throws ServletException
{
super.init(config);
- _servers=HttpServer.getHttpServerList();
+ _servers =HttpServer.getHttpServers();
}
/* ------------------------------------------------------------ */
@@ -83,9 +83,10 @@
try{Thread.sleep(1000);}
catch(Exception e){Code.ignore(e);}
Log.event("Stopping All servers");
- for (int s=0;s<_servers.size();s++)
+ Iterator s=_servers.iterator();
+ while(s.hasNext())
{
- HttpServer server=(HttpServer)_servers.get(s);
+ HttpServer server=(HttpServer)s.next();
try{server.stop();}
catch(Exception e){Code.ignore(e);}
}
@@ -106,8 +107,14 @@
try{
target=tok.nextToken();
- HttpServer server=(HttpServer)
- _servers.get(Integer.parseInt(target));
+ int t=Integer.parseInt(target);
+ Iterator s=_servers.iterator();
+ HttpServer server=null;
+ while(s.hasNext() && t>=0)
+ if (t--==0)
+ server=(HttpServer)s.next();
+ else
+ s.next();
if (tokens==1)
{
@@ -214,12 +221,14 @@
List sList=new List(List.Ordered);
page.add(sList);
- String id1;
- for(int i1=0;i1<_servers.size();i1++)
+ String id1;
+ int i1=0;
+ Iterator s=_servers.iterator();
+ while(s.hasNext())
{
- id1=""+i1;
- HttpServer server=(HttpServer)_servers.get(i1);
+ id1=""+i1++;
+ HttpServer server=(HttpServer)s.next();
Composite sItem = sList.newItem();
sItem.add("<B>HttpServer ");
sItem.add(lifeCycle(request,id1,server));
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/servlet/CGI.java
Index: CGI.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/CGI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CGI.java 17 Jan 2002 01:23:22 -0000 1.1
+++ CGI.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -41,7 +41,7 @@
* The cgi bin directory can be set with the cgibinResourceBase init
* parameter or it will default to the resource base of the context.
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Julian Gosnell
*/
public class CGI extends HttpServlet
1.2 +1 -13 contrib/jetty/src/main/org/mortbay/servlet/Debug.java
Index: Debug.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/Debug.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Debug.java 17 Jan 2002 01:23:22 -0000 1.1
+++ Debug.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: Debug.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: Debug.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -57,7 +57,6 @@
tf.addCheckbox("D","Debug On",Code.getDebug());
tf.addTextField("V","Verbosity Level",6,""+Code.getVerbose());
tf.addTextField("P","Debug Patterns",40,Code.getDebugPatterns());
- tf.addTextField("T","Debug Triggers",40,Code.getDebugTriggers());
tf.addCheckbox("W","Suppress Warnings",Code.getSuppressWarnings());
tf.addCheckbox("S","Suppress Stacks",Code.getSuppressStack());
@@ -136,7 +135,6 @@
else
Code.setVerbose(0);
Code.setDebugPatterns(request.getParameter("P"));
- Code.setDebugTriggers(request.getParameter("T"));
LogSink[] sinks = log.getLogSinks();
@@ -207,13 +205,3 @@
return "Debug And Log Options";
}
}
-
-
-
-
-
-
-
-
-
-
1.2 +1 -8 contrib/jetty/src/main/org/mortbay/servlet/Dump.java
Index: Dump.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/Dump.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Dump.java 17 Jan 2002 01:23:22 -0000 1.1
+++ Dump.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: Dump.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: Dump.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -120,13 +120,6 @@
page.add(new Heading(1,"Dump Servlet"));
Table table = new Table(0).cellPadding(0).cellSpacing(0);
page.add(table);
- table.newRow();
- table.newHeading()
- .cell().nest(new Font(2,true))
- .add("Interface javax.servlet.* Request Methods")
- .attribute("COLSPAN","2")
- .left();
-
table.newRow();
table.addHeading("getMethod: ").cell().right();
table.addCell(""+sreq.getMethod());
1.2 +8 -4 contrib/jetty/src/main/org/mortbay/servlet/Forward.java
Index: Forward.java
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/Forward.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Forward.java 17 Jan 2002 01:23:22 -0000 1.1
+++ Forward.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: Forward.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: Forward.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -19,12 +19,16 @@
import javax.servlet.http.HttpServletResponse;
import org.mortbay.util.Code;
-
/* ------------------------------------------------------------ */
/** Forward Servlet Request.
+ * This servlet can be configured with init parameters to use
+ * a RequestDispatcher to forward requests.
+ *
+ * The servlet path of a request is used to look for a initparameter
+ * of that name. If a parameter is found, it's value is used to get a
+ * RequestDispatcher.
*
- *
- * @version $Id: Forward.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+ * @version $Id: Forward.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class Forward extends HttpServlet
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/servlet/MultiPartRequest.java
Index: MultiPartRequest.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/MultiPartRequest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiPartRequest.java 17 Jan 2002 01:23:22 -0000 1.1
+++ MultiPartRequest.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: MultiPartRequest.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: MultiPartRequest.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -32,7 +32,7 @@
* <pre>
* </pre>
*
- * @version $Id: MultiPartRequest.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+ * @version $Id: MultiPartRequest.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
* @author Greg Wilkins
* @author Jim Crossley
*/
1.2 +0 -0
contrib/jetty/src/main/org/mortbay/servlet/MultiPartResponse.java
Index: MultiPartResponse.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/MultiPartResponse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiPartResponse.java 17 Jan 2002 01:23:22 -0000 1.1
+++ MultiPartResponse.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: MultiPartResponse.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: MultiPartResponse.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -16,7 +16,7 @@
/** Handle a multipart MIME response.
*
*
- * @version $Id: MultiPartResponse.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+ * @version $Id: MultiPartResponse.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
* @author Greg Wilkins
* @author Jim Crossley
*/
1.2 +0 -0 contrib/jetty/src/main/org/mortbay/servlet/NotFoundServlet.java
Index: NotFoundServlet.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/NotFoundServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NotFoundServlet.java 17 Jan 2002 01:23:22 -0000 1.1
+++ NotFoundServlet.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: NotFoundServlet.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: NotFoundServlet.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -14,7 +14,7 @@
/** Not Found Servlet.
* Utility servlet to protect a URI by always responding with 404.
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class NotFoundServlet extends HttpServlet
1.2 +7 -2
contrib/jetty/src/main/org/mortbay/servlet/RequestDispatchTest.java
Index: RequestDispatchTest.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/RequestDispatchTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestDispatchTest.java 17 Jan 2002 01:23:22 -0000 1.1
+++ RequestDispatchTest.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: RequestDispatchTest.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: RequestDispatchTest.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -17,13 +17,15 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponseWrapper;
import org.mortbay.util.Code;
/* ------------------------------------------------------------ */
/** Test Servlet RequestDispatcher.
*
- * @version $Id: RequestDispatchTest.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+ * @version $Id: RequestDispatchTest.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class RequestDispatchTest extends HttpServlet
@@ -49,6 +51,9 @@
public void doGet(HttpServletRequest sreq, HttpServletResponse sres)
throws ServletException, IOException
{
+ sreq=new HttpServletRequestWrapper(sreq);
+ sres=new HttpServletResponseWrapper(sres);
+
String prefix = sreq.getContextPath()!=null
? sreq.getContextPath()+sreq.getServletPath()
: sreq.getServletPath();
1.2 +2 -5 contrib/jetty/src/main/org/mortbay/servlet/SessionDump.java
Index: SessionDump.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/servlet/SessionDump.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionDump.java 17 Jan 2002 01:23:22 -0000 1.1
+++ SessionDump.java 10 Feb 2002 17:57:45 -0000 1.2
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: SessionDump.java,v 1.1 2002/01/17 01:23:22 olegnitz Exp $
+// $Id: SessionDump.java,v 1.2 2002/02/10 17:57:45 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.servlet;
@@ -27,7 +27,7 @@
/* ------------------------------------------------------------ */
/** Test Servlet Sessions.
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Greg Wilkins (gregw)
*/
public class SessionDump extends HttpServlet
@@ -58,8 +58,6 @@
if (action.equals("New Session"))
{
session = request.getSession(true);
- if ("on".equals(request.getParameter("Dump")))
- nextUrl="/demo/dump";
}
else
if (session!=null)
@@ -106,7 +104,6 @@
if (session==null)
{
page.add("<H1>No Session</H1>");
- tf.addCheckbox("Dump","Dump new session request",false);
tf.addButton("Action","New Session");
}
else
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
