http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/df0f8689/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestTransforms.java
----------------------------------------------------------------------
diff --git 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestTransforms.java
 
b/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestTransforms.java
deleted file mode 100755
index 49a9030..0000000
--- 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestTransforms.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright 
ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not 
use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software 
distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express 
or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- 
***************************************************************************************************************************/
-package org.apache.juneau.server;
-
-import static org.junit.Assert.*;
-
-import org.apache.juneau.client.*;
-import org.apache.juneau.json.*;
-import org.junit.*;
-
-public class CT_TestTransforms {
-
-       private static String URL = "/testTransforms";
-
-       
//====================================================================================================
-       // test1 - Test class transform overrides parent class transform
-       // Should return "A2-1".
-       
//====================================================================================================
-       @Test
-       public void testClassTransformOverridesParentClassTransform() throws 
Exception {
-               RestClient client = new TestRestClient(JsonSerializer.DEFAULT, 
JsonParser.DEFAULT);
-               String r;
-               String url = URL + 
"/testClassTransformOverridesParentClassTransform";
-
-               r = client.doGet(url).getResponse(String.class);
-               assertEquals("A2-0", r);
-
-               r = client.doPut(url, "A2-1").getResponse(String.class);
-               assertEquals("A2-1", r);
-
-               r = client.doPut(url + "/A2-2", "").getResponse(String.class);
-               assertEquals("A2-2", r);
-
-               client.closeQuietly();
-       }
-
-       
//====================================================================================================
-       // Test method transform overrides class transform
-       // Should return "A3-1".
-       
//====================================================================================================
-       @Test
-       public void testMethodTransformOverridesClassTransform() throws 
Exception {
-               RestClient client = new TestRestClient(JsonSerializer.DEFAULT, 
JsonParser.DEFAULT);
-               String r;
-               String url = URL + 
"/testMethodTransformOverridesClassTransform";
-
-               r = client.doGet(url).getResponse(String.class);
-               assertEquals("A3-0", r);
-
-               r = client.doPut(url, "A3-1").getResponse(String.class);
-               assertEquals("A3-1", r);
-
-               r = client.doPut(url + "/A3-2", "").getResponse(String.class);
-               assertEquals("A3-2", r);
-
-               client.closeQuietly();
-       }
-}

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/df0f8689/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestUris.java
----------------------------------------------------------------------
diff --git 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestUris.java
 
