Index: ./com/sun/enterprise/appclient/jws/JWSSystemServlet.java
===================================================================
RCS file: /cvs/glassfish/appserv-core/src/java/com/sun/enterprise/appclient/jws/JWSSystemServlet.java,v
retrieving revision 1.10
diff -u -r1.10 JWSSystemServlet.java
--- ./com/sun/enterprise/appclient/jws/JWSSystemServlet.java	17 Aug 2006 16:37:00 -0000	1.10
+++ ./com/sun/enterprise/appclient/jws/JWSSystemServlet.java	16 Apr 2007 23:36:56 -0000
@@ -33,9 +33,12 @@
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
@@ -64,7 +67,7 @@
  *
  * @author tjquinn
  */
-public class JWSSystemServlet extends org.apache.catalina.servlets.DefaultServlet {
+public class JWSSystemServlet extends HttpServlet {
     
     private static final String ARG_QUERY_PARAM_NAME = "arg";
     private static final String PROP_QUERY_PARAM_NAME = "prop";
@@ -80,7 +83,7 @@
     private AppclientJWSSupportInfo jwsInfo = null;
 
     private Logger _logger=LogDomains.getLogger(NamingConventions.JWS_LOGGER);
-
+    RequestDispatcher defaultDispatcher = null;
 
     /** Creates a new instance of JWSSystemServlet */
     public JWSSystemServlet() {
@@ -91,6 +94,10 @@
      */
     public void init() throws ServletException {
         super.init();
+        String dispatcherName = getInitParameter("defaultDispatcherName");
+        if (dispatcherName==null)
+        	dispatcherName = "default";
+         defaultDispatcher = getServletConfig().getServletContext().getNamedDispatcher(dispatcherName);
         try {
             /*
              *Locate - or create - the data structure object.
@@ -172,9 +179,10 @@
             }
             
             /*
-             *Delegate.
+             * Send to the dispatcher for the default servlet.
              */
-            super.service(wrappedRequest, resp);
+            defaultDispatcher.forward(wrappedRequest, resp);
+            
         } catch (Throwable thr) {
             throw new ServletException("Error processing static content for path " + content.getPath(), thr);
         }