Bug 465226 - [http] eliminate compiler warnings in http.servlet.tests resulting from the maven build

Signed-off-by: Raymond Auge <raymond.auge@liferay.com>

14 files changed, 20 insertions, 5 deletions

diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb/AbstractWhiteboardTestServlet.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb/AbstractWhiteboardTestServlet.java
index 0219addbb..279af7c4a 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb/AbstractWhiteboardTestServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb/AbstractWhiteboardTestServlet.java
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Raymond Augé
  */
 public class AbstractWhiteboardTestServlet extends HttpServlet {
+	private static final long serialVersionUID = 1L;
 
 	@Override
 	protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage1.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage1.java
index 63548c5eb..cc6b0485d 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage1.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage1.java
@@ -67,6 +67,7 @@ public class TestErrorPage1 extends AbstractTestServlet {
 	}
 
 	Servlet errorServlet = new HttpServlet() {
+		private static final long serialVersionUID = 1L;
 
 		@Override
 		protected void service(
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage2.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage2.java
index 47530cf02..fb21c6d60 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage2.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage2.java
@@ -68,6 +68,7 @@ public class TestErrorPage2 extends AbstractTestServlet {
 
 	Filter f1 = new BaseFilter('b');
 	Servlet errorServlet = new HttpServlet() {
+		private static final long serialVersionUID = 1L;
 
 		@Override
 		protected void service(
@@ -91,6 +92,7 @@ public class TestErrorPage2 extends AbstractTestServlet {
 	};
 
 	public class MyException extends ServletException {
+		private static final long serialVersionUID = 1L;
 	}
 
 }
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage3.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage3.java
index 9209b17f6..4f91d1636 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage3.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage3.java
@@ -67,6 +67,7 @@ public class TestErrorPage3 extends AbstractTestServlet {
 	}
 
 	Servlet errorServlet = new HttpServlet() {
+		private static final long serialVersionUID = 1L;
 
 		@Override
 		protected void service(
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage4.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage4.java
index 077603619..e89062210 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage4.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestErrorPage4.java
@@ -69,6 +69,7 @@ public class TestErrorPage4 extends AbstractTestServlet {
 	}
 
 	Servlet errorServlet = new HttpServlet() {
+		private static final long serialVersionUID = 1L;
 
 		@Override
 		protected void service(
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper10.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper10.java
index d93a2da03..3290667ed 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper10.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/tb1/TestServletContextHelper10.java
@@ -23,7 +23,6 @@ import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.eclipse.equinox.http.servlet.ExtendedHttpService;
 import org.eclipse.equinox.http.servlet.tests.tb.AbstractTestServlet;
 import org.eclipse.equinox.http.servlet.tests.util.BaseFilter;
 import org.osgi.framework.Bundle;
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t1/WBServlet1.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t1/WBServlet1.java
index f94c12880..5422c3e52 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t1/WBServlet1.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t1/WBServlet1.java
@@ -23,6 +23,7 @@ import org.eclipse.equinox.http.servlet.tests.tb.AbstractWhiteboardTestServlet;
  * @author Raymond Augé
  */
 public class WBServlet1 extends AbstractWhiteboardTestServlet {
+	private static final long serialVersionUID = 1L;
 
 	@Override
 	protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException {
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java
index 0b4e620ae..b18f3acd4 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBFilter2.java
@@ -22,7 +22,7 @@ public class WBFilter2 extends AbstractWhiteboardTestFilter {
 
 	char c;
 
-	private void activate(ComponentContext componentContext) {
+	protected void activate(ComponentContext componentContext) {
 		c = (Character)componentContext.getProperties().get("char");
 	}
 
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBServlet2.java b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBServlet2.java
index 5fc2876e3..2102dadb0 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBServlet2.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/bundles_src/tb1/org/eclipse/equinox/http/servlet/tests/wb/t2/WBServlet2.java
@@ -23,6 +23,7 @@ import org.eclipse.equinox.http.servlet.tests.tb.AbstractWhiteboardTestServlet;
  * @author Raymond Augé
  */
 public class WBServlet2 extends AbstractWhiteboardTestServlet {
+	private static final long serialVersionUID = 1L;
 
 	@Override
 	protected void handleDoGet(HttpServletRequest request, PrintWriter writer) throws ServletException, IOException {
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
index a2d1a2487..938d6ef00 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java
@@ -240,6 +240,7 @@ public class ServletTest extends TestCase {
 	 */
 	public void test_ErrorPage6() throws Exception {
 		Servlet servlet = new HttpServlet() {
+			private static final long serialVersionUID = 1L;
 
 			@Override
 			protected void service(
@@ -278,6 +279,8 @@ public class ServletTest extends TestCase {
 		final int status = 422;
 
 		Servlet servlet = new HttpServlet() {
+			private static final long serialVersionUID = 1L;
+
 			@Override
 			protected void doGet(
 				HttpServletRequest req, HttpServletResponse resp)
@@ -317,6 +320,8 @@ public class ServletTest extends TestCase {
 
 	public void test_ErrorPage8() throws Exception {
 		Servlet servlet = new HttpServlet() {
+			private static final long serialVersionUID = 1L;
+
 			@Override
 			protected void doGet(
 				HttpServletRequest req, HttpServletResponse resp)
@@ -346,6 +351,8 @@ public class ServletTest extends TestCase {
 
 	public void test_ErrorPage9() throws Exception {
 		Servlet servlet = new HttpServlet() {
+			private static final long serialVersionUID = 1L;
+
 			@Override
 			protected void doGet(
 				HttpServletRequest req, HttpServletResponse resp)
@@ -1248,9 +1255,6 @@ public class ServletTest extends TestCase {
 			ServletContextDTO[] servletContextDTOs = runtimeDTO.servletContextDTOs;
 
 			Assert.assertTrue(servletContextDTOs.length > 0);
-
-			ServletContextDTO servletContextDTO = servletContextDTOs[0];
-
 		} finally {
 			uninstallBundle(bundle);
 		}
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseAsyncServlet.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseAsyncServlet.java
index ae9c07962..db2f7e71c 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseAsyncServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseAsyncServlet.java
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Raymond Augé
  */
 public class BaseAsyncServlet extends BaseServlet {
+	private static final long serialVersionUID = 1L;
 
 	ScheduledThreadPoolExecutor executor =
 		(ScheduledThreadPoolExecutor)Executors.newScheduledThreadPool(4);
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseChangeSessionIdServlet.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseChangeSessionIdServlet.java
index dce79ccd3..dcfbdf75e 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseChangeSessionIdServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseChangeSessionIdServlet.java
@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 
 
 public class BaseChangeSessionIdServlet extends BaseServlet {
+	private static final long serialVersionUID = 1L;
 
 	public BaseChangeSessionIdServlet(String content) {
 		super(content);
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseServlet.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseServlet.java
index 0ca0ce1a9..14ea19634 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BaseServlet.java
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpSession;
  * @author Raymond Augé
  */
 public class BaseServlet extends HttpServlet {
+	private static final long serialVersionUID = 1L;
 
 	public static final String ATTRIBUTE = "content";
 
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BufferedServlet.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BufferedServlet.java
index f8117b59f..1f00545cf 100644
--- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BufferedServlet.java
+++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/util/BufferedServlet.java
@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 public class BufferedServlet extends HttpServlet {
+	private static final long serialVersionUID = 1L;
 
 	static final char[] value = String.format("%01023d", 1).toCharArray();