diff --git a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java index 816a23edebe..a3f04f2d6a2 100644 --- a/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java +++ b/jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java @@ -183,6 +183,15 @@ public class AttributeNormalizer attributes.add(new PathAttribute("user.dir", "user.dir").weight(6)); Collections.sort(attributes, new PathAttributeComparator()); + + if (LOG.isDebugEnabled()) + { + int i = 0; + for (PathAttribute attr : attributes) + { + LOG.debug(" [{}] {}", i++, attr); + } + } } catch (Exception e) { @@ -361,7 +370,8 @@ public class AttributeNormalizer { if (attr.key.equalsIgnoreCase(property)) { - return attr.path.toUri().toString(); + // stupid uri abuse to get "file:(scheme-specific-part)" + return attr.path.toUri().getRawSchemeSpecificPart(); } } diff --git a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java index 4c29556670a..9a4cd0781fb 100644 --- a/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java +++ b/tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java @@ -18,16 +18,18 @@ package org.eclipse.jetty.quickstart; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; - -import java.io.File; import java.net.MalformedURLException; import java.net.URI; import org.eclipse.jetty.util.resource.Resource; import org.junit.Test; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertThat; + public class AttributeNormalizerTest { @Test @@ -54,6 +56,8 @@ public class AttributeNormalizerTest // Setup example from windows String userhome = AttributeNormalizer.uriSeparators(System.getProperty("user.home")); + System.err.printf("System.getProperty('user.home') = [%s]%n",System.getProperty("user.home")); + System.err.printf("userhome = [%s]%n",userhome); String path = "jar:file:" + userhome + "/.m2/repository/something/somejar.jar!/META-INF/some.tld"; String result = normalizer.normalize(path); diff --git a/tests/test-quickstart/src/test/resources/jetty-logging.properties b/tests/test-quickstart/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..731fa831b87 --- /dev/null +++ b/tests/test-quickstart/src/test/resources/jetty-logging.properties @@ -0,0 +1,3 @@ +org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog +org.eclipse.jetty.LEVEL=INFO +org.eclipse.jetty.quickstart.AttributeNormalizer.LEVEL=DEBUG