Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-8' 

Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-client/src/test/java/org/eclipse/jetty/client/ExternalSiteTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
	jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
	test-jetty-webapp/pom.xml
This commit is contained in:
Jan Bartel 2013-02-22 12:47:02 +11:00
parent 61470cde2e 6a48749f0c
commit 59ada108b2
9 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
View File

@ -25,8 +25,10 @@ import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Set;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.Loader;
@ -50,7 +52,7 @@ public class AnnotationParser
{ {
private static final Logger LOG = Log.getLogger(AnnotationParser.class); private static final Logger LOG = Log.getLogger(AnnotationParser.class);
protected List<String> _parsedClassNames = new ArrayList<String>(); protected Set<String> _parsedClassNames = new HashSet<String>();
protected List<Handler> _handlers = new ArrayList<Handler>(); protected List<Handler> _handlers = new ArrayList<Handler>();
public static String normalize (String name) public static String normalize (String name)

3
jetty-util/src/test/resources/TestData/test/META-INF/MANIFEST.MF Executable file
View File

@ -0,0 +1,3 @@
Manifest-Version: 1.0
Created-By: 1.2.2 (Sun Microsystems Inc.)

1
jetty-util/src/test/resources/TestData/test/alphabet Executable file
View File

@ -0,0 +1 @@
ABCDEFGHIJKLMNOPQRSTUVWXYZ

1
jetty-util/src/test/resources/TestData/test/numbers Executable file
View File

@ -0,0 +1 @@
1234567890

1
jetty-util/src/test/resources/TestData/test/subdir/alphabet Executable file
View File

@ -0,0 +1 @@
ABCDEFGHIJKLMNOPQRSTUVWXYZ

1
jetty-util/src/test/resources/TestData/test/subdir/numbers Executable file
View File

@ -0,0 +1 @@
1234567890

1
jetty-util/src/test/resources/TestData/test/subdir/subsubdir/alphabet Executable file
View File

@ -0,0 +1 @@
ABCDEFGHIJKLMNOPQRSTUVWXYZ

1
jetty-util/src/test/resources/TestData/test/subdir/subsubdir/numbers Executable file
View File

@ -0,0 +1 @@
1234567890

2
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
View File

@ -116,6 +116,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
"org.eclipse.jetty.jndi.", // webapp cannot change naming classes "org.eclipse.jetty.jndi.", // webapp cannot change naming classes
"org.eclipse.jetty.jaas.", // webapp cannot change jaas classes "org.eclipse.jetty.jaas.", // webapp cannot change jaas classes
"org.eclipse.jetty.websocket.", // WebSocket is a jetty extension "org.eclipse.jetty.websocket.", // WebSocket is a jetty extension
"org.eclipse.jetty.websocket.WebSocketServlet", // webapp cannot change WebSocketServlet
"org.eclipse.jetty.servlet.DefaultServlet" // webapp cannot change default servlets "org.eclipse.jetty.servlet.DefaultServlet" // webapp cannot change default servlets
} ; } ;
@ -129,6 +130,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
"-org.eclipse.jetty.jndi.", // don't hide naming classes "-org.eclipse.jetty.jndi.", // don't hide naming classes
"-org.eclipse.jetty.jaas.", // don't hide jaas classes "-org.eclipse.jetty.jaas.", // don't hide jaas classes
"-org.eclipse.jetty.servlets.", // don't hide jetty servlets "-org.eclipse.jetty.servlets.", // don't hide jetty servlets
"-org.eclipse.jetty.websocket.WebSocketServlet", // don't hide WebSocketServlet
"-org.eclipse.jetty.servlet.DefaultServlet", // don't hide default servlet "-org.eclipse.jetty.servlet.DefaultServlet", // don't hide default servlet
"-org.eclipse.jetty.servlet.listener.", // don't hide useful listeners "-org.eclipse.jetty.servlet.listener.", // don't hide useful listeners
"-org.eclipse.jetty.websocket.", //not a serverclass, is a systemclass "-org.eclipse.jetty.websocket.", //not a serverclass, is a systemclass