User: jules_gosnell
Date: 02/04/02 16:10:08
Modified: jetty/src/main/org/mortbay/jetty/servlet
WebApplicationContext.java
Log:
roll change forward from main repository:
revert to previous behaviour for init()-ing servlets. New behaviour
breaks struts-example.jar. Classes in jars in WEB-INF/lib fail to be
found in init().
Revision Changes Path
1.8 +9 -10
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebApplicationContext.java 30 Mar 2002 02:22:56 -0000 1.7
+++ WebApplicationContext.java 3 Apr 2002 00:10:07 -0000 1.8
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: WebApplicationContext.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
+// $Id: WebApplicationContext.java,v 1.8 2002/04/03 00:10:07 jules_gosnell Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpSessionAttributeListener;
import javax.servlet.http.HttpSessionBindingListener;
import javax.servlet.http.HttpSessionListener;
-import org.mortbay.http.ContextLoader;
import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpException;
import org.mortbay.http.HttpHandler;
@@ -74,7 +73,7 @@
* WEB-INF directory it is applied to the context using the
* XmlConfiguration format.
*
- * @version $Id: WebApplicationContext.java,v 1.7 2002/03/30 02:22:56 olegnitz Exp $
+ * @version $Id: WebApplicationContext.java,v 1.8 2002/04/03 00:10:07 jules_gosnell
Exp $
* @author Greg Wilkins (gregw)
*/
public class WebApplicationContext extends ServletHttpContext
@@ -396,9 +395,9 @@
}
}
- // Don't init servlets
- if (_servletHandler!=null)
- _servletHandler.setAutoInitializeServlets(false);
+// // Don't init servlets
+// if (_servletHandler!=null)
+// _servletHandler.setAutoInitializeServlets(false);
MultiException mex = new MultiException();
@@ -425,10 +424,10 @@
catch(Exception ex) { mex.add(ex); }
}
- // Initialize servlets
- if (_servletHandler!=null)
- try{_servletHandler.initializeServlets();}
- catch(Exception ex) { mex.add(ex); }
+// // Initialize servlets
+// if (_servletHandler!=null)
+// try{_servletHandler.initializeServlets();}
+// catch(Exception ex) { mex.add(ex); }
}
mex.ifExceptionThrow();
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
