User: olegnitz
Date: 02/03/29 18:22:56
Modified: jetty/src/main/org/mortbay/jetty/servlet
AbstractSessionManager.java Dispatcher.java
FilterHandler.java FilterHolder.java
HashSessionManager.java Holder.java
ServletHandler.java ServletHolder.java
ServletHttpContext.java ServletHttpRequest.java
ServletHttpResponse.java ServletIn.java
ServletOut.java ServletSSL.java ServletWriter.java
SessionContext.java SessionManager.java
WebApplicationContext.java
Log:
Jetty 4.0.0
Revision Changes Path
1.6 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/AbstractSessionManager.java
Index: AbstractSessionManager.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/AbstractSessionManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractSessionManager.java 11 Mar 2002 05:29:00 -0000 1.5
+++ AbstractSessionManager.java 30 Mar 2002 02:22:56 -0000 1.6
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: AbstractSessionManager.java,v 1.5 2002/03/11 05:29:00 janb Exp $
+// $Id: AbstractSessionManager.java,v 1.6 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -40,7 +40,7 @@
* to return a specialized version of the Session inner class that
* provides an attribute Map.
*
- * @version $Id: AbstractSessionManager.java,v 1.5 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: AbstractSessionManager.java,v 1.6 2002/03/30 02:22:56 olegnitz Exp
$
* @author Greg Wilkins (gregw)
*/
public abstract class AbstractSessionManager implements SessionManager
1.7 +3 -3 contrib/jetty/src/main/org/mortbay/jetty/servlet/Dispatcher.java
Index: Dispatcher.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/Dispatcher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Dispatcher.java 11 Mar 2002 05:29:00 -0000 1.6
+++ Dispatcher.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: Dispatcher.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: Dispatcher.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -48,7 +48,7 @@
/* ------------------------------------------------------------ */
/** Servlet RequestDispatcher.
*
- * @version $Id: Dispatcher.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: Dispatcher.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class Dispatcher implements RequestDispatcher
@@ -534,7 +534,7 @@
try {_out=super.getOutputStream();}
catch(IllegalStateException e)
{
- Code.warning(e);
+ if (Code.debug()) Code.warning(e);
_out=new ServletOut(new WriterOutputStream(super.getWriter()));
}
}
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/FilterHandler.java
Index: FilterHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/FilterHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FilterHandler.java 11 Mar 2002 05:29:00 -0000 1.6
+++ FilterHandler.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 2001 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: FilterHandler.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: FilterHandler.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -42,7 +42,7 @@
* or more intelligently merge entries in the cache.
*
* @since Servlet 2.3
- * @version $Id: FilterHandler.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: FilterHandler.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class FilterHandler
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/FilterHolder.java
Index: FilterHolder.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/FilterHolder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FilterHolder.java 11 Mar 2002 05:29:00 -0000 1.6
+++ FilterHolder.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: FilterHolder.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: FilterHolder.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -16,7 +16,7 @@
/* --------------------------------------------------------------------- */
/**
- * @version $Id: FilterHolder.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: FilterHolder.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins
*/
public class FilterHolder
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/HashSessionManager.java
Index: HashSessionManager.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/HashSessionManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HashSessionManager.java 11 Mar 2002 05:29:00 -0000 1.6
+++ HashSessionManager.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: HashSessionManager.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: HashSessionManager.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -34,7 +34,7 @@
/* ------------------------------------------------------------ */
/** An in-memory implementation of SessionManager.
*
- * @version $Id: HashSessionManager.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: HashSessionManager.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class HashSessionManager extends AbstractSessionManager
1.7 +0 -0 contrib/jetty/src/main/org/mortbay/jetty/servlet/Holder.java
Index: Holder.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/Holder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Holder.java 11 Mar 2002 05:29:00 -0000 1.6
+++ Holder.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: Holder.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: Holder.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -20,7 +20,7 @@
/* --------------------------------------------------------------------- */
/**
- * @version $Id: Holder.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: Holder.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins
*/
public class Holder
1.7 +28 -5
contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHandler.java
Index: ServletHandler.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletHandler.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletHandler.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: ServletHandler.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletHandler.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -70,7 +70,7 @@
* initialized, then a HashSessionManager with a standard
* java.util.Random generator is created.
*
- * @version $Id: ServletHandler.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: ServletHandler.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins
*/
public class ServletHandler
@@ -96,6 +96,7 @@
private boolean _usingCookies=true;
private LogSink _logSink;
private SessionManager _sessionManager;
+ private boolean _autoInitializeServlets=true;
/* ------------------------------------------------------------ */
/** Constructor.
@@ -348,6 +349,18 @@
{
return super.isStarted();
}
+
+ /* ------------------------------------------------------------ */
+ public boolean isAutoInitializeServlets()
+ {
+ return _autoInitializeServlets;
+ }
+
+ /* ------------------------------------------------------------ */
+ public void setAutoInitializeServlets(boolean b)
+ {
+ _autoInitializeServlets=b;
+ }
/* ----------------------------------------------------------------- */
public synchronized void start()
@@ -367,8 +380,18 @@
// end of the call.
super.start();
+ if (_autoInitializeServlets)
+ initializeServlets();
+ }
+
+ /* ------------------------------------------------------------ */
+ /** Initialize load-on-startup servlets.
+ * Called automatically from start if autoInitializeServlet is true.
+ */
+ public void initializeServlets()
+ throws Exception
+ {
MultiException mx = new MultiException();
-
// Sort and Initialize servlets
ServletHolder holders [] = (ServletHolder [])
(new HashSet(_servletMap.values ())).toArray(new ServletHolder [0]);
@@ -385,7 +408,7 @@
}
}
mx.ifExceptionThrow();
- }
+ }
/* ----------------------------------------------------------------- */
public synchronized void stop()
@@ -406,7 +429,7 @@
_httpContext=null;
super.stop();
}
-
+
/* ------------------------------------------------------------ */
/** Get or create a ServletRequest.
* Create a new or retrieve a previously created servlet request
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHolder.java
Index: ServletHolder.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHolder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletHolder.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletHolder.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: ServletHolder.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletHolder.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -32,7 +32,7 @@
* This class will organise the loading of the servlet when needed or
* requested.
*
- * @version $Id: ServletHolder.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: ServletHolder.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins
*/
public class ServletHolder extends Holder
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHttpContext.java
Index: ServletHttpContext.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHttpContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletHttpContext.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletHttpContext.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2001 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletHttpContext.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletHttpContext.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -14,7 +14,7 @@
/** ServletHttpContext.
* Extends HttpContext with conveniance methods for adding servlets.
* Enforces a single ServletHandler per context.
- * @version $Id: ServletHttpContext.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: ServletHttpContext.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class ServletHttpContext extends HttpContext
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHttpRequest.java
Index: ServletHttpRequest.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHttpRequest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletHttpRequest.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletHttpRequest.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletHttpRequest.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletHttpRequest.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ========================================================================
@@ -61,7 +61,7 @@
* be operated on by multiple threads, then higher level
* synchronizations may be required.
*
- * @version $Id: ServletHttpRequest.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: ServletHttpRequest.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class ServletHttpRequest
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHttpResponse.java
Index: ServletHttpResponse.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletHttpResponse.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletHttpResponse.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletHttpResponse.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletHttpResponse.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletHttpResponse.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -42,7 +42,7 @@
* be operated on by multiple threads, then higher level
* synchronizations may be required.
*
- * @version $Id: ServletHttpResponse.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: ServletHttpResponse.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class ServletHttpResponse implements HttpServletResponse
1.7 +0 -0 contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletIn.java
Index: ServletIn.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletIn.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletIn.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletIn.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletIn.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletIn.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
1.7 +0 -0 contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletOut.java
Index: ServletOut.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletOut.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletOut.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletOut.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletOut.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletOut.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
1.7 +0 -0 contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletSSL.java
Index: ServletSSL.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletSSL.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletSSL.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletSSL.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2001 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletSSL.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletSSL.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -12,7 +12,7 @@
*
* <p> Used by the SSL listener classes.
*
- * @version $Id: ServletSSL.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: ServletSSL.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Brett Sealey
*/
public class ServletSSL
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletWriter.java
Index: ServletWriter.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/ServletWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletWriter.java 11 Mar 2002 05:29:00 -0000 1.6
+++ ServletWriter.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletWriter.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: ServletWriter.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -21,7 +21,7 @@
* This writer can be disabled.
* It is crying out for optimization.
*
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
* @author Greg Wilkins (gregw)
*/
class ServletWriter extends PrintWriter
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/SessionContext.java
Index: SessionContext.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/SessionContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SessionContext.java 11 Mar 2002 05:29:00 -0000 1.6
+++ SessionContext.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: SessionContext.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: SessionContext.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -12,7 +12,7 @@
/* ------------------------------------------------------------ */
/**
* Null returning implementation of HttpSessionContext
- * @version $Id: SessionContext.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: SessionContext.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class SessionContext implements HttpSessionContext
1.7 +0 -0
contrib/jetty/src/main/org/mortbay/jetty/servlet/SessionManager.java
Index: SessionManager.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/SessionManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SessionManager.java 11 Mar 2002 05:29:00 -0000 1.6
+++ SessionManager.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: SessionManager.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: SessionManager.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -13,7 +13,7 @@
/* --------------------------------------------------------------------- */
/**
*
- * @version $Id: SessionManager.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: SessionManager.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins
*/
public interface SessionManager extends LifeCycle
1.7 +31 -18
contrib/jetty/src/main/org/mortbay/jetty/servlet/WebApplicationContext.java
Index: WebApplicationContext.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/jetty/src/main/org/mortbay/jetty/servlet/WebApplicationContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebApplicationContext.java 11 Mar 2002 05:29:00 -0000 1.6
+++ WebApplicationContext.java 30 Mar 2002 02:22:56 -0000 1.7
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: WebApplicationContext.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+// $Id: WebApplicationContext.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -44,6 +44,7 @@
import org.mortbay.util.Code;
import org.mortbay.util.JarResource;
import org.mortbay.util.Log;
+import org.mortbay.util.MultiException;
import org.mortbay.util.Resource;
import org.mortbay.util.StringUtil;
import org.mortbay.xml.XmlConfiguration;
@@ -73,7 +74,7 @@
* WEB-INF directory it is applied to the context using the
* XmlConfiguration format.
*
- * @version $Id: WebApplicationContext.java,v 1.6 2002/03/11 05:29:00 janb Exp $
+ * @version $Id: WebApplicationContext.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
* @author Greg Wilkins (gregw)
*/
public class WebApplicationContext extends ServletHttpContext
@@ -394,31 +395,43 @@
}
}
}
+
+ // Don't init servlets
+ if (_servletHandler!=null)
+ _servletHandler.setAutoInitializeServlets(false);
+
+ MultiException mex = new MultiException();
// Start handlers
- Exception ex=null;
- try {super.start();} catch(Exception e){ex=e;}
-
- // Handle context init.
- if (ex==null || super.isStarted())
- {
+ try { super.start(); }
+ catch(Exception ex) { mex.add(ex); }
+
+ // If it actually started
+ if (super.isStarted())
+ {
+ if (_resourceHandler.isPutAllowed())
+ Log.event("PUT allowed in "+this);
+ if (_resourceHandler.isDelAllowed())
+ Log.event("DEL allowed in "+this);
+
+
// Context listeners
if (_contextListeners!=null && _servletHandler!=null)
{
ServletContextEvent event = new
ServletContextEvent(getServletContext());
for (int i=0;i<_contextListeners.size();i++)
- ((ServletContextListener)_contextListeners.get(i))
- .contextInitialized(event);
+ try{((ServletContextListener)_contextListeners.get(i))
+ .contextInitialized(event);}
+ catch(Exception ex) { mex.add(ex); }
}
-
- if (_resourceHandler.isPutAllowed())
- Log.event("PUT allowed in "+this);
- if (_resourceHandler.isDelAllowed())
- Log.event("DEL allowed in "+this);
+
+ // Initialize servlets
+ if (_servletHandler!=null)
+ try{_servletHandler.initializeServlets();}
+ catch(Exception ex) { mex.add(ex); }
}
-
- if (ex!=null)
- throw ex;
+
+ mex.ifExceptionThrow();
}
/* ------------------------------------------------------------ */
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
