Import cleanup

4 files changed, 80 insertions, 74 deletions

diff --git a/pom.xml b/pom.xml
index 0eaf35c..02cb37f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,12 @@
-<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/xsd/maven-4.0.0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-  <groupId>cristal</groupId>

-  <artifactId>xmldb</artifactId>

-  <version>0.0.1-SNAPSHOT</version>

-  <name>cristal-xmldb</name>

-  <description>CRISTAL Module</description>

-  <build>

+<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/xsd/maven-4.0.0.xsd">

+	<modelVersion>4.0.0</modelVersion>

+	<groupId>cristal</groupId>

+	<artifactId>xmldb</artifactId>

+	<version>0.0.1-SNAPSHOT</version>

+	<name>cristal-xmldb</name>

+	<description>CRISTAL Module</description>

+	<build>

 		<resources>

 			<resource>

 				<directory>src/main/resources</directory>

@@ -23,65 +24,78 @@
 				</excludes>

 			</resource>

 		</resources>

+		<pluginManagement>

+			<plugins>

+				<plugin>

+					<artifactId>maven-compiler-plugin</artifactId>

+					<version>2.3.2</version>

+					<configuration>

+						<source>1.6</source>

+						<target>1.6</target>

+					</configuration>

+				</plugin>

+			</plugins>

+		</pluginManagement>

+

 	</build>

 	<distributionManagement>

-    <repository>

-      <id>releases</id>

-      <url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/releases</url>

-    </repository>

-    <snapshotRepository>

-      <id>snapshots</id>

-      <url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/snapshots</url>

-    </snapshotRepository>

-  </distributionManagement>

+		<repository>

+			<id>releases</id>

+			<url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/releases</url>

+		</repository>

+		<snapshotRepository>

+			<id>snapshots</id>

+			<url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/snapshots</url>

+		</snapshotRepository>

+	</distributionManagement>

 

-  <repositories>

-    <repository>

-      <id>releases</id>

-      <name>CRISTAL Nexus Release Repository</name>

-      <url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/releases</url>

-      <releases>

-        <enabled>true</enabled>

-      </releases>

-      <snapshots>

-        <enabled>false</enabled>

-      </snapshots>

-    </repository>

-    <repository>

-      <id>snapshots</id>

-      <name>CRISTAL Nexus Snapshot Repository</name>

-      <url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/snapshots</url>

-      <releases>

-        <enabled>false</enabled>

-      </releases>

-      <snapshots>

-        <enabled>true</enabled>

-      </snapshots>

-    </repository>   

-    <repository>

-      <id>public</id>

-      <name>CRISTAL Nexus Public Repository</name>

-      <url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/public</url>

-    </repository>     

-  </repositories>

-  <dependencyManagement>

-  	<dependencies>

-  		<dependency>

-  			<groupId>cristal</groupId>

-  			<artifactId>cristal-kernel</artifactId>

-  			<version>2.3.3-SNAPSHOT</version>

-  		</dependency>

-  		</dependencies>

-  </dependencyManagement>

-  <dependencies>

-  	<dependency>

-  		<groupId>cristal</groupId>

-  		<artifactId>cristal-kernel</artifactId>

-  	</dependency>

-  	<dependency>

-  		<groupId>org.exist-db</groupId>

-  		<artifactId>exist</artifactId>

-  		<version>1.4.3</version>

-  	</dependency>

-  </dependencies>

+	<repositories>

+		<repository>

+			<id>releases</id>

+			<name>CRISTAL Nexus Release Repository</name>

+			<url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/releases</url>

+			<releases>

+				<enabled>true</enabled>

+			</releases>

+			<snapshots>

+				<enabled>false</enabled>

+			</snapshots>

+		</repository>

+		<repository>

+			<id>snapshots</id>

+			<name>CRISTAL Nexus Snapshot Repository</name>

+			<url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/snapshots</url>

+			<releases>

+				<enabled>false</enabled>

