Repackage to org.cristalise

3 files changed, 33 insertions, 28 deletions

diff --git a/pom.xml b/pom.xml
index 66f21fa..3d5d03b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,9 @@
 <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>cristal-xmldb</artifactId>
+	<groupId>org.cristalise</groupId>
+	<artifactId>cristalise-xmldb</artifactId>
 	<version>1.0-SNAPSHOT</version>
-	<name>cristal-xmldb</name>
+	<name>cristalise-xmldb</name>
 	<description>CRISTAL Module</description>
 	<issueManagement>
 		<url>http://dev.cccs.uwe.ac.uk/redmine/projects/cristal-xmldb/</url>
@@ -32,7 +32,7 @@
 			</resource>
 			<resource>
 				<directory>src/main/resources</directory>
-				<targetPath>com/c2kernel/persistency/xmldb/resources</targetPath>
+				<targetPath>org/cristalise/storage/xmldb/resources</targetPath>
 				<excludes>
 					<exclude>module.xml</exclude>
 				</excludes>
@@ -111,20 +111,25 @@
 			<name>CCCS Nexus Public Repository</name>
 			<url>http://dev.cccs.uwe.ac.uk:8081/nexus/content/repositories/public</url>
 		</repository>
+		<repository>
+			<id>cccs.eXistDB-clone</id>
+			<name>eXist XMLDB repository clone</name>
+			<url>http://dev.cccs.uwe.ac.uk:8081/nexus/content/sites/eXistDB-clone/</url>
+		</repository>
 	</repositories>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>cristal</groupId>
-				<artifactId>cristal-kernel</artifactId>
+				<groupId>org.cristalise</groupId>
+				<artifactId>cristalise-kernel</artifactId>
 				<version>3.0-SNAPSHOT</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
 		<dependency>
-			<groupId>cristal</groupId>
-			<artifactId>cristal-kernel</artifactId>
+			<groupId>org.cristalise</groupId>
+			<artifactId>cristalise-kernel</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.exist-db</groupId>
diff --git a/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java b/src/main/java/org/cristalise/storage/XMLDBClusterStorage.java
index b136ab4..2919366 100644
--- a/src/main/java/com/c2kernel/persistency/XMLDBClusterStorage.java
+++ b/src/main/java/org/cristalise/storage/XMLDBClusterStorage.java
@@ -1,11 +1,11 @@
-package com.c2kernel.persistency;

+package org.cristalise.storage;

 

 /**

  * Provided for easier loading (may be referenced without package in ClusterStorage property)

  * @author abranson

  *

  */

-public class XMLDBClusterStorage extends com.c2kernel.persistency.xmldb.XMLDBClusterStorage {

+public class XMLDBClusterStorage extends org.cristalise.storage.xmldb.XMLDBClusterStorage {

 	

 	public XMLDBClusterStorage() throws Exception {

 		super();

diff --git a/src/main/java/com/c2kernel/persistency/xmldb/XMLDBClusterStorage.java b/src/main/java/org/cristalise/storage/xmldb/XMLDBClusterStorage.java
index 8e77f22..a274b4e 100644
--- a/src/main/java/com/c2kernel/persistency/xmldb/XMLDBClusterStorage.java
+++ b/src/main/java/org/cristalise/storage/xmldb/XMLDBClusterStorage.java
@@ -1,9 +1,17 @@
-package com.c2kernel.persistency.xmldb;

+package org.cristalise.storage.xmldb;

 

 import java.io.UnsupportedEncodingException;

 import java.net.URLDecoder;

 import java.util.ArrayList;

 

+import org.cristalise.kernel.common.PersistencyException;

+import org.cristalise.kernel.entity.C2KLocalObject;

+import org.cristalise.kernel.lookup.ItemPath;

+import org.cristalise.kernel.persistency.ClusterStorage;

+import org.cristalise.kernel.persistency.outcome.Outcome;

+import org.cristalise.kernel.process.Gateway;

+import org.cristalise.kernel.process.auth.Authenticator;

+import org.cristalise.kernel.utils.Logger;

 import org.xmldb.api.DatabaseManager;

 import org.xmldb.api.base.Collection;

 import org.xmldb.api.base.Database;

@@ -12,14 +20,6 @@ import org.xmldb.api.base.Resource;
 import org.xmldb.api.base.XMLDBException;

 import org.xmldb.api.modules.CollectionManagementService;

 

-import com.c2kernel.common.PersistencyException;

-import com.c2kernel.entity.C2KLocalObject;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.persistency.outcome.Outcome;

-import com.c2kernel.process.Gateway;

-import com.c2kernel.process.auth.Authenticator;

-import com.c2kernel.utils.Logger;

 

 public class XMLDBClusterStorage extends ClusterStorage {

 

@@ -62,7 +62,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#open()

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#open()

 	 */

 	@Override

 	public void open(Authenticator auth) throws PersistencyException {

@@ -96,7 +96,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#close()

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#close()

 	 */

 	@Override

 	public void close() throws PersistencyException {

@@ -113,7 +113,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#queryClusterSupport(java.lang.String)

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#queryClusterSupport(java.lang.String)

 	 */

 	@Override

 	public short queryClusterSupport(String clusterType) {

@@ -121,7 +121,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#getName()

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#getName()

 	 */

 	@Override

 	public String getName() {

@@ -129,7 +129,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#getId()

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#getId()

 	 */

 	@Override

 	public String getId() {

@@ -137,7 +137,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#get(java.lang.Integer, java.lang.String)

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#get(java.lang.Integer, java.lang.String)

 	 */

 	@Override

 	public C2KLocalObject get(ItemPath itemPath, String path)

@@ -170,7 +170,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#put(java.lang.Integer, com.c2kernel.entity.C2KLocalObject)

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#put(java.lang.Integer, org.cristalise.kernel.entity.C2KLocalObject)

 	 */

 	@Override

 	public void put(ItemPath itemPath, C2KLocalObject obj)

@@ -196,7 +196,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#delete(java.lang.Integer, java.lang.String)

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#delete(java.lang.Integer, java.lang.String)

 	 */

 	@Override

 	public void delete(ItemPath itemPath, String path)

@@ -218,7 +218,7 @@ public class XMLDBClusterStorage extends ClusterStorage {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.persistency.ClusterStorage#getClusterContents(java.lang.Integer, java.lang.String)

+	 * @see org.cristalise.kernel.persistency.ClusterStorage#getClusterContents(java.lang.Integer, java.lang.String)

 	 */

 	@Override

 	public String[] getClusterContents(ItemPath itemPath, String path)