Index: appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyDeployer.java
===================================================================
--- appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyDeployer.java	(revision 51891)
+++ appserver/grizzly/grizzly-container/src/main/java/org/glassfish/extras/grizzly/GrizzlyDeployer.java	(working copy)
@@ -40,7 +40,6 @@
 
 package org.glassfish.extras.grizzly;
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
 import org.jvnet.hk2.annotations.Service;
 import org.jvnet.hk2.annotations.Inject;
 import org.glassfish.api.deployment.Deployer;
Index: appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertiesRule.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertiesRule.java	(working copy)
@@ -59,7 +59,7 @@
 package org.apache.tomcat.util.digester;
 
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.xml.sax.Attributes;
 
 import java.util.logging.Level;
Index: appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallMethodRule.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallMethodRule.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/CallMethodRule.java	(working copy)
@@ -59,7 +59,7 @@
 package org.apache.tomcat.util.digester;
 
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.xml.sax.Attributes;
 
 import java.util.logging.Level;
Index: appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetTopRule.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetTopRule.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetTopRule.java	(working copy)
@@ -59,7 +59,7 @@
 package org.apache.tomcat.util.digester;
 
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 
 import java.util.logging.Level;
 
Index: appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/Digester.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/Digester.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/Digester.java	(working copy)
@@ -61,7 +61,7 @@
 package org.apache.tomcat.util.digester;
 
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.xml.sax.*;
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.DefaultHandler;
Index: appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetNextRule.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetNextRule.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetNextRule.java	(working copy)
@@ -58,7 +58,7 @@
 
 package org.apache.tomcat.util.digester;
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 
 import java.util.logging.Level;
 
Index: appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetRootRule.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetRootRule.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetRootRule.java	(working copy)
@@ -58,7 +58,7 @@
 
 package org.apache.tomcat.util.digester;
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 
 import java.util.logging.Level;
 
Index: appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertyRule.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertyRule.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertyRule.java	(working copy)
@@ -59,7 +59,7 @@
 package org.apache.tomcat.util.digester;
 
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.xml.sax.Attributes;
 
 import java.util.logging.Level;
Index: appserver/web/web-core/src/main/java/org/apache/tomcat/util/modeler/util/DomUtil.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/tomcat/util/modeler/util/DomUtil.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/tomcat/util/modeler/util/DomUtil.java	(working copy)
@@ -58,7 +58,7 @@
 
 package org.apache.tomcat.util.modeler.util;
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
Index: appserver/web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java	(working copy)
@@ -91,7 +91,7 @@
 
     private static final String SET_COOKIE_HEADER = "Set-Cookie";
     public static final String DEFAULT_ENCODING = 
-        org.glassfish.grizzly.http.server.Constants.DEFAULT_CHARACTER_ENCODING;
+        org.glassfish.grizzly.http.util.Constants.DEFAULT_HTTP_CHARACTER_ENCODING;
     public static final int DEFAULT_BUFFER_SIZE = 8*1024;
     static final int debug = 0;
 
Index: appserver/web/web-core/src/main/java/org/apache/catalina/connector/Connector.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/catalina/connector/Connector.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/catalina/connector/Connector.java	(working copy)
@@ -88,7 +88,7 @@
 import org.apache.catalina.util.StringManager;
 import org.apache.tomcat.util.modeler.Registry;
 import org.glassfish.grizzly.http.server.HttpHandler;
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.glassfish.grizzly.http.server.util.Mapper;
 
 /**
Index: appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java	(working copy)
@@ -76,7 +76,7 @@
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Locale;
-import org.glassfish.grizzly.http.server.Constants;
+import org.glassfish.grizzly.http.util.Constants;
 import org.glassfish.grizzly.utils.Charsets;
 
 /**
@@ -284,7 +284,7 @@
                     if (queryString != null) {
                         // Use default as a last resort
                         String queryStringEncoding =
-                            Constants.DEFAULT_CHARACTER_ENCODING;
+                            Constants.DEFAULT_HTTP_CHARACTER_ENCODING;
                 
                         /*String uriEncoding = null;
                         boolean useBodyEncodingForURI = false;
@@ -581,7 +581,7 @@
             // if a truly empty file
             //were included, but not sure how else to tell.
             if (retVal.equals("") && !req.getMethod().equalsIgnoreCase(
-                    Constants.HEAD)) {
+                    "HEAD")) {
                 throw new IOException("Couldn't find file: " + path);
             }
             return retVal;
Index: appserver/web/web-core/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/catalina/valves/ErrorReportValve.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/catalina/valves/ErrorReportValve.java	(working copy)
@@ -199,7 +199,7 @@
              * locale (see 6412710)
              */
             if (responseCharEnc != null && !responseCharEnc.equals(
-                    org.glassfish.grizzly.http.server.Constants.DEFAULT_CHARACTER_ENCODING)) {
+                    org.glassfish.grizzly.http.util.Constants.DEFAULT_HTTP_CHARACTER_ENCODING)) {
                 sresp.setCharacterEncoding(responseCharEnc);
             }
             // END PWC 6254469
