diff options
author | Jesse McConnell | 2012-07-10 22:28:39 +0000 |
---|---|---|
committer | Jesse McConnell | 2012-07-10 22:28:39 +0000 |
commit | 5e723bc9db29aa014337561e627f1b2e3a1a1dd7 (patch) | |
tree | 91953e949d4450011dbae59d890fdb943e0b3ce0 /jetty-servlets | |
parent | 13e010ddebf0353d01b397e7a4872e25417345ca (diff) | |
download | org.eclipse.jetty.project-5e723bc9db29aa014337561e627f1b2e3a1a1dd7.tar.gz org.eclipse.jetty.project-5e723bc9db29aa014337561e627f1b2e3a1a1dd7.tar.xz org.eclipse.jetty.project-5e723bc9db29aa014337561e627f1b2e3a1a1dd7.zip |
[Bug 376717] Balancer Servlet with round robin support, contribution, added missing license
Diffstat (limited to 'jetty-servlets')
3 files changed, 29 insertions, 6 deletions
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/BalancerServlet.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/BalancerServlet.java index 9ff9536077..f7ef7db009 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/BalancerServlet.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/BalancerServlet.java @@ -1,5 +1,5 @@ // ======================================================================== -// Copyright (c) 2009-2009 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 2012 Intalio, Inc. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 @@ -35,7 +35,7 @@ import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.server.Request; /** - * + * 6 */ public class BalancerServlet extends ProxyServlet { diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractBalancerServletTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractBalancerServletTest.java index f6ab92c172..e798396adc 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractBalancerServletTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractBalancerServletTest.java @@ -1,5 +1,18 @@ package org.eclipse.jetty.servlets; +//======================================================================== +//Copyright (c) 2012 Intalio, Inc. +//------------------------------------------------------------------------ +//All rights reserved. This program and the accompanying materials +//are made available under the terms of the Eclipse Public License v1.0 +//and Apache License v2.0 which accompanies this distribution. +//The Eclipse Public License is available at +//http://www.eclipse.org/legal/epl-v10.html +//The Apache License v2.0 is available at +//http://www.opensource.org/licenses/apache2.0.php +//You may elect to redistribute this code under either of these licenses. +//======================================================================== + import java.io.IOException; import javax.servlet.http.HttpServlet; @@ -17,9 +30,7 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After; import org.junit.Before; -/** - * @author tsegismont - */ + public abstract class AbstractBalancerServletTest { diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/BalancerServletTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/BalancerServletTest.java index 139e272ab0..9513895fc6 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/BalancerServletTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/BalancerServletTest.java @@ -1,4 +1,16 @@ package org.eclipse.jetty.servlets; +//======================================================================== +//Copyright (c) 2012 Intalio, Inc. +//------------------------------------------------------------------------ +//All rights reserved. This program and the accompanying materials +//are made available under the terms of the Eclipse Public License v1.0 +//and Apache License v2.0 which accompanies this distribution. +//The Eclipse Public License is available at +//http://www.eclipse.org/legal/epl-v10.html +//The Apache License v2.0 is available at +//http://www.opensource.org/licenses/apache2.0.php +//You may elect to redistribute this code under either of these licenses. +//======================================================================== import static org.junit.Assert.*; @@ -15,7 +27,7 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Test; /** - * @author tsegismont + * */ public class BalancerServletTest extends AbstractBalancerServletTest { |