User: janb
Date: 02/03/03 17:38:57
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:
Update Jetty version (mainly for fix to force creation of a mortbay context class
loader for all webapps).
Revision Changes Path
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractSessionManager.java 24 Feb 2002 05:35:19 -0000 1.3
+++ AbstractSessionManager.java 4 Mar 2002 01:38:57 -0000 1.4
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: AbstractSessionManager.java,v 1.3 2002/02/24 05:35:19 janb Exp $
+// $Id: AbstractSessionManager.java,v 1.4 2002/03/04 01:38:57 janb 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.3 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: AbstractSessionManager.java,v 1.4 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public abstract class AbstractSessionManager implements SessionManager
1.5 +0 -0 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Dispatcher.java 24 Feb 2002 05:35:19 -0000 1.4
+++ Dispatcher.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: Dispatcher.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: Dispatcher.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -45,7 +45,7 @@
/* ------------------------------------------------------------ */
/** Servlet RequestDispatcher.
*
- * @version $Id: Dispatcher.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: Dispatcher.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class Dispatcher implements RequestDispatcher
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FilterHandler.java 24 Feb 2002 05:35:19 -0000 1.4
+++ FilterHandler.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 2001 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: FilterHandler.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: FilterHandler.java,v 1.5 2002/03/04 01:38:57 janb 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.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: FilterHandler.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class FilterHandler
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FilterHolder.java 24 Feb 2002 05:35:19 -0000 1.4
+++ FilterHolder.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: FilterHolder.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: FilterHolder.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -16,7 +16,7 @@
/* --------------------------------------------------------------------- */
/**
- * @version $Id: FilterHolder.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: FilterHolder.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins
*/
public class FilterHolder
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HashSessionManager.java 24 Feb 2002 05:35:19 -0000 1.4
+++ HashSessionManager.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: HashSessionManager.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: HashSessionManager.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -34,7 +34,7 @@
/* ------------------------------------------------------------ */
/** An in-memory implementation of SessionManager.
*
- * @version $Id: HashSessionManager.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: HashSessionManager.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class HashSessionManager extends AbstractSessionManager
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Holder.java 24 Feb 2002 05:35:19 -0000 1.4
+++ Holder.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: Holder.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: Holder.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -20,7 +20,7 @@
/* --------------------------------------------------------------------- */
/**
- * @version $Id: Holder.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: Holder.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins
*/
public class Holder
1.5 +7 -3
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletHandler.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletHandler.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: ServletHandler.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletHandler.java,v 1.5 2002/03/04 01:38:57 janb 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.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: ServletHandler.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins
*/
public class ServletHandler
@@ -568,10 +568,14 @@
{
// service request
holder.handle(request.getWrapper(),response.getWrapper());
+
+ // reset output
response.setOutputState(0);
Code.debug("Handled by ",holder);
+ if (!httpResponse.isCommitted() && response.isWrapped())
+ response.getWrapper().flushBuffer();
if (!httpResponse.isCommitted())
- httpResponse.commit();
+ httpResponse.commit();
}
}
catch(Exception e)
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletHolder.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletHolder.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: ServletHolder.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletHolder.java,v 1.5 2002/03/04 01:38:57 janb 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.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: ServletHolder.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins
*/
public class ServletHolder extends Holder
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletHttpContext.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletHttpContext.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2001 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletHttpContext.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletHttpContext.java,v 1.5 2002/03/04 01:38:57 janb 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.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: ServletHttpContext.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class ServletHttpContext extends HttpContext
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletHttpRequest.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletHttpRequest.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletHttpRequest.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletHttpRequest.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ========================================================================
@@ -61,7 +61,7 @@
* be operated on by multiple threads, then higher level
* synchronizations may be required.
*
- * @version $Id: ServletHttpRequest.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: ServletHttpRequest.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class ServletHttpRequest
1.5 +8 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletHttpResponse.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletHttpResponse.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletHttpResponse.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletHttpResponse.java,v 1.5 2002/03/04 01:38:57 janb 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.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: ServletHttpResponse.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class ServletHttpResponse implements HttpServletResponse
@@ -128,6 +128,12 @@
HttpMessage getFacade()
{
return _facade;
+ }
+
+ /* ------------------------------------------------------------ */
+ boolean isWrapped()
+ {
+ return _wrapper!=null;
}
/* ------------------------------------------------------------ */
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletIn.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletIn.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletIn.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletIn.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletOut.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletOut.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletOut.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletOut.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletSSL.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletSSL.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2001 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletSSL.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletSSL.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -12,7 +12,7 @@
*
* <p> Used by the SSL listener classes.
*
- * @version $Id: ServletSSL.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: ServletSSL.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Brett Sealey
*/
public class ServletSSL
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletWriter.java 24 Feb 2002 05:35:19 -0000 1.4
+++ ServletWriter.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: ServletWriter.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: ServletWriter.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -21,7 +21,7 @@
* This writer can be disabled.
* It is crying out for optimization.
*
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
* @author Greg Wilkins (gregw)
*/
class ServletWriter extends PrintWriter
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionContext.java 24 Feb 2002 05:35:19 -0000 1.4
+++ SessionContext.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: SessionContext.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: SessionContext.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -12,7 +12,7 @@
/* ------------------------------------------------------------ */
/**
* Null returning implementation of HttpSessionContext
- * @version $Id: SessionContext.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: SessionContext.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class SessionContext implements HttpSessionContext
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionManager.java 24 Feb 2002 05:35:19 -0000 1.4
+++ SessionManager.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ===========================================================================
// Copyright (c) 1996 Mort Bay Consulting Pty. Ltd. All rights reserved.
-// $Id: SessionManager.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: SessionManager.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ---------------------------------------------------------------------------
package org.mortbay.jetty.servlet;
@@ -13,7 +13,7 @@
/* --------------------------------------------------------------------- */
/**
*
- * @version $Id: SessionManager.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: SessionManager.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins
*/
public interface SessionManager extends LifeCycle
1.5 +47 -15
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebApplicationContext.java 24 Feb 2002 05:35:19 -0000 1.4
+++ WebApplicationContext.java 4 Mar 2002 01:38:57 -0000 1.5
@@ -1,6 +1,6 @@
// ========================================================================
// Copyright (c) 2000 Mort Bay Consulting (Australia) Pty. Ltd.
-// $Id: WebApplicationContext.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+// $Id: WebApplicationContext.java,v 1.5 2002/03/04 01:38:57 janb Exp $
// ========================================================================
package org.mortbay.jetty.servlet;
@@ -73,7 +73,7 @@
* WEB-INF directory it is applied to the context using the
* XmlConfiguration format.
*
- * @version $Id: WebApplicationContext.java,v 1.4 2002/02/24 05:35:19 janb Exp $
+ * @version $Id: WebApplicationContext.java,v 1.5 2002/03/04 01:38:57 janb Exp $
* @author Greg Wilkins (gregw)
*/
public class WebApplicationContext extends ServletHttpContext
@@ -117,7 +117,11 @@
_war=webApp;
}
-
+ /* ------------------------------------------------------------ */
+ private void extractWAR()
+ {
+ }
+
/* ------------------------------------------------------------ */
private void resolveWebApp()
throws IOException
@@ -126,32 +130,60 @@
{
// Set dir or WAR
_webApp = Resource.newResource(_war);
+
+ if (Code.debug())
+ Code.debug("Try webapp=",_webApp+
+ ", exists="+_webApp.exists()+
+ ", directory="+_webApp.isDirectory());
+
+ // Is the WAR usable directly?
if (_webApp.exists() &&
!_webApp.isDirectory() &&
!_webApp.toString().startsWith("jar:"))
{
- _webApp = Resource.newResource("jar:"+_webApp+"!/");
- if (_webApp.exists())
+ // No - then lets see if it can be turned into a jar URL.
+ Resource jarWebApp = Resource.newResource("jar:"+_webApp+"!/");
+ if (jarWebApp.exists() && jarWebApp.isDirectory())
+ {
+ _webApp=jarWebApp;
_war=_webApp.toString();
+ if (Code.debug())
+ Code.debug("Try webapp=",_webApp+
+ ", exists="+_webApp.exists()+
+ ", directory="+_webApp.isDirectory());
+ }
}
- if (!_webApp.exists()) {
- Code.warning("Web application not found "+_war);
- throw new java.io.FileNotFoundException(_war);
- }
+
- // Expand
- if (_extract && _webApp instanceof JarResource)
- {
+ // If we should extract or the URL is still not usable
+ if (_webApp.exists() && (_extract || !_webApp.isDirectory()))
+ {
+ // Then extract it.
File tempDir=new File(getTempDirectory(),"webapp");
if (tempDir.exists())
tempDir.delete();
tempDir.mkdir();
tempDir.deleteOnExit();
Log.event("Extract "+_war+" to "+tempDir);
- ((JarResource)_webApp).extract(tempDir,true);
+ JarResource.extract(_webApp,tempDir,true);
_webApp=Resource.newResource(tempDir.getCanonicalPath());
+
+ if (Code.debug())
+ Code.debug("Try webapp=",_webApp+
+ ", exists="+_webApp.exists()+
+ ", directory="+_webApp.isDirectory());
+ }
+
+ // Now do we have something usable?
+ if (!_webApp.exists() || !_webApp.isDirectory())
+ {
+ Code.warning("Web application not found "+_war);
+ throw new java.io.FileNotFoundException(_war);
}
+ Code.debug("webapp=",_webApp);
+
+ // Iw there a WEB-INF directory?
_webInf = _webApp.addPath("WEB-INF/");
if (!_webInf.exists() || !_webInf.isDirectory())
_webInf=null;
@@ -342,7 +374,7 @@
}
// initialize the classloader (if it has not been so already)
- initClassLoader();
+ initClassLoader(true);
// Set classpath for Jasper.
if (_servletHandler!=null)
@@ -766,7 +798,7 @@
// handle JSP classpath
if (jspFile!=null)
{
- initClassLoader();
+ initClassLoader(true);
holder.setInitParameter("classpath",getFileClassPath());
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
