Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

jetty-server/src/test/java/org/eclipse/jetty/server/handler/ConnectHandlerSSLTest.java

@@ -178,22 +178,26 @@ public class ConnectHandlerSSLTest extends AbstractConnectHandlerTest
 
     private class AlwaysTrustManager implements X509TrustManager
     {
+        @Override
         public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException
         {
         }
 
+        @Override
         public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException
         {
         }
 
+        @Override
         public X509Certificate[] getAcceptedIssuers()
         {
-            return null;
+            return new X509Certificate[]{};
         }
     }
 
     private static class ServerHandler extends AbstractHandler
     {
+        @Override
         public void handle(String target, Request request, HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws IOException, ServletException
         {
             request.setHandled(true);

jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLCloseTest.java

@@ -51,16 +51,19 @@ public class SSLCloseTest extends TestCase
     private static AsyncEndPoint __endp;
     private static class CredulousTM implements TrustManager, X509TrustManager
     {
+        @Override
         public X509Certificate[] getAcceptedIssuers()
         {
-            return null;
+            return new X509Certificate[]{};
         }
 
+        @Override
         public void checkClientTrusted(X509Certificate[] arg0, String arg1) throws CertificateException
         {
             return;
         }
 
+        @Override
         public void checkServerTrusted(X509Certificate[] arg0, String arg1) throws CertificateException
         {
             return;
@@ -129,6 +132,7 @@ public class SSLCloseTest extends TestCase
 
     private static class WriteHandler extends AbstractHandler
     {
+        @Override
         public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
         {
             try

jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java

@@ -20,6 +20,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.StringTokenizer;
+import java.util.regex.Pattern;
 
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -67,12 +68,17 @@ public class GzipFilter extends UserAgentFilter
     protected Set<String> _mimeTypes;
     protected int _bufferSize=8192;
     protected int _minGzipSize=256;
-    protected Set<String> _excluded;
+    protected Set<String> _excludedAgents;
+    protected Set<Pattern> _excludedAgentPatterns;
+    protected Set<String> _excludedPaths;
+    protected Set<Pattern> _excludedPathPatterns;
+
     
     /* ------------------------------------------------------------ */
     /**
      * @see org.eclipse.jetty.servlets.UserAgentFilter#init(javax.servlet.FilterConfig)
      */
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException
     {
         super.init(filterConfig);
@@ -93,21 +99,48 @@ public class GzipFilter extends UserAgentFilter
             while (tok.hasMoreTokens())
                 _mimeTypes.add(tok.nextToken());
         }
-        
         tmp=filterConfig.getInitParameter("excludedAgents");
         if (tmp!=null)
         {
-            _excluded=new HashSet<String>();
+            _excludedAgents=new HashSet<String>();
             StringTokenizer tok = new StringTokenizer(tmp,",",false);
             while (tok.hasMoreTokens())
-                _excluded.add(tok.nextToken());
+               _excludedAgents.add(tok.nextToken());
         }
+        
+                tmp=filterConfig.getInitParameter("excludeAgentPatterns");
+        if (tmp!=null)
+        {
+            _excludedAgentPatterns=new HashSet<Pattern>();
+            StringTokenizer tok = new StringTokenizer(tmp,",",false);
+            while (tok.hasMoreTokens())
+                _excludedAgentPatterns.add(Pattern.compile(tok.nextToken()));            
+        }        
+        
+        tmp=filterConfig.getInitParameter("excludePaths");
+        if (tmp!=null)
+        {
+            _excludedPaths=new HashSet<String>();
+            StringTokenizer tok = new StringTokenizer(tmp,",",false);
+            while (tok.hasMoreTokens())
+                _excludedPaths.add(tok.nextToken());            
+        }
+        
+        tmp=filterConfig.getInitParameter("excludePathPatterns");
+        if (tmp!=null)
+        {
+            _excludedPathPatterns=new HashSet<Pattern>();
+            StringTokenizer tok = new StringTokenizer(tmp,",",false);
+            while (tok.hasMoreTokens())
+                _excludedPathPatterns.add(Pattern.compile(tok.nextToken()));            
+        }       
     }
 
     /* ------------------------------------------------------------ */
     /**
      * @see org.eclipse.jetty.servlets.UserAgentFilter#destroy()
      */
+    @Override
     public void destroy()
     {
     }
@@ -116,6 +149,7 @@ public class GzipFilter extends UserAgentFilter
     /**
      * @see org.eclipse.jetty.servlets.UserAgentFilter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
      */
+    @Override
     public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) 
         throws IOException, ServletException
     {
@@ -126,14 +160,17 @@ public class GzipFilter extends UserAgentFilter
         if (ae != null && ae.indexOf("gzip")>=0 && !response.containsHeader("Content-Encoding")
                 && !HttpMethods.HEAD.equalsIgnoreCase(request.getMethod()))
         {
-            if (_excluded!=null)
+            String ua = getUserAgent(request);
+            if (isExcludedAgent(ua))
             {
-                String ua=getUserAgent(request);
-                if (_excluded.contains(ua))
-                {
-                    super.doFilter(request,response,chain);
-                    return;
-                }
+                super.doFilter(request,response,chain);
+                return;
+            }
+            String requestURI = request.getRequestURI();
+            if (isExcludedPath(requestURI))
+            {
+                super.doFilter(request,response,chain);
+                return;
             }
 
             final GzipResponseWrapper wrappedResponse=newGzipResponseWrapper(request,response);
@@ -181,7 +218,64 @@ public class GzipFilter extends UserAgentFilter
             super.doFilter(request,response,chain);
         }
     }
-    
+     
+    /**
+     * Checks to see if the UserAgent is excluded
+     * 
+     * @param ua
+     *            the user agent
+     * @return boolean true if excluded
+     */
+    private boolean isExcludedAgent(String ua)
+    {
+        if (ua == null)
+            return false;
+
+        if (_excludedAgents != null)
+        {
+            if (_excludedAgents.contains(ua))
+            {
+                return true;
+            }
+        }
+        else if (_excludedAgentPatterns != null)
+        {
+            for (Pattern pattern : _excludedAgentPatterns)
+            {
+                if (pattern.matcher(ua).matches())
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks to see if the Path is excluded
+     * 
+     * @param ua
+     *            the request uri
+     * @return boolean true if excluded
+     */
+    private boolean isExcludedPath(String requestURI)
+    {
+        if (requestURI == null)
+            return false;
+        if (_excludedPathPatterns != null)
+        {
+            for (Pattern pattern : _excludedPathPatterns)
+            {
+                if (pattern.matcher(requestURI).matches())
+                {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+            
     /**
      * Allows derived implementations to replace ResponseWrapper implementation.
      *

jetty-servlets/src/main/java/org/eclipse/jetty/servlets/UserAgentFilter.java

@@ -118,29 +118,38 @@ public class UserAgentFilter implements Filter
         String tag = (String)_agentCache.get(ua);
         
 
-        if (tag==null)
+        if (tag == null)
         {
-            Matcher matcher=_pattern.matcher(ua);
-            if (matcher.matches())
+            if (_pattern != null)
             {
-                if(matcher.groupCount()>0)
+                Matcher matcher = _pattern.matcher(ua);
+                if (matcher.matches())
                 {
-                    for (int g=1;g<=matcher.groupCount();g++)
+                    if (matcher.groupCount() > 0)
                     {
-                        String group=matcher.group(g);
-                        if (group!=null)
-                            tag=tag==null?group:(tag+group);
+                        for (int g = 1; g <= matcher.groupCount(); g++)
+                        {
+                            String group = matcher.group(g);
+                            if (group != null)
+                                tag = tag == null?group:(tag + group);
+                        }
+                    }
+                    else
+                    {
+                        tag = matcher.group();
                     }
                 }
-                else 
-                    tag=matcher.group();
             }
             else
-                tag=ua;
+            {
+                tag = ua;
+            }
 
-            if (_agentCache.size()>=_agentCacheSize)
-                    _agentCache.clear();
-                _agentCache.put(ua,tag);
+            if (_agentCache.size() >= _agentCacheSize)
+            {
+                _agentCache.clear();
+            }
+            _agentCache.put(ua,tag);
 
         }
         return tag;

jetty-spdy/spdy-jetty-http-webapp/pom.xml

@@ -1,48 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.eclipse.jetty.spdy</groupId>
-        <artifactId>spdy-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spdy-jetty-http-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Jetty :: SPDY :: Jetty HTTP Web Application</name>
-
-    <build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.spdy</groupId>
+    <artifactId>spdy-parent</artifactId>
+    <version>7.6.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>spdy-jetty-http-webapp</artifactId>
+  <packaging>war</packaging>
+  <name>Jetty :: SPDY :: Jetty HTTP Web Application</name>
+  
+  <!--
+      <build>
         <plugins>
-<plugin>
-    <groupId>org.mortbay.jetty</groupId>
-    <artifactId>jetty-maven-plugin</artifactId>
-    <version>${project.version}</version>
-    <configuration>
-        <stopPort>8888</stopPort>
-        <stopKey>quit</stopKey>
-        <jvmArgs>
-            -Dlog4j.configuration=file://${basedir}/src/main/resources/log4j.properties
-            -Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${project.version}/npn-boot-${project.version}.jar
-        </jvmArgs>
-        <jettyXml>${basedir}/src/main/config/jetty-spdy.xml</jettyXml>
-        <contextPath>/</contextPath>
-    </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.jetty.spdy</groupId>
-                        <artifactId>spdy-jetty-http</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                        <version>${slf4j-version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
+          <plugin>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-maven-plugin</artifactId>
+            <version>${project.version}</version>
+            <configuration>
+              <stopPort>8888</stopPort>
+              <stopKey>quit</stopKey>
+              <jvmArgs>
+                -Dlog4j.configuration=file://${basedir}/src/main/resources/log4j.properties
+                -Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${project.version}/npn-boot-${project.version}.jar 
+              </jvmArgs>
+              <jettyXml>${basedir}/src/main/config/jetty-spdy.xml</jettyXml>
+              <contextPath>/</contextPath>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>org.eclipse.jetty.spdy</groupId>
+                <artifactId>spdy-jetty-http</artifactId>
+                <version>${project.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>${slf4j-version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
         </plugins>
-    </build>
-
-</project>
+      </build>
+  -->
+</project>

jetty-spdy/spdy-jetty-http/pom.xml

@@ -1,52 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.eclipse.jetty.spdy</groupId>
-        <artifactId>spdy-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spdy-jetty-http</artifactId>
-    <name>Jetty :: SPDY :: Jetty HTTP Layer</name>
-
-    <build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.spdy</groupId>
+    <artifactId>spdy-parent</artifactId>
+    <version>7.6.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>spdy-jetty-http</artifactId>
+  <name>Jetty :: SPDY :: Jetty HTTP Layer</name>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${project.version}/npn-boot-${project.version}.jar </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>eclipse-release</id>
+      <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>
-                        -Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${project.version}/npn-boot-${project.version}.jar
-                    </argLine>
-                </configuration>
-            </plugin>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skip>true</skip>           
+            </configuration>
+          </plugin>
         </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jetty.spdy</groupId>
-            <artifactId>spdy-jetty</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.npn</groupId>
-            <artifactId>npn-api</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.spdy</groupId>
+      <artifactId>spdy-jetty</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.npn</groupId>
+      <artifactId>npn-api</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

jetty-spdy/spdy-jetty/pom.xml

@@ -1,57 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.eclipse.jetty.spdy</groupId>
-        <artifactId>spdy-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spdy-jetty</artifactId>
-    <name>Jetty :: SPDY :: Jetty Binding</name>
-
-    <build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.spdy</groupId>
+    <artifactId>spdy-parent</artifactId>
+    <version>7.6.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>spdy-jetty</artifactId>
+  <name>Jetty :: SPDY :: Jetty Binding</name>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>-Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${project.version}/npn-boot-${project.version}.jar </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>eclipse-release</id>
+      <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>
-                        -Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/npn/npn-boot/${project.version}/npn-boot-${project.version}.jar
-                    </argLine>
-                </configuration>
-            </plugin>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skip>true</skip>           
+            </configuration>
+          </plugin>
         </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jetty.spdy</groupId>
-            <artifactId>spdy-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.npn</groupId>
-            <artifactId>npn-api</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+      </build>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.spdy</groupId>
+      <artifactId>spdy-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.npn</groupId>
+      <artifactId>npn-api</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>