From 3151dc432747314420978982769e4260aa00c866 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@coolibri.de>
Date: Fri, 23 Dec 2011 17:41:40 +0100
Subject: [PATCH] TestServlet nach juplo-test verschoben

---
 cachecontrol/pom.xml                                      | 6 +++---
 cachecontrol/src/test/resources/web.xml                   | 2 +-
 pom.xml                                                   | 1 +
 test/pom.xml                                              | 8 +++++++-
 .../main/java/de/halbekunst/juplo/test}/TestServlet.java  | 4 +---
 5 files changed, 13 insertions(+), 8 deletions(-)
 rename {cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol => test/src/main/java/de/halbekunst/juplo/test}/TestServlet.java (97%)

diff --git a/cachecontrol/pom.xml b/cachecontrol/pom.xml
index 884bf255..24f21744 100644
--- a/cachecontrol/pom.xml
+++ b/cachecontrol/pom.xml
@@ -56,9 +56,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${springframework.version}</version>
+      <groupId>${pom.parent.groupId}</groupId>
+      <artifactId>${pom.parent.artifactId}-test</artifactId>
+      <version>${pom.parent.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/cachecontrol/src/test/resources/web.xml b/cachecontrol/src/test/resources/web.xml
index 5eee5614..4838a1a3 100644
--- a/cachecontrol/src/test/resources/web.xml
+++ b/cachecontrol/src/test/resources/web.xml
@@ -15,7 +15,7 @@
 
   <servlet>
     <servlet-name>test-servlet</servlet-name>
-    <servlet-class>de.halbekunst.juplo.cachecontrol.TestServlet</servlet-class>
+    <servlet-class>de.halbekunst.juplo.test.TestServlet</servlet-class>
   </servlet>
 
   <servlet-mapping>
diff --git a/pom.xml b/pom.xml
index d9c58c55..4c1bc811 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,7 @@
   </developers>
 
   <modules>
+    <module>test</module>
     <module>cachecontrol</module>
   </modules>
 
diff --git a/test/pom.xml b/test/pom.xml
index 53dd1398..5fc6b1c4 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>de.halbekunst</groupId>
     <artifactId>juplo</artifactId>
-    <version>1.0.1</version>
+    <version>2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>${pom.parent.artifactId}-test</artifactId>
@@ -24,6 +24,12 @@
       <artifactId>spring-context</artifactId>
       <version>${springframework.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet-api.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
diff --git a/cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/TestServlet.java b/test/src/main/java/de/halbekunst/juplo/test/TestServlet.java
similarity index 97%
rename from cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/TestServlet.java
rename to test/src/main/java/de/halbekunst/juplo/test/TestServlet.java
index cb114fdd..b2b29f44 100644
--- a/cachecontrol/src/test/java/de/halbekunst/juplo/cachecontrol/TestServlet.java
+++ b/test/src/main/java/de/halbekunst/juplo/test/TestServlet.java
@@ -1,4 +1,4 @@
-package de.halbekunst.juplo.cachecontrol;
+package de.halbekunst.juplo.test;
 
 import java.io.IOException;
 import java.util.Map;
@@ -8,7 +8,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.junit.Ignore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +15,6 @@ import org.slf4j.LoggerFactory;
  *
  * @author kai
  */
-@Ignore
 public class TestServlet extends HttpServlet {
   private final static Logger log = LoggerFactory.getLogger(TestServlet.class);
 
-- 
2.20.1