Index: appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetContextPropertiesRule.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetContextPropertiesRule.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetContextPropertiesRule.java	(working copy)
@@ -58,7 +58,7 @@
 
 package org.apache.catalina.startup;
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.digester.Rule;
 import org.xml.sax.Attributes;
 
Index: appserver/web/web-core/src/main/java/org/apache/catalina/startup/Embedded.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/catalina/startup/Embedded.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/catalina/startup/Embedded.java	(working copy)
@@ -59,7 +59,7 @@
 package org.apache.catalina.startup;
 
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.catalina.*;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardEngine;
Index: appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetAllPropertiesRule.java
===================================================================
--- appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetAllPropertiesRule.java	(revision 51891)
+++ appserver/web/web-core/src/main/java/org/apache/catalina/startup/SetAllPropertiesRule.java	(working copy)
@@ -58,7 +58,7 @@
 
 package org.apache.catalina.startup;
 
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.digester.Rule;
 import org.xml.sax.Attributes;
 
Index: appserver/web/web-core/osgi.bundle
===================================================================
--- appserver/web/web-core/osgi.bundle	(revision 51891)
+++ appserver/web/web-core/osgi.bundle	(working copy)
@@ -57,6 +57,7 @@
                         org.apache.catalina.startup; \
                         org.apache.catalina.util; \
                         org.apache.catalina.valves; \
+                        org.apache.tomcat.util; \
                         org.apache.tomcat.util.modeler; \
                         org.glassfish.web.util; \
                         org.glassfish.web.valve; version=${project.osgi.version}
Index: appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java
===================================================================
--- appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java	(revision 51891)
+++ appserver/web/web-glue/src/main/java/com/sun/enterprise/web/connector/coyote/PECoyoteConnector.java	(working copy)
@@ -49,7 +49,7 @@
 import com.sun.enterprise.web.connector.grizzly.DummyConnectorLauncher;
 import com.sun.enterprise.web.pwc.connector.coyote.PwcCoyoteRequest;
 import org.glassfish.grizzly.config.dom.*;
-import org.glassfish.grizzly.http.server.util.IntrospectionUtils;
+import org.apache.tomcat.util.IntrospectionUtils;
 import com.sun.logging.LogDomains;
 import org.apache.catalina.*;
 import org.apache.catalina.connector.Connector;
Index: appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java
===================================================================
--- appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java	(revision 51891)
+++ appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServer.java	(working copy)
@@ -1707,7 +1707,7 @@
                                                 org.glassfish.grizzly.http.server.Response response = org.glassfish.grizzly.http.server.Response.create();
 
                                                 request.initialize(response, requestPacket, FilterChainContext.create(connection), null);
-                                                response.initialize(request, responsePacket, FilterChainContext.create(connection), null);
+                                                response.initialize(request, responsePacket, FilterChainContext.create(connection), null, null);
 
                                                 Response res = new Response();
                                                 res.setCoyoteResponse(response);
Index: appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWSAdapter.java
===================================================================
--- appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWSAdapter.java	(revision 51891)
+++ appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/EjbWSAdapter.java	(working copy)
@@ -40,9 +40,14 @@
 
 package org.glassfish.webservices;
 
+import org.glassfish.grizzly.servlet.ServletConfigImpl;
 import org.glassfish.grizzly.servlet.ServletHandler;
