[2.3.x] Additional Servlet 4.0 changes. Patch by edburns 'at' java.net.

Author: rlubke

modules/http-server/src/main/java/org/glassfish/grizzly/http/server/util/Mapper.java

@@ -546,6 +546,7 @@ protected void addWrapper(Context context, String path, Object wrapper, boolean
             newWrapper.object = wrapper;
             newWrapper.jspWildCard = jspWildCard;
             newWrapper.servletName = servletName;
+            newWrapper.path = path;
             if (path.endsWith("/*")) {
                 // Wildcard wrapper
                 newWrapper.name = path.substring(0, path.length() - 2);
@@ -1130,6 +1131,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                 mappingData.wrapperPath.setString("");
                 mappingData.pathInfo.setString("/");
                 mappingData.mappingType = MappingData.CONTEXT_ROOT;
+                mappingData.descriptorPath = "/";
             }
         }
 
@@ -1274,6 +1276,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                                 mappingData.requestPath.setString(pathStr);
                                 mappingData.wrapperPath.setString(pathStr);
                                 mappingData.mappingType = MappingData.DEFAULT;
+                                mappingData.descriptorPath = "/";
                             }
                         }
                     }
@@ -1329,6 +1332,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                 mappingData.wrapperPath.setChars
                     (path.getBuffer(), path.getStart(), path.getEnd());
                 mappingData.mappingType = MappingData.DEFAULT;
+                mappingData.descriptorPath = "/";
             }
             // Redirection to a folder
             char[] buf = path.getBuffer();
@@ -1396,6 +1400,7 @@ private void internalMapWrapper(Context context, CharChunk path,
             mappingData.wrapper = wrappers[pos].object;
             mappingData.servletName = wrappers[pos].servletName;
             mappingData.mappingType = MappingData.EXACT;
+            mappingData.descriptorPath = wrappers[pos].path;
         }
     }
 
@@ -1448,6 +1453,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                 mappingData.servletName = wrappers[pos].servletName;
                 mappingData.jspWildCard = wrappers[pos].jspWildCard;
                 mappingData.mappingType = MappingData.PATH;
+                mappingData.descriptorPath = wrappers[pos].path;
             }
         }
     }
@@ -1489,6 +1495,7 @@ private void internalMapWrapper(Context context, CharChunk path,
                     mappingData.wrapper = wrappers[pos].object;
                     mappingData.servletName = wrappers[pos].servletName;
                     mappingData.mappingType = MappingData.EXTENSION;
+                    mappingData.descriptorPath = wrappers[pos].path;
                 }
                 path.setStart(servletPath);
                 path.setEnd(pathEnd);
@@ -2007,7 +2014,7 @@ protected static final class Context
     protected static class Wrapper
         extends MapElement {
 
-        public final String path = null;
+        public String path = null;
         public boolean jspWildCard = false;
         public String servletName = null;
     }

modules/http-server/src/main/java/org/glassfish/grizzly/http/server/util/MappingData.java

@@ -79,6 +79,7 @@ public class MappingData {
     public Object context = null;
     public Object wrapper = null;
     public String servletName = null;
+    public String descriptorPath = null;
     public boolean jspWildCard = false;
     // START GlassFish 1024
     public boolean isDefaultContext = false;
@@ -106,6 +107,7 @@ public void recycle() {
         // START GlassFish 1024
         isDefaultContext = false;
     // END GlassFish 1024
+        descriptorPath = null;
     }
 
     @Override
@@ -121,6 +123,7 @@ public String toString() {
         sb.append("\npathInfo: ").append(pathInfo);
         sb.append("\nredirectPath: ").append(redirectPath);
         sb.append("\nmappingType: ").append(getMappingDescription());
+        sb.append("\ndescriptorPath: ").append(descriptorPath);
         return sb.toString();
     }