From df103dc28bf3d7c9b319c9e6955cd4f4c3c989be Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@coolibri.de>
Date: Thu, 5 May 2011 23:55:04 +0200
Subject: [PATCH] CacheControll-Logik in ein eigenes (separat verwendbares)
 Modul ausgelagert

---
 pom.xml                                       |  2 +-
 {web => utils/cachecontrol}/pom.xml           | 14 ++++---------
 .../cachecontrol/CacheControlInterceptor.java |  6 +++---
 .../utils/cachecontrol}/Cacheable.java        |  2 +-
 utils/pom.xml                                 | 21 +++++++++++++++++++
 5 files changed, 30 insertions(+), 15 deletions(-)
 rename {web => utils/cachecontrol}/pom.xml (81%)
 rename web/src/main/java/de/halbekunst/fotos/web/interceptors/CachingInterceptor.java => utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/CacheControlInterceptor.java (97%)
 rename {web/src/main/java/de/halbekunst/fotos/web/interceptors => utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol}/Cacheable.java (99%)
 create mode 100644 utils/pom.xml

diff --git a/pom.xml b/pom.xml
index b837bd96..7fa47c45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </developers>
 
   <modules>
-    <module>web</module>
+    <module>utils</module>
   </modules>
 
   <properties>
diff --git a/web/pom.xml b/utils/cachecontrol/pom.xml
similarity index 81%
rename from web/pom.xml
rename to utils/cachecontrol/pom.xml
index 85e5bb42..ea6d6da1 100644
--- a/web/pom.xml
+++ b/utils/cachecontrol/pom.xml
@@ -6,31 +6,25 @@
 
   <parent>
     <groupId>de.halbekunst</groupId>
-    <artifactId>fotos</artifactId>
+    <artifactId>utils</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  
-  <artifactId>fotos-web</artifactId>
-  <packaging>jar</packaging>
-  <name>Fotos - Webanwendung</name>
 
-  <dependencies>
+  <artifactId>${pom.parent.artifactId}-cachecontrol</artifactId>
+  <name>Utils - CacheControl</name>
 
-    <!--  Spring -->
+  <dependencies>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
       <version>${springframework.version}</version>
     </dependency>
-
-    <!-- Servlet -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
-
   </dependencies>
 
 </project>
diff --git a/web/src/main/java/de/halbekunst/fotos/web/interceptors/CachingInterceptor.java b/utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/CacheControlInterceptor.java
similarity index 97%
rename from web/src/main/java/de/halbekunst/fotos/web/interceptors/CachingInterceptor.java
rename to utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/CacheControlInterceptor.java
index 00b093e3..54a14de0 100644
--- a/web/src/main/java/de/halbekunst/fotos/web/interceptors/CachingInterceptor.java
+++ b/utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/CacheControlInterceptor.java
@@ -1,4 +1,4 @@
-package de.halbekunst.fotos.web.interceptors;
+package de.halbekunst.utils.cachecontrol;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -15,8 +15,8 @@ import org.springframework.web.servlet.ModelAndView;
  *
  * @author kai
  */
-public class CachingInterceptor implements HandlerInterceptor {
-  private final static Logger log = LoggerFactory.getLogger(CachingInterceptor.class);
+public class CacheControlInterceptor implements HandlerInterceptor {
+  private final static Logger log = LoggerFactory.getLogger(CacheControlInterceptor.class);
 
   public static final String HEADER_DATE = "Date";
   public static final String HEADER_CACHE_CONTROL = "Cache-Control";
diff --git a/web/src/main/java/de/halbekunst/fotos/web/interceptors/Cacheable.java b/utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/Cacheable.java
similarity index 99%
rename from web/src/main/java/de/halbekunst/fotos/web/interceptors/Cacheable.java
rename to utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/Cacheable.java
index 7cbb9433..c9f43d85 100644
--- a/web/src/main/java/de/halbekunst/fotos/web/interceptors/Cacheable.java
+++ b/utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/Cacheable.java
@@ -1,4 +1,4 @@
-package de.halbekunst.fotos.web.interceptors;
+package de.halbekunst.utils.cachecontrol;
 
 
 import java.util.Map;
diff --git a/utils/pom.xml b/utils/pom.xml
new file mode 100644
index 00000000..1feaad13
--- /dev/null
+++ b/utils/pom.xml
@@ -0,0 +1,21 @@
+<?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/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>de.halbekunst</groupId>
+    <artifactId>fotos</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>utils</artifactId>
+  <name>Utils</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>cachecontrol</module>
+  </modules>
+
+</project>
-- 
2.20.1