+import org.glassfish.grizzly.servlet.WebappContext;
 
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
 
+
 /**
  * This class extends the ServletAdapter and sets the servletInstance to the EjbWebServiceServlet
  * so that its service method is invoked whenever a request maps to this Adapter
@@ -50,9 +55,51 @@
 public class EjbWSAdapter extends ServletHandler {
 
     public EjbWSAdapter() {
+        super(new EjbWSServletConfig(new WebappContext("")));
         this.setServletInstance(new EjbWebServiceServlet());
     }
+    
+    
+    // ---------------------------------------------------------- Nested Classes
+    
+    
+    private static class EjbWSServletConfig extends ServletConfigImpl {
 
+        private EjbWSServletConfig(WebappContext servletContextImpl) {
+            super(servletContextImpl);
+        }
 
+
+        // ------------------------------------------ Methods from ServletConfig
+
+
+        @Override
+        public String getServletName() {
+            return "EjbWSServlet";
+        }
+
+        @Override
+        public String getInitParameter(String s) {
+            return null;
+        }
+
+        @Override
+        public Enumeration<String> getInitParameterNames() {
+            return new Enumeration<String>() {
+                @Override
+                public boolean hasMoreElements() {
+                    return false;
+                }
+
+                @Override
+                public String nextElement() {
+                    throw new NoSuchElementException();
+                }
+            };
+        }
+
+    } // END EjbWSServletConfig
+
+
 }
 
Index: pom.xml
===================================================================
--- pom.xml	(revision 51891)
+++ pom.xml	(working copy)
@@ -109,7 +109,7 @@
         <jsf-ext.version>0.2</jsf-ext.version>
         <woodstock.version>4.0.2.8</woodstock.version>
         <jaxrpc-api.version>1.1</jaxrpc-api.version>
-        <grizzly.version>2.1.7</grizzly.version>
+        <grizzly.version>2.2.1-SNAPSHOT</grizzly.version>
         <jsr181-api.version>1.0-MR1</jsr181-api.version>
         <saaj-api.version>1.3</saaj-api.version>
         <hk2.version>1.6.27</hk2.version>
@@ -151,7 +151,7 @@
         <javadb.version>10.6.2.1</javadb.version>
         <jaxr.version>JAXR_RA_20091012</jaxr.version>
         <weld.version>1.1.4.Final</weld.version>
-        <jersey.version>1.11</jersey.version>
+        <jersey.version>1.12-SNAPSHOT</jersey.version>
         <jbi.version>1.0</jbi.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <glassfish-management-api.version>3.1.0-b001</glassfish-management-api.version>
Index: nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/ConnectionMonitor.java
===================================================================
--- nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/ConnectionMonitor.java	(revision 51891)
+++ nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/ConnectionMonitor.java	(working copy)
@@ -92,7 +92,7 @@
     }
 
     @Override
-    public void onWriteEvent(Connection connection, Buffer data, int size) {
+    public void onWriteEvent(Connection connection, Buffer data, long size) {
     }
 
     @Override
Index: nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/KeepAliveMonitor.java
===================================================================
--- nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/KeepAliveMonitor.java	(revision 51891)
+++ nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/KeepAliveMonitor.java	(working copy)
@@ -76,9 +76,10 @@
         connection.addCloseListener(new Connection.CloseListener() {
 
             @Override
-            public void onClosed(final Connection connection) throws IOException {
+            public void onClosed(final Connection connection, Connection.CloseType closeType) throws IOException {
                 grizzlyMonitoring.getKeepAliveProbeProvider().decrementCountConnectionsEvent(monitoringId);
             }
+
         });
     }
 
Index: nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java
===================================================================
--- nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java	(revision 51891)
+++ nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/AdminAdapter.java	(working copy)
@@ -454,7 +454,7 @@
         final ParameterMap parameters = extractParameters(qs);
         try {
             Payload.Inbound inboundPayload = PayloadImpl.Inbound
-                .newInstance(req.getContentType(), req.getInputStream(true));
+                .newInstance(req.getContentType(), req.getInputStream());
             if (aalogger.isLoggable(Level.FINE)) {
                 aalogger.log(Level.FINE, "***** AdminAdapter {0}  *****", req.getMethod());
             }