b/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestUris.java
deleted file mode 100755
index d5b1f04..0000000
--- 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestUris.java
+++ /dev/null
@@ -1,918 +0,0 @@
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright 
ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not 
use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software 
distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express 
or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- 
***************************************************************************************************************************/
-package org.apache.juneau.server;
-
-import static org.junit.Assert.*;
-
-import java.util.regex.*;
-
-import org.apache.juneau.*;
-import org.apache.juneau.client.*;
-import org.apache.juneau.json.*;
-import org.junit.*;
-
-/**
- * Verifies that all the RestRequest.getXXX() methods involving URIs work 
correctly.
- */
-public class CT_TestUris {
-
-       private static String URL2 = Constants.getServerTestUrl() + 
"/testuris";           // /jazz/juneau/sample/testuris
-       private static int port = getPort(Constants.getServerTestUrl());        
          // 9443
-       private static String path = Constants.getServerTestUri().getPath();    
          // /jazz/juneau/sample
-
-       
//====================================================================================================
-       // testRoot - http://localhost:8080/sample/testuris
-       
//====================================================================================================
-       @Test
-       public void testRoot() throws Exception {
-               RestClient client = new TestRestClient(JsonSerializer.DEFAULT, 
JsonParser.DEFAULT);
-               ObjectMap r;
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris
-               
//--------------------------------------------------------------------------------
-               r = client.doGet("/testuris").getResponse(ObjectMap.class);
-               assertEquals("root.test1", r.getString("testMethod"));
-               assertNull(r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/foo
-               
//--------------------------------------------------------------------------------
-               r = client.doGet("/testuris/foo").getResponse(ObjectMap.class);
-               assertEquals("root.test1", r.getString("testMethod"));
-               assertEquals("/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/foo", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("root.test1", r.getString("testMethod"));
-               assertEquals("/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("root.test1", r.getString("testMethod"));
-               assertEquals("/foo/bar/baz", r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/foo/bar%2Fbaz", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test2
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test2").getResponse(ObjectMap.class);
-               assertEquals("root.test2", r.getString("testMethod"));
-               assertEquals("/test2", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test2", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test2"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test2/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test2/foo").getResponse(ObjectMap.class);
-               assertEquals("root.test2", r.getString("testMethod"));
-               assertEquals("/test2/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test2", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test2/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test2/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test2/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test2/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("root.test2", r.getString("testMethod"));
-               assertEquals("/test2/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test2/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test2/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test2/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test3%2Ftest3
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test3%2Ftest3").getResponse(ObjectMap.class);
-               assertEquals("root.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test3%2Ftest3", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test3%2Ftest3"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test3%2Ftest3/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test3%2Ftest3/foo").getResponse(ObjectMap.class);
-               assertEquals("root.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test3%2Ftest3", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test3%2Ftest3/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test3%2Ftest3/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test3%2Ftest3/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test3%2Ftest3/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("root.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test3%2Ftest3/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test3%2Ftest3/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test3%2Ftest3/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/test3%2Ftest3/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test3%2Ftest3/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("root.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo/bar/baz", 
r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test3%2Ftest3/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test3%2Ftest3/foo/bar%2Fbaz", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test3%2Ftest3/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test4/test4
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test4/test4").getResponse(ObjectMap.class);
-               assertEquals("root.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test4", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test4/test4", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test4/test4"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test4/test4/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test4/test4/foo").getResponse(ObjectMap.class);
-               assertEquals("root.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test4/test4", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test4/test4/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test4/test4/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/test4/test4/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test4/test4/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("root.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test4/test4/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test4/test4/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test4/test4/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/test4/test4/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/test4/test4/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("root.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo/bar/baz", 
r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/test4/test4/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/test4/test4/foo/bar%2Fbaz", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/test4/test4/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris", r.getString("contextPath") + 
r.getString("servletPath"));  // App may not have context path, but combination 
should always equal path.
-               assertEquals(URL2, r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               client.closeQuietly();
-       }
-
-       
//====================================================================================================
-       // testChild - http://localhost:8080/sample/testuris/child
-       
//====================================================================================================
-       @Test
-       public void testChild() throws Exception {
-               RestClient client = new TestRestClient(JsonSerializer.DEFAULT, 
JsonParser.DEFAULT);
-               ObjectMap r;
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child").getResponse(ObjectMap.class);
-               assertEquals("child.test1", r.getString("testMethod"));
-               assertNull(r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/foo").getResponse(ObjectMap.class);
-               assertEquals("child.test1", r.getString("testMethod"));
-               assertEquals("/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("child.test1", r.getString("testMethod"));
-               assertEquals("/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("child.test1", r.getString("testMethod"));
-               assertEquals("/foo/bar/baz", r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/foo/bar%2Fbaz", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test2
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test2").getResponse(ObjectMap.class);
-               assertEquals("child.test2", r.getString("testMethod"));
-               assertEquals("/test2", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test2", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test2"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test2/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test2/foo").getResponse(ObjectMap.class);
-               assertEquals("child.test2", r.getString("testMethod"));
-               assertEquals("/test2/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test2", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test2/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test2/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test2/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test2/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("child.test2", r.getString("testMethod"));
-               assertEquals("/test2/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test2/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test2/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test2/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test2/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test2/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("child.test2", r.getString("testMethod"));
-               assertEquals("/test2/foo/bar/baz", r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test2/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test2/foo/bar%2Fbaz", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test2/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test3%2Ftest3
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test3%2Ftest3").getResponse(ObjectMap.class);
-               assertEquals("child.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test3%2Ftest3", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test3%2Ftest3"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test3%2Ftest3/foo").getResponse(ObjectMap.class);
-               assertEquals("child.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test3%2Ftest3", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test3%2Ftest3/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test3%2Ftest3/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test3%2Ftest3/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("child.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test3%2Ftest3/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test3%2Ftest3/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test3%2Ftest3/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test3%2Ftest3/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("child.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo/bar/baz", 
r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test3%2Ftest3/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/test3%2Ftest3/foo/bar%2Fbaz", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test3%2Ftest3/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test4/test4
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test4/test4").getResponse(ObjectMap.class);
-               assertEquals("child.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test4", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test4/test4", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test4/test4"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test4/test4/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test4/test4/foo").getResponse(ObjectMap.class);
-               assertEquals("child.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test4/test4", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test4/test4/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test4/test4/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test4/test4/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test4/test4/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("child.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test4/test4/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/test4/test4/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test4/test4/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test4/test4/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/test4/test4/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("child.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo/bar/baz", 
r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/test4/test4/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/test4/test4/foo/bar%2Fbaz", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/test4/test4/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child", r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               client.closeQuietly();
-       }
-
-       
//====================================================================================================
-       // testGrandChild - 
http://localhost:8080/sample/testuris/child/grandchild
-       
//====================================================================================================
-       @Test
-       public void testGrandChild() throws Exception {
-               RestClient client = new TestRestClient(JsonSerializer.DEFAULT, 
JsonParser.DEFAULT);
-               ObjectMap r;
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test1", r.getString("testMethod"));
-               assertNull(r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/foo").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test1", r.getString("testMethod"));
-               assertEquals("/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test1", r.getString("testMethod"));
-               assertEquals("/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test1", r.getString("testMethod"));
-               assertEquals("/foo/bar/baz", r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild/foo/bar%2Fbaz", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test2
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test2").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test2", r.getString("testMethod"));
-               assertEquals("/test2", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild/test2", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test2"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test2/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test2/foo").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test2", r.getString("testMethod"));
-               assertEquals("/test2/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild/test2", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild/test2/foo", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test2/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test2/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test2/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test2", r.getString("testMethod"));
-               assertEquals("/test2/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild/test2/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild/test2/foo/bar", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test2/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test2/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test2/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test2", r.getString("testMethod"));
-               assertEquals("/test2/foo/bar/baz", r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild/test2/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/grandchild/test2/foo/bar%2Fbaz", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test2/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test3%2Ftest3
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test3%2Ftest3").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test3%2Ftest3"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test3%2Ftest3/foo").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild/test3%2Ftest3", 
r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/grandchild/test3%2Ftest3/foo", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test3%2Ftest3/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test3%2Ftest3/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + 
"/testuris/child/grandchild/test3%2Ftest3/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/grandchild/test3%2Ftest3/foo/bar", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test3%2Ftest3/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test3%2Ftest3/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test3%2Ftest3/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test3", r.getString("testMethod"));
-               assertEquals("/test3/test3/foo/bar/baz", 
r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + 
"/testuris/child/grandchild/test3%2Ftest3/foo", 
r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/grandchild/test3%2Ftest3/foo/bar%2Fbaz", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test3%2Ftest3/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test4/test4
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test4/test4").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4", r.getString("pathInfo"));
-               assertNull(r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild/test4", 
r.getString("requestParentURI"));
-               assertEquals(path + "/testuris/child/grandchild/test4/test4", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test4/test4"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // http://localhost:8080/sample/testuris/child/test4/test4/foo
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test4/test4/foo").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo", r.getString("pathInfo"));
-               assertEquals("foo", r.getString("pathRemainder"));
-               assertEquals(path + "/testuris/child/grandchild/test4/test4", 
r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/grandchild/test4/test4/foo", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test4/test4/foo"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test4/test4/foo/bar
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test4/test4/foo/bar").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo/bar", r.getString("pathInfo"));
-               assertEquals("foo/bar", r.getString("pathRemainder"));
-               assertEquals(path + 
"/testuris/child/grandchild/test4/test4/foo", r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/grandchild/test4/test4/foo/bar", r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test4/test4/foo/bar"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               
//--------------------------------------------------------------------------------
-               // 
http://localhost:8080/sample/testuris/child/test4/test4/foo/bar%2Fbaz
-               
//--------------------------------------------------------------------------------
-               r = 
client.doGet("/testuris/child/grandchild/test4/test4/foo/bar%2Fbaz").getResponse(ObjectMap.class);
-               assertEquals("grandchild.test4", r.getString("testMethod"));
-               assertEquals("/test4/test4/foo/bar/baz", 
r.getString("pathInfo"));
-               assertEquals("foo/bar/baz", r.getString("pathRemainder"));
-               assertEquals(path + 
"/testuris/child/grandchild/test4/test4/foo", r.getString("requestParentURI"));
-               assertEquals(path + 
"/testuris/child/grandchild/test4/test4/foo/bar%2Fbaz", 
r.getString("requestURI"));
-               assertTrue(r.getString("requestURL").endsWith(port + path + 
"/testuris/child/grandchild/test4/test4/foo/bar%2Fbaz"));
-               // Same for servlet
-               assertEquals(path + "/testuris/child/grandchild", 
r.getString("contextPath") + r.getString("servletPath"));  // App may not have 
context path, but combination should always equal path.
-               assertEquals(URL2 + "/child/grandchild", 
r.getString("servletURI"));
-               assertTrue(r.getString("testURL1").endsWith(port + path + 
"/testuris/child/grandchild/testURL"));
-               // Always the same
-               assertTrue(r.getString("testURL2").endsWith(port + "/testURL"));
-               assertEquals("http://testURL";, r.getString("testURL3"));
-
-               client.closeQuietly();
-       }
-
-       private static int getPort(String url) {
-               Pattern p = Pattern.compile("\\:(\\d{2,5})");
-               Matcher m = p.matcher(url);
-               if (m.find())
-                       return Integer.parseInt(m.group(1));
-               return -1;
-       }
-}

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/df0f8689/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestUrlContent.java
----------------------------------------------------------------------
diff --git 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestUrlContent.java
 
b/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestUrlContent.java
deleted file mode 100755
index 6e291bf..0000000
--- 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_TestUrlContent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright 
ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not 
use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software 
distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express 
or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- 
***************************************************************************************************************************/
-package org.apache.juneau.server;
-
-import static org.junit.Assert.*;
-
-import org.apache.juneau.client.*;
-import org.junit.*;
-
-public class CT_TestUrlContent {
-
-       private static String URL = "/testUrlContent";
-       private static RestClient client;
-
-       @BeforeClass
-       public static void beforeClass() {
-               client = new TestRestClient().setHeader("Accept", "text/plain");
-       }
-
-       @AfterClass
-       public static void afterClass() {
-               client.closeQuietly();
-       }
-
-       
//====================================================================================================
-       // Test URL &Content parameter containing a String
-       
//====================================================================================================
-       @Test
-       public void testString() throws Exception {
-               String r;
-               r = client.doGet(URL + 
"/testString?content=\'xxx\'&Content-Type=text/json").getResponseAsString();
-               assertEquals("class=java.lang.String, value=xxx", r);
-       }
-
-       
//====================================================================================================
-       // Test URL &Content parameter containing an Enum
-       
//====================================================================================================
-       @Test
-       public void testEnum() throws Exception {
-               String r;
-               r = client.doGet(URL + 
"/testEnum?content='X1'&Content-Type=text/json").getResponseAsString();
-               
assertEquals("class=org.apache.juneau.server.TestUrlContent$TestEnum, 
value=X1", r);
-       }
-
-       
//====================================================================================================
-       // Test URL &Content parameter containing a Bean
-       
//====================================================================================================
-       @Test
-       public void testBean() throws Exception {
-               String r;
-               r = client.doGet(URL + 
"/testBean?content=%7Bf1:1,f2:'foobar'%7D&Content-Type=text/json").getResponseAsString();
-               
assertEquals("class=org.apache.juneau.server.TestUrlContent$TestBean, 
value={f1:1,f2:'foobar'}", r);
-       }
-
-       
//====================================================================================================
-       // Test URL &Content parameter containing an int
-       
//====================================================================================================
-       @Test
-       public void testInt() throws Exception {
-               String r;
-               r = client.doGet(URL + 
"/testInt?content=123&Content-Type=text/json").getResponseAsString();
-               assertEquals("class=java.lang.Integer, value=123", r);
-       }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/df0f8689/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_UrlPathPattern.java
----------------------------------------------------------------------
diff --git 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_UrlPathPattern.java
 
b/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_UrlPathPattern.java
deleted file mode 100755
index d4fb434..0000000
--- 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/CT_UrlPathPattern.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information regarding copyright 
ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the "License"); you may not 
use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software 
distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express 
or implied.  See the License for the
- * specific language governing permissions and limitations under the License.
- 
***************************************************************************************************************************/
-package org.apache.juneau.server;
-
-import static org.junit.Assert.*;
-
-import java.util.*;
-
-import org.apache.juneau.json.*;
-import org.junit.*;
-
-public class CT_UrlPathPattern {
-       @Test
-       public void testComparison() throws Exception {
-               List<UrlPathPattern> l = new LinkedList<UrlPathPattern>();
-
-               l.add(new UrlPathPattern("/foo"));
-               l.add(new UrlPathPattern("/foo/*"));
-               l.add(new UrlPathPattern("/foo/bar"));
-               l.add(new UrlPathPattern("/foo/bar/*"));
-               l.add(new UrlPathPattern("/foo/{id}"));
-               l.add(new UrlPathPattern("/foo/{id}/*"));
-               l.add(new UrlPathPattern("/foo/{id}/bar"));
-               l.add(new UrlPathPattern("/foo/{id}/bar/*"));
-
-               Collections.sort(l);
-               
assertEquals("['/foo/bar','/foo/bar/*','/foo/{id}/bar','/foo/{id}/bar/*','/foo/{id}','/foo/{id}/*','/foo','/foo/*']",
 JsonSerializer.DEFAULT_LAX.serialize(l));
-       }
-}

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/df0f8689/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/JacocoDummyTest.java
----------------------------------------------------------------------
diff --git 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/JacocoDummyTest.java
 
b/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/JacocoDummyTest.java
new file mode 100755
index 0000000..4123034
--- /dev/null
+++ 
b/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/JacocoDummyTest.java
@@ -0,0 +1,37 @@
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information regarding copyright 
ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not 
use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express 
or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ 
***************************************************************************************************************************/
+package org.apache.juneau.server;
+
+import java.lang.reflect.*;
+
+import org.junit.*;
+
+public class JacocoDummyTest {
+
+       
//====================================================================================================
+       // Dummy code to add test coverage in Jacoco.
+       
//====================================================================================================
+       @Test
+       public void accessPrivateConstructorsOnStaticUtilityClasses() throws 
Exception {
+
+               Class<?>[] classes = new Class[] {
+                       RestUtils.class
+               };
+
+               for (Class<?> c : classes) {
+                       Constructor<?> c1 = c.getDeclaredConstructor();
+                       c1.setAccessible(true);
+                       c1.newInstance();
+               }
+       }
+}

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/df0f8689/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/RestUtilsTest.java
----------------------------------------------------------------------
diff --git 
a/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/RestUtilsTest.java
 
b/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/RestUtilsTest.java
new file mode 100755
index 0000000..26a964a
--- /dev/null
+++ 
b/org.apache.juneau.server.test/src/test/java/org/apache/juneau/server/RestUtilsTest.java
@@ -0,0 +1,188 @@
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information regarding copyright 
ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not 
use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express 
or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ 
***************************************************************************************************************************/
+package org.apache.juneau.server;
+
+import static org.apache.juneau.server.RestUtils.*;
+import static org.junit.Assert.*;
+
+import org.junit.*;
+
+public class RestUtilsTest {
+
+       
//====================================================================================================
+       // decode(String)
+       
//====================================================================================================
+       @Test
+       public void testDecode() throws Exception {
+               assertNull(decode(null));
+               assertEquals("foo/bar baz  bing", 
decode("foo%2Fbar+baz++bing"));
+       }
+
+       
//====================================================================================================
+       // encode(String)
+       
//====================================================================================================
+       @Test
+       public void testEncode() throws Exception {
+               assertNull(encode(null));
+               assertEquals("foo%2Fbar+baz++bing", encode("foo/bar baz  
bing"));
+               assertEquals("foobar", encode("foobar"));
+               assertEquals("+", encode(" "));
+               assertEquals("%2F", encode("/"));
+       }
+
+       
//====================================================================================================
+       // trimPathInfo(String,String)
+       
//====================================================================================================
+       @Test
+       public void testGetServletURI() throws Exception {
+               String e, sp, cp;
+
+               e = "http://hostname";;
+               sp = "";
+               cp = "";
+
+               for (String s : new String[]{
+                               "http://hostname";,
+                               "http://hostname/foo";,
+                               "http://hostname?foo";,
+                               "http://hostname/?foo"})
+                       assertEquals(e, trimPathInfo(new StringBuffer(s), cp, 
sp).toString());
+
+               for (String s : new String[]{
+                               "http:/hostname?foo"}) {
+                       try {
+                               trimPathInfo(new StringBuffer(s), cp, sp);
+                               fail("Exception expected - " + s);
+                       } catch (RuntimeException ex) {}
+               }
+
+
+               e = "http://hostname";;
+               sp = "/";
+               cp = "/";
+
+               for (String s : new String[]{
+                               "http://hostname";,
+                               "http://hostname/foo";,
+                               "http://hostname?foo";,
+                               "http://hostname/?foo"})
+                       assertEquals(e, trimPathInfo(new StringBuffer(s), cp, 
sp).toString());
+
+               e = "http://hostname/foo";;
+               sp = "/foo";
+               cp = "/";
+
+               for (String s : new String[]{
+                               "http://hostname/foo";,
+                               "http://hostname/foo/bar";,
+                               "http://hostname/foo?bar"})
+                       assertEquals(e, trimPathInfo(new StringBuffer(s), cp, 
sp).toString());
+
+               for (String s : new String[]{
+                               "http://hostname/foo2";,
+                               "http://hostname/fo2";,
+                               "http://hostname?foo";,
+                               "http://hostname/fo?bar";,
+                               "http:/hostname/foo"}) {
+                       try {
+                               trimPathInfo(new StringBuffer(s), cp, sp);
+                               fail("Exception expected - " + s);
+                       } catch (RuntimeException ex) {}
+               }
+
+               e = "http://hostname/foo/bar";;
+               sp = "/foo/bar";
+               cp = "/";
+
+               for (String s : new String[]{
+                               "http://hostname/foo/bar";,
+                               "http://hostname/foo/bar/baz";,
+                               "http://hostname/foo/bar?baz"})
+                       assertEquals(e, trimPathInfo(new StringBuffer(s), cp, 
sp).toString());
+
+               for (String s : new String[]{
+                               "http://hostname/foo2/bar";,
+                               "http://hostname/foo/bar2";
+                       }) {
+                       try {
+                               trimPathInfo(new StringBuffer(s), cp, sp);
+                               fail("Exception expected - " + s);
+                       } catch (RuntimeException ex) {}
+               }
+
+               e = "http://hostname/foo/bar";;
+               sp = "/bar";
+               cp = "/foo";
+
+               for (String s : new String[]{
+                               "http://hostname/foo/bar";,
+                               "http://hostname/foo/bar/baz";,
+                               "http://hostname/foo/bar?baz"})
+                       assertEquals(e, trimPathInfo(new StringBuffer(s), cp, 
sp).toString());
+
+               for (String s : new String[]{
+                               "http://hostname/foo2/bar";,
+                               "http://hostname/foo/bar2";
+                       }) {
+                       try {
+                               trimPathInfo(new StringBuffer(s), cp, sp);
+                               fail("Exception expected - " + s);
+                       } catch (RuntimeException ex) {}
+               }
+       }
+
+       
//====================================================================================================
+       // trimSlashes(String)
+       
//====================================================================================================
+       @Test
+       public void testTrimSlashes() throws Exception {
+               assertNull(trimSlashes(null));
+               assertEquals("", trimSlashes(""));
+               assertEquals("", trimSlashes("/"));
+               assertEquals("", trimSlashes("//"));
+               assertEquals("foo/bar", trimSlashes("foo/bar"));
+               assertEquals("foo/bar", trimSlashes("foo/bar//"));
+               assertEquals("foo/bar", trimSlashes("/foo/bar//"));
+               assertEquals("foo/bar", trimSlashes("//foo/bar//"));
+       }
+
+       
//====================================================================================================
+       // trimTrailingSlashes(String)
+       
//====================================================================================================
+       @Test
+       public void testTrimTrailingSlashes() throws Exception {
+               assertNull(trimTrailingSlashes((String)null));
+               assertEquals("", trimTrailingSlashes(""));
+               assertEquals("", trimTrailingSlashes("/"));
+               assertEquals("", trimTrailingSlashes("//"));
+               assertEquals("foo/bar", trimTrailingSlashes("foo/bar"));
+               assertEquals("foo/bar", trimTrailingSlashes("foo/bar//"));
+               assertEquals("/foo/bar", trimTrailingSlashes("/foo/bar//"));
+               assertEquals("//foo/bar", trimTrailingSlashes("//foo/bar//"));
+       }
+
+       
//====================================================================================================
+       // trimTrailingSlashes(StringBuffer)
+       
//====================================================================================================
+       @Test
+       public void testTrimTrailingSlashes2() throws Exception {
+               assertNull(trimTrailingSlashes((StringBuffer)null));
+               assertEquals("", trimTrailingSlashes(new 
StringBuffer("")).toString());
+               assertEquals("", trimTrailingSlashes(new 
StringBuffer("/")).toString());
+               assertEquals("", trimTrailingSlashes(new 
StringBuffer("//")).toString());
+               assertEquals("foo/bar", trimTrailingSlashes(new 
StringBuffer("foo/bar")).toString());
+               assertEquals("foo/bar", trimTrailingSlashes(new 
StringBuffer("foo/bar//")).toString());
+               assertEquals("/foo/bar", trimTrailingSlashes(new 
StringBuffer("/foo/bar//")).toString());
+               assertEquals("//foo/bar", trimTrailingSlashes(new 
StringBuffer("//foo/bar//")).toString());
+       }
+}

Reply via email to