+			</releases>

+			<snapshots>

+				<enabled>true</enabled>

+			</snapshots>

+		</repository>

+		<repository>

+			<id>public</id>

+			<name>CRISTAL Nexus Public Repository</name>

+			<url>http://cristal.cccs.uwe.ac.uk:8081/nexus/content/repositories/public</url>

+		</repository>

+	</repositories>

+	<dependencyManagement>

+		<dependencies>

+			<dependency>

+				<groupId>cristal</groupId>

+				<artifactId>cristal-kernel</artifactId>

+				<version>2.3.3-SNAPSHOT</version>

+			</dependency>

+		</dependencies>

+	</dependencyManagement>

+	<dependencies>

+		<dependency>

+			<groupId>cristal</groupId>

+			<artifactId>cristal-kernel</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>org.exist-db</groupId>

+			<artifactId>exist</artifactId>

+			<version>1.4.3</version>

+		</dependency>

+	</dependencies>

 </project>
\ No newline at end of file
diff --git a/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java b/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java
index 157f7c6..2aefe97 100644
--- a/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java
+++ b/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java
@@ -21,15 +21,12 @@
 package com.c2kernel.persistency;

 

 import java.util.ArrayList;

-import java.util.HashMap;

 

-import org.exist.xmldb.DatabaseInstanceManager;

 import org.xmldb.api.DatabaseManager;

 import org.xmldb.api.base.Collection;

 import org.xmldb.api.base.Database;

 import org.xmldb.api.base.ErrorCodes;

 import org.xmldb.api.base.Resource;

-import org.xmldb.api.base.Service;

 import org.xmldb.api.base.XMLDBException;

 import org.xmldb.api.modules.CollectionManagementService;

 

diff --git a/src/main/java/com/c2kernel/persistency/XMLDBSyskeyTypeClusterStorage.java b/src/main/java/com/c2kernel/persistency/XMLDBSyskeyTypeClusterStorage.java
index 8e02468..39c5d38 100644
--- a/src/main/java/com/c2kernel/persistency/XMLDBSyskeyTypeClusterStorage.java
+++ b/src/main/java/com/c2kernel/persistency/XMLDBSyskeyTypeClusterStorage.java
@@ -21,15 +21,12 @@
 package com.c2kernel.persistency;

 

 import java.util.ArrayList;

-import java.util.HashMap;

 

-import org.exist.xmldb.DatabaseInstanceManager;

 import org.xmldb.api.DatabaseManager;

 import org.xmldb.api.base.Collection;

 import org.xmldb.api.base.Database;

 import org.xmldb.api.base.ErrorCodes;

 import org.xmldb.api.base.Resource;

-import org.xmldb.api.base.Service;

 import org.xmldb.api.base.XMLDBException;

 import org.xmldb.api.modules.CollectionManagementService;

 

diff --git a/src/main/java/com/c2kernel/persistency/XMLDBTypeSyskeyCollClusterStorage.java b/src/main/java/com/c2kernel/persistency/XMLDBTypeSyskeyCollClusterStorage.java
index 7d625f8..841d45e 100644
--- a/src/main/java/com/c2kernel/persistency/XMLDBTypeSyskeyCollClusterStorage.java
+++ b/src/main/java/com/c2kernel/persistency/XMLDBTypeSyskeyCollClusterStorage.java
@@ -23,13 +23,11 @@ package com.c2kernel.persistency;
 import java.util.ArrayList;

 import java.util.HashMap;

 

-import org.exist.xmldb.DatabaseInstanceManager;

 import org.xmldb.api.DatabaseManager;

 import org.xmldb.api.base.Collection;

 import org.xmldb.api.base.Database;

 import org.xmldb.api.base.ErrorCodes;

 import org.xmldb.api.base.Resource;

-import org.xmldb.api.base.Service;

 import org.xmldb.api.base.XMLDBException;

 import org.xmldb.api.modules.CollectionManagementService;