From f3ec05942f7f5cbf3417bf71b5727b9007739bfd Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@coolibri.de>
Date: Thu, 23 Jun 2011 20:05:46 +0200
Subject: [PATCH] =?utf8?q?Unterprojekt=20Utils=20von=20Fotos=20in=20eigens?=
 =?utf8?q?t=C3=A4ndiges=20Projekt=20Juplo=20verwandelt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 {utils/cachecontrol => cachecontrol}/pom.xml  |  4 ++--
 .../cachecontrol/CacheControlInterceptor.java |  2 +-
 .../juplo}/cachecontrol/Cacheable.java        |  2 +-
 pom.xml                                       |  6 +++---
 utils/pom.xml                                 | 21 -------------------
 5 files changed, 7 insertions(+), 28 deletions(-)
 rename {utils/cachecontrol => cachecontrol}/pom.xml (92%)
 rename {utils/cachecontrol/src/main/java/de/halbekunst/utils => cachecontrol/src/main/java/de/halbekunst/juplo}/cachecontrol/CacheControlInterceptor.java (99%)
 rename {utils/cachecontrol/src/main/java/de/halbekunst/utils => cachecontrol/src/main/java/de/halbekunst/juplo}/cachecontrol/Cacheable.java (99%)
 delete mode 100644 utils/pom.xml

diff --git a/utils/cachecontrol/pom.xml b/cachecontrol/pom.xml
similarity index 92%
rename from utils/cachecontrol/pom.xml
rename to cachecontrol/pom.xml
index ea6d6da1..f7863064 100644
--- a/utils/cachecontrol/pom.xml
+++ b/cachecontrol/pom.xml
@@ -6,12 +6,12 @@
 
   <parent>
     <groupId>de.halbekunst</groupId>
-    <artifactId>utils</artifactId>
+    <artifactId>juplo</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>${pom.parent.artifactId}-cachecontrol</artifactId>
-  <name>Utils - CacheControl</name>
+  <name>Juplo - CacheControl</name>
 
   <dependencies>
     <dependency>
diff --git a/utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/CacheControlInterceptor.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
similarity index 99%
rename from utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/CacheControlInterceptor.java
rename to cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
index 088e775c..aeda87a6 100644
--- a/utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/CacheControlInterceptor.java
+++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
@@ -1,4 +1,4 @@
-package de.halbekunst.utils.cachecontrol;
+package de.halbekunst.juplo.cachecontrol;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/Cacheable.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/Cacheable.java
similarity index 99%
rename from utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/Cacheable.java
rename to cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/Cacheable.java
index c24e79fc..75ac1102 100644
--- a/utils/cachecontrol/src/main/java/de/halbekunst/utils/cachecontrol/Cacheable.java
+++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/Cacheable.java
@@ -1,4 +1,4 @@
-package de.halbekunst.utils.cachecontrol;
+package de.halbekunst.juplo.cachecontrol;
 
 
 import java.util.Map;
diff --git a/pom.xml b/pom.xml
index 7fa47c45..4913a0ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>de.halbekunst</groupId>
-  <artifactId>fotos</artifactId>
+  <artifactId>juplo</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <name>Fotos</name>
+  <name>Juplo</name>
   <packaging>pom</packaging>
   <url>http://www.halbekunst.de</url>
 
@@ -24,7 +24,7 @@
   </developers>
 
   <modules>
-    <module>utils</module>
+    <module>cachecontrol</module>
   </modules>
 
   <properties>
diff --git a/utils/pom.xml b/utils/pom.xml
deleted file mode 100644
index 1feaad13..00000000
--- a/utils/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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