From: Stefan Bund <stefan@j32.de>
Date: Wed, 29 Sep 2010 19:12:31 +0000 (+0200)
Subject: Rename pimstuff -> jpim and move to Maven
X-Git-Url: http://g0dil.de/git?p=jpim.git;a=commitdiff_plain;h=4c31953ffe274db62393de67740de5df70b06d33

Rename pimstuff -> jpim and move to Maven
---

diff --git a/.gitignore b/.gitignore
index c91a3a5..5379b2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/bin/
 /config.xml
-*.class
+/target/
diff --git a/build.xml b/build.xml
deleted file mode 100644
index ecc9433..0000000
--- a/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="PIMStuff" default="build" basedir=".">
-
-	<property name="src" location="src" />
-	<property name="build" location="bin" />
-	<property name="main" value="de.j32.pimstuff.Main" />
-	<property name="lib" value="libs" />
-	<property name="test" value="tests" />
-
-	<target name="makedirs">
-		<mkdir dir="${build}" />
-	</target>
-
-	<path id="classpath">
-		<fileset dir="${lib}">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<fileset id="tests" dir="${test}">
-		<include name="**/*.java" />
-	</fileset>
-
-	<target name="build" depends="makedirs" description="Compile project to ${build} directory">
-		<javac srcdir="${src}" destdir="${build}" classpathref="classpath" />
-	</target>
-
-	<target name="clean" description="Clean up ${build} directory">
-		<delete>
-			<fileset dir="${build}" />
-		</delete>
-	</target>
-
-	<target name="run" depends="build" description="Start main class">
-		<java fork="true" classpath="${build}" classpathref="classpath" classname="${main}" />
-	</target>
-
-	<target name="build-tests" depends="build">
-		<javac srcdir="${test}" destdir="${build}" classpath="${build}" classpathref="classpath" />
-	</target>
-
-	<target name="test" depends="build-tests" description="Run JUnit tests">
-		<junit fork="true" printsummary="withOutAndErr" haltonerror="true">
-			<classpath>
-				<path refid="classpath" />
-				<pathelement path="${build}" />
-				<pathelement path="${test}" />
-			</classpath>
-			<batchtest>
-				<fileset refid="tests" />
-			</batchtest>
-		</junit>
-	</target>
-
-</project>
diff --git a/conduits.xml b/conduits.xml
index 49ad034..3cadccf 100644
--- a/conduits.xml
+++ b/conduits.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-	<bean class="de.j32.pimstuff.conduit.FritzAddressbookConduit"
+	<bean class="de.j32.jpim.conduit.FritzAddressbookConduit"
 		name="fritzbox" scope="prototype">
 	</bean>
 
diff --git a/libs/README.txt b/libs/README.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/commons-logging b/libs/commons-logging
deleted file mode 160000
index 6fb36bd..0000000
--- a/libs/commons-logging
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6fb36bd41f967baf1e314ffbcb3af81a0799258d
diff --git a/libs/junit b/libs/junit
deleted file mode 160000
index f728fcc..0000000
--- a/libs/junit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f728fccc23a159c0cd9037c5cfd779b726880afd
diff --git a/libs/spring b/libs/spring
deleted file mode 160000
index 51cae33..0000000
--- a/libs/spring
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51cae333d72082426093c9dd91ff4d2c4e1ef813
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..3bbffae
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,106 @@
+<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>
+  <groupId>de.j32.jpim</groupId>
+  <artifactId>jpim</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>jpim</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+	<groupId>commons-dbcp</groupId>
+	<artifactId>commons-dbcp</artifactId>
+	<version>1.4</version>
+    </dependency>
+    <dependency>
+	<groupId>hsqldb</groupId>
+	<artifactId>hsqldb</artifactId>
+	<version>1.8.0.10</version>
+    </dependency>
+    <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring</artifactId>
+	<version>2.5.6</version>
+    </dependency>
+    <dependency>
+	<groupId>org.hibernate</groupId>
+	<artifactId>hibernate</artifactId>
+	<version>3.1.3</version>
+    </dependency>
+    <dependency>
+	<groupId>javax.transaction</groupId>
+	<artifactId>jta</artifactId>
+	<version>1.1</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-compiler-plugin</artifactId>
+	<configuration>
+	  <source>1.6</source>
+	  <target>1.6</target>
+	</configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+	<configuration>
+	  <executable>java</executable>
+	  <arguments>
+	    <argument>-classpath</argument>
+	    <classpath/>
+	    <argument>de.j32.jpim.Main</argument>
+	  </arguments>
+	</configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/libs</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+	  <archive>
+	    <manifest>
+	      <addClasspath>true</addClasspath>
+	      <classpathPrefix>libs</classpathPrefix>
+	      <mainClass>de.j32.jpim.Main</mainClass>
+	    </manifest>
+	  </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/de/j32/avmfritz/FritzBox.java b/src/main/java/de/j32/avmfritz/FritzBox.java
similarity index 100%
rename from src/de/j32/avmfritz/FritzBox.java
rename to src/main/java/de/j32/avmfritz/FritzBox.java
diff --git a/src/de/j32/avmfritz/LoginXML.java b/src/main/java/de/j32/avmfritz/LoginXML.java
similarity index 100%
rename from src/de/j32/avmfritz/LoginXML.java
rename to src/main/java/de/j32/avmfritz/LoginXML.java
diff --git a/src/de/j32/httplib/HttpGETRequest.java b/src/main/java/de/j32/httplib/HttpGETRequest.java
similarity index 100%
rename from src/de/j32/httplib/HttpGETRequest.java
rename to src/main/java/de/j32/httplib/HttpGETRequest.java
diff --git a/src/de/j32/httplib/HttpPOSTRequest.java b/src/main/java/de/j32/httplib/HttpPOSTRequest.java
similarity index 100%
rename from src/de/j32/httplib/HttpPOSTRequest.java
rename to src/main/java/de/j32/httplib/HttpPOSTRequest.java
diff --git a/src/de/j32/httplib/HttpRequest.java b/src/main/java/de/j32/httplib/HttpRequest.java
similarity index 100%
rename from src/de/j32/httplib/HttpRequest.java
rename to src/main/java/de/j32/httplib/HttpRequest.java
diff --git a/src/de/j32/httplib/HttpResponse.java b/src/main/java/de/j32/httplib/HttpResponse.java
similarity index 100%
rename from src/de/j32/httplib/HttpResponse.java
rename to src/main/java/de/j32/httplib/HttpResponse.java
diff --git a/src/de/j32/pimstuff/Data.java b/src/main/java/de/j32/jpim/Data.java
similarity index 75%
rename from src/de/j32/pimstuff/Data.java
rename to src/main/java/de/j32/jpim/Data.java
index 5df5e94..6a53e89 100644
--- a/src/de/j32/pimstuff/Data.java
+++ b/src/main/java/de/j32/jpim/Data.java
@@ -1,20 +1,20 @@
-package de.j32.pimstuff;
+package de.j32.jpim;
 
 import java.io.IOException;
 
-import de.j32.pimstuff.conduit.Conduit;
-import de.j32.pimstuff.conduit.ConduitException;
-import de.j32.pimstuff.conduit.Exporter;
-import de.j32.pimstuff.conduit.Importer;
-import de.j32.pimstuff.data.EntryConsumer;
-import de.j32.pimstuff.data.EntryProducer;
+import de.j32.jpim.conduit.Conduit;
+import de.j32.jpim.conduit.ConduitException;
+import de.j32.jpim.conduit.Exporter;
+import de.j32.jpim.conduit.Importer;
+import de.j32.jpim.data.EntryConsumer;
+import de.j32.jpim.data.EntryProducer;
 import de.j32.util.Util;
 
 public class Data
 {
     public static void transfer(EntryProducer producer, EntryConsumer consumer)
     {
-        // TODO: It would be more 'beautoful' to have the EntryProducer be an
+        // TODO: It would be more 'beautiful' to have the EntryProducer be an
         // Iterable, but this is simpler ...
         producer.sendTo(consumer);
     }
diff --git a/src/de/j32/pimstuff/Main.java b/src/main/java/de/j32/jpim/Main.java
similarity index 71%
rename from src/de/j32/pimstuff/Main.java
rename to src/main/java/de/j32/jpim/Main.java
index 6214c7f..18d31bf 100644
--- a/src/de/j32/pimstuff/Main.java
+++ b/src/main/java/de/j32/jpim/Main.java
@@ -1,11 +1,11 @@
-package de.j32.pimstuff;
+package de.j32.jpim;
 
 import java.io.IOException;
 
-import de.j32.pimstuff.conduit.Conduit;
-import de.j32.pimstuff.conduit.ConduitException;
-import de.j32.pimstuff.conduit.Registry;
-import de.j32.pimstuff.data.Addressbook;
+import de.j32.jpim.conduit.Conduit;
+import de.j32.jpim.conduit.ConduitException;
+import de.j32.jpim.conduit.Registry;
+import de.j32.jpim.data.Addressbook;
 
 public class Main
 {
diff --git a/src/de/j32/pimstuff/conduit/Conduit.java b/src/main/java/de/j32/jpim/conduit/Conduit.java
similarity index 81%
rename from src/de/j32/pimstuff/conduit/Conduit.java
rename to src/main/java/de/j32/jpim/conduit/Conduit.java
index 43dd734..22b6924 100644
--- a/src/de/j32/pimstuff/conduit/Conduit.java
+++ b/src/main/java/de/j32/jpim/conduit/Conduit.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 public interface Conduit
 {
diff --git a/src/de/j32/pimstuff/conduit/ConduitException.java b/src/main/java/de/j32/jpim/conduit/ConduitException.java
similarity index 90%
rename from src/de/j32/pimstuff/conduit/ConduitException.java
rename to src/main/java/de/j32/jpim/conduit/ConduitException.java
index b1bd4d3..5e7cfc6 100644
--- a/src/de/j32/pimstuff/conduit/ConduitException.java
+++ b/src/main/java/de/j32/jpim/conduit/ConduitException.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 public class ConduitException extends Exception
 {
diff --git a/src/de/j32/pimstuff/conduit/Config.java b/src/main/java/de/j32/jpim/conduit/Config.java
similarity index 97%
rename from src/de/j32/pimstuff/conduit/Config.java
rename to src/main/java/de/j32/jpim/conduit/Config.java
index 4af9b6c..5b5ce79 100644
--- a/src/de/j32/pimstuff/conduit/Config.java
+++ b/src/main/java/de/j32/jpim/conduit/Config.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/src/de/j32/pimstuff/conduit/ConfigurationException.java b/src/main/java/de/j32/jpim/conduit/ConfigurationException.java
similarity index 85%
rename from src/de/j32/pimstuff/conduit/ConfigurationException.java
rename to src/main/java/de/j32/jpim/conduit/ConfigurationException.java
index 217082f..f93f03f 100644
--- a/src/de/j32/pimstuff/conduit/ConfigurationException.java
+++ b/src/main/java/de/j32/jpim/conduit/ConfigurationException.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 public class ConfigurationException extends RuntimeException
 {
diff --git a/src/de/j32/pimstuff/conduit/Exporter.java b/src/main/java/de/j32/jpim/conduit/Exporter.java
similarity index 54%
rename from src/de/j32/pimstuff/conduit/Exporter.java
rename to src/main/java/de/j32/jpim/conduit/Exporter.java
index 9eee042..06a997f 100644
--- a/src/de/j32/pimstuff/conduit/Exporter.java
+++ b/src/main/java/de/j32/jpim/conduit/Exporter.java
@@ -1,8 +1,8 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 import java.io.Closeable;
 
-import de.j32.pimstuff.data.EntryConsumer;
+import de.j32.jpim.data.EntryConsumer;
 
 public interface Exporter extends Closeable, EntryConsumer
 {}
diff --git a/src/de/j32/pimstuff/conduit/FritzAddressbookConduit.java b/src/main/java/de/j32/jpim/conduit/FritzAddressbookConduit.java
similarity index 98%
rename from src/de/j32/pimstuff/conduit/FritzAddressbookConduit.java
rename to src/main/java/de/j32/jpim/conduit/FritzAddressbookConduit.java
index 32a389a..9a39a1c 100644
--- a/src/de/j32/pimstuff/conduit/FritzAddressbookConduit.java
+++ b/src/main/java/de/j32/jpim/conduit/FritzAddressbookConduit.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/de/j32/pimstuff/conduit/FritzAddressbookExporter.java b/src/main/java/de/j32/jpim/conduit/FritzAddressbookExporter.java
similarity index 96%
rename from src/de/j32/pimstuff/conduit/FritzAddressbookExporter.java
rename to src/main/java/de/j32/jpim/conduit/FritzAddressbookExporter.java
index 066585a..fe49183 100644
--- a/src/de/j32/pimstuff/conduit/FritzAddressbookExporter.java
+++ b/src/main/java/de/j32/jpim/conduit/FritzAddressbookExporter.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -6,8 +6,8 @@ import java.io.UnsupportedEncodingException;
 
 import org.xml.sax.SAXException;
 
-import de.j32.pimstuff.data.Attribute;
-import de.j32.pimstuff.data.Entry;
+import de.j32.jpim.data.Attribute;
+import de.j32.jpim.data.Entry;
 import de.j32.util.SimpleXmlGenerator;
 import de.j32.util.Util;
 
diff --git a/src/de/j32/pimstuff/conduit/FritzAddressbookImporter.java b/src/main/java/de/j32/jpim/conduit/FritzAddressbookImporter.java
similarity index 95%
rename from src/de/j32/pimstuff/conduit/FritzAddressbookImporter.java
rename to src/main/java/de/j32/jpim/conduit/FritzAddressbookImporter.java
index 82c61d7..c24f86a 100644
--- a/src/de/j32/pimstuff/conduit/FritzAddressbookImporter.java
+++ b/src/main/java/de/j32/jpim/conduit/FritzAddressbookImporter.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -7,8 +7,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-import de.j32.pimstuff.data.Entry;
-import de.j32.pimstuff.data.EntryConsumer;
+import de.j32.jpim.data.Entry;
+import de.j32.jpim.data.EntryConsumer;
 import de.j32.util.XmlUtil;
 
 public class FritzAddressbookImporter implements Importer
diff --git a/src/de/j32/pimstuff/conduit/Importer.java b/src/main/java/de/j32/jpim/conduit/Importer.java
similarity index 54%
rename from src/de/j32/pimstuff/conduit/Importer.java
rename to src/main/java/de/j32/jpim/conduit/Importer.java
index 66a4727..40d4ff2 100644
--- a/src/de/j32/pimstuff/conduit/Importer.java
+++ b/src/main/java/de/j32/jpim/conduit/Importer.java
@@ -1,8 +1,8 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 import java.io.Closeable;
 
-import de.j32.pimstuff.data.EntryProducer;
+import de.j32.jpim.data.EntryProducer;
 
 public interface Importer extends Closeable, EntryProducer
 {}
diff --git a/src/de/j32/pimstuff/conduit/Registry.java b/src/main/java/de/j32/jpim/conduit/Registry.java
similarity index 78%
rename from src/de/j32/pimstuff/conduit/Registry.java
rename to src/main/java/de/j32/jpim/conduit/Registry.java
index d373601..c0e74f5 100644
--- a/src/de/j32/pimstuff/conduit/Registry.java
+++ b/src/main/java/de/j32/jpim/conduit/Registry.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.conduit;
+package de.j32.jpim.conduit;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
@@ -10,7 +10,7 @@ public class Registry
 
     public static Conduit get(String k)
     {
-        return context_.getBean(k, Conduit.class);
+        return (Conduit) context_.getBean(k, Conduit.class);
     }
 
 }
diff --git a/src/de/j32/pimstuff/data/Addressbook.java b/src/main/java/de/j32/jpim/data/Addressbook.java
similarity index 95%
rename from src/de/j32/pimstuff/data/Addressbook.java
rename to src/main/java/de/j32/jpim/data/Addressbook.java
index 9e31ea1..46a003f 100644
--- a/src/de/j32/pimstuff/data/Addressbook.java
+++ b/src/main/java/de/j32/jpim/data/Addressbook.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.data;
+package de.j32.jpim.data;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/de/j32/pimstuff/data/Attribute.java b/src/main/java/de/j32/jpim/data/Attribute.java
similarity index 90%
rename from src/de/j32/pimstuff/data/Attribute.java
rename to src/main/java/de/j32/jpim/data/Attribute.java
index 7153973..ce4c7ad 100644
--- a/src/de/j32/pimstuff/data/Attribute.java
+++ b/src/main/java/de/j32/jpim/data/Attribute.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.data;
+package de.j32.jpim.data;
 
 public class Attribute
 {
diff --git a/src/de/j32/pimstuff/data/Entry.java b/src/main/java/de/j32/jpim/data/Entry.java
similarity index 98%
rename from src/de/j32/pimstuff/data/Entry.java
rename to src/main/java/de/j32/jpim/data/Entry.java
index 9f96731..5eda18a 100644
--- a/src/de/j32/pimstuff/data/Entry.java
+++ b/src/main/java/de/j32/jpim/data/Entry.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.data;
+package de.j32.jpim.data;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/de/j32/pimstuff/data/EntryConsumer.java b/src/main/java/de/j32/jpim/data/EntryConsumer.java
similarity index 71%
rename from src/de/j32/pimstuff/data/EntryConsumer.java
rename to src/main/java/de/j32/jpim/data/EntryConsumer.java
index e393863..b124705 100644
--- a/src/de/j32/pimstuff/data/EntryConsumer.java
+++ b/src/main/java/de/j32/jpim/data/EntryConsumer.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.data;
+package de.j32.jpim.data;
 
 public interface EntryConsumer
 {
diff --git a/src/de/j32/pimstuff/data/EntryProducer.java b/src/main/java/de/j32/jpim/data/EntryProducer.java
similarity index 73%
rename from src/de/j32/pimstuff/data/EntryProducer.java
rename to src/main/java/de/j32/jpim/data/EntryProducer.java
index a60a996..a4de3d7 100644
--- a/src/de/j32/pimstuff/data/EntryProducer.java
+++ b/src/main/java/de/j32/jpim/data/EntryProducer.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.data;
+package de.j32.jpim.data;
 
 public interface EntryProducer
 {
diff --git a/src/de/j32/util/Filter.java b/src/main/java/de/j32/util/Filter.java
similarity index 100%
rename from src/de/j32/util/Filter.java
rename to src/main/java/de/j32/util/Filter.java
diff --git a/src/de/j32/util/FilteredIterator.java b/src/main/java/de/j32/util/FilteredIterator.java
similarity index 100%
rename from src/de/j32/util/FilteredIterator.java
rename to src/main/java/de/j32/util/FilteredIterator.java
diff --git a/src/de/j32/util/SimpleXmlGenerator.java b/src/main/java/de/j32/util/SimpleXmlGenerator.java
similarity index 100%
rename from src/de/j32/util/SimpleXmlGenerator.java
rename to src/main/java/de/j32/util/SimpleXmlGenerator.java
diff --git a/src/de/j32/util/Util.java b/src/main/java/de/j32/util/Util.java
similarity index 100%
rename from src/de/j32/util/Util.java
rename to src/main/java/de/j32/util/Util.java
diff --git a/src/de/j32/util/XmlUtil.java b/src/main/java/de/j32/util/XmlUtil.java
similarity index 100%
rename from src/de/j32/util/XmlUtil.java
rename to src/main/java/de/j32/util/XmlUtil.java
diff --git a/tests/de/j32/pimstuff/data/AddressbookTest.java b/src/test/java/de/j32/jpim/data/AddressbookTest.java
similarity index 94%
rename from tests/de/j32/pimstuff/data/AddressbookTest.java
rename to src/test/java/de/j32/jpim/data/AddressbookTest.java
index 8dd68d8..f024bb4 100644
--- a/tests/de/j32/pimstuff/data/AddressbookTest.java
+++ b/src/test/java/de/j32/jpim/data/AddressbookTest.java
@@ -1,4 +1,4 @@
-package de.j32.pimstuff.data;
+package de.j32.jpim.data;
 
 import static org.junit.Assert.assertEquals;
 
@@ -6,6 +6,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import de.j32.jpim.data.Addressbook;
+import de.j32.jpim.data.Attribute;
+import de.j32.jpim.data.Entry;
+import de.j32.jpim.data.EntryConsumer;
 import de.j32.util.Util;
 
 public class AddressbookTest