Repackage to org.cristalise

12 files changed, 82 insertions, 76 deletions

diff --git a/pom.xml b/pom.xml
index 6853210..d2b42a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,10 @@
 <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-ldap</artifactId>

-	<version>1.0-SNAPSHOT</version>

-	<name>cristal-ldap</name>

+	<groupId>org.cristalise</groupId>

+	<artifactId>cristalise-ldap</artifactId>

+	<version>3.0-SNAPSHOT</version>

+	<name>cristalise-ldap</name>

 	<description>CRISTAL Module</description>

 	<properties>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

@@ -21,7 +21,7 @@
 			</resource>

 			<resource>

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

-				<targetPath>com/c2kernel/lookup/ldap/resources</targetPath>

+				<targetPath>org/cristalise/lookup/ldap/resources</targetPath>

 				<excludes>

 					<exclude>module.xml</exclude>

 				</excludes>

@@ -81,8 +81,8 @@
 	<dependencyManagement>

 		<dependencies>

 			<dependency>

-				<groupId>cristal</groupId>

-				<artifactId>cristal-kernel</artifactId>

+				<groupId>org.cristalise</groupId>

+				<artifactId>cristalise-kernel</artifactId>

 				<version>3.0-SNAPSHOT</version>

 			</dependency>

 			<dependency>

@@ -94,8 +94,8 @@
 	</dependencyManagement>

 	<dependencies>

 		<dependency>

-			<groupId>cristal</groupId>

-			<artifactId>cristal-kernel</artifactId>

+			<groupId>org.cristalise</groupId>

+			<artifactId>cristalise-kernel</artifactId>

 		</dependency>

 		<dependency>

 			<groupId>com.novell.ldap</groupId>

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java b/src/main/java/org/cristalise/lookup/ldap/LDAPAuthManager.java
index 5e6d5ad..0dfa010 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java
+++ b/src/main/java/org/cristalise/lookup/ldap/LDAPAuthManager.java
@@ -1,10 +1,11 @@
-package com.c2kernel.lookup.ldap;

+package org.cristalise.lookup.ldap;

+

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

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

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

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

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

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.process.Gateway;

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

-import com.c2kernel.utils.Logger;

 import com.novell.ldap.LDAPConnection;

 import com.novell.ldap.LDAPException;

 

@@ -63,7 +64,7 @@ public class LDAPAuthManager implements Authenticator {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.process.auth.Authenticator#getAuthObject()

+	 * @see org.cristalise.kernel.process.auth.Authenticator#getAuthObject()

 	 */

 	@Override

 	public LDAPConnection getAuthObject() {

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPClientReader.java b/src/main/java/org/cristalise/lookup/ldap/LDAPClientReader.java
index 70bf126..fd62699 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPClientReader.java
+++ b/src/main/java/org/cristalise/lookup/ldap/LDAPClientReader.java
@@ -1,8 +1,9 @@
-package com.c2kernel.lookup.ldap;

+package org.cristalise.lookup.ldap;

+

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

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

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

 

-import com.c2kernel.common.PersistencyException;

-import com.c2kernel.entity.C2KLocalObject;

-import com.c2kernel.lookup.ItemPath;

 

 /** Allows clients to directly load properties and collections from the LDAP

 *   so no CORBA calls need to be made during normal browsing

@@ -17,7 +18,7 @@ public class LDAPClientReader extends LDAPClusterStorage {
 

 

 	/**

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

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

 	 */

 	@Override

 	public void delete(ItemPath itemPath, String path)

@@ -26,7 +27,7 @@ public class LDAPClientReader extends LDAPClusterStorage {
 	}

 

 	/**

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

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

 	 */

 	@Override

 	public String getName() {

@@ -34,7 +35,7 @@ public class LDAPClientReader extends LDAPClusterStorage {
 	}

 

 	/**

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

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

 	 */

 

 	public void put(ItemPath itemPath, String path, C2KLocalObject obj)

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPClusterStorage.java b/src/main/java/org/cristalise/lookup/ldap/LDAPClusterStorage.java
index a264fcc..7132116 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPClusterStorage.java
+++ b/src/main/java/org/cristalise/lookup/ldap/LDAPClusterStorage.java
@@ -1,17 +1,18 @@
-package com.c2kernel.lookup.ldap;

+package org.cristalise.lookup.ldap;

 import java.util.ArrayList;

 import java.util.StringTokenizer;

 

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.common.PersistencyException;

-import com.c2kernel.entity.C2KLocalObject;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.lookup.Lookup;

-import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.process.Gateway;

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

-import com.c2kernel.property.Property;

-import com.c2kernel.utils.Logger;

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

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

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

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

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

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

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

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

+import org.cristalise.kernel.property.Property;

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

+

 

 public class LDAPClusterStorage extends ClusterStorage {

     LDAPPropertyManager ldapStore;

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java b/src/main/java/org/cristalise/lookup/ldap/LDAPLookup.java
index cb4395c..d954783 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
+++ b/src/main/java/org/cristalise/lookup/ldap/LDAPLookup.java
@@ -3,32 +3,32 @@
  * author: Florida Estrella

 */

 

-package com.c2kernel.lookup.ldap;

+package org.cristalise.lookup.ldap;

 

 import java.security.NoSuchAlgorithmException;

 import java.util.ArrayList;

 import java.util.Iterator;

 import java.util.StringTokenizer;

 

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

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

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

+import org.cristalise.kernel.entity.proxy.ProxyMessage;

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

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

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

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

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

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

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

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

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

+import org.cristalise.kernel.property.Property;

+import org.cristalise.kernel.property.PropertyDescription;

+import org.cristalise.kernel.property.PropertyDescriptionList;

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

 import org.omg.CORBA.Object;

 

-import com.c2kernel.common.ObjectAlreadyExistsException;

-import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.entity.proxy.ProxyMessage;

-import com.c2kernel.lookup.AgentPath;

-import com.c2kernel.lookup.DomainPath;

-import com.c2kernel.lookup.InvalidItemPathException;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.lookup.LookupManager;

-import com.c2kernel.lookup.Path;

-import com.c2kernel.lookup.RolePath;

-import com.c2kernel.process.Gateway;

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

-import com.c2kernel.property.Property;

-import com.c2kernel.property.PropertyDescription;

-import com.c2kernel.property.PropertyDescriptionList;

-import com.c2kernel.utils.Logger;

 import com.novell.ldap.LDAPAttribute;

 import com.novell.ldap.LDAPAttributeSet;

 import com.novell.ldap.LDAPConnection;

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookupUtils.java b/src/main/java/org/cristalise/lookup/ldap/LDAPLookupUtils.java
index ad41e7a..b7b656b 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookupUtils.java
+++ b/src/main/java/org/cristalise/lookup/ldap/LDAPLookupUtils.java
@@ -2,14 +2,15 @@
  * Lookup helper class.

  */

 

-package com.c2kernel.lookup.ldap;

+package org.cristalise.lookup.ldap;

 

 //import netscape.ldap.*;

 //import netscape.ldap.util.*;

-import com.c2kernel.common.ObjectAlreadyExistsException;

-import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.utils.Logger;

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

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

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

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

+

 import com.novell.ldap.LDAPAttribute;

 import com.novell.ldap.LDAPAttributeSet;

 import com.novell.ldap.LDAPConnection;

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPPathSet.java b/src/main/java/org/cristalise/lookup/ldap/LDAPPathSet.java
index 806976d..dc82591 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPPathSet.java
+++ b/src/main/java/org/cristalise/lookup/ldap/LDAPPathSet.java
@@ -1,9 +1,10 @@
-package com.c2kernel.lookup.ldap;

+package org.cristalise.lookup.ldap;

 

 import java.util.Iterator;

 

-import com.c2kernel.lookup.Path;

-import com.c2kernel.utils.Logger;

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

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

+

 import com.novell.ldap.LDAPEntry;

 import com.novell.ldap.LDAPException;

 import com.novell.ldap.LDAPSearchResults;

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPProperties.java b/src/main/java/org/cristalise/lookup/ldap/LDAPProperties.java
index 289b206..b9f5b0f 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPProperties.java
+++ b/src/main/java/org/cristalise/lookup/ldap/LDAPProperties.java
@@ -1,4 +1,4 @@
-package com.c2kernel.lookup.ldap;

+package org.cristalise.lookup.ldap;

 

 /**

  * Directory Lookup Service

@@ -9,7 +9,8 @@ package com.c2kernel.lookup.ldap;
 

 import javax.xml.bind.DatatypeConverter;

 

-import com.c2kernel.utils.ObjectProperties;

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

+

 

 /**

  * example:

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPPropertyManager.java b/src/main/java/org/cristalise/lookup/ldap/LDAPPropertyManager.java
index 48e0a8e..83d6c6d 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPPropertyManager.java
+++ b/src/main/java/org/cristalise/lookup/ldap/LDAPPropertyManager.java
@@ -1,13 +1,14 @@
-package com.c2kernel.lookup.ldap;

+package org.cristalise.lookup.ldap;

 

 import java.util.ArrayList;

 import java.util.Enumeration;

 

-import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFoundException;

-import com.c2kernel.lookup.ItemPath;

-import com.c2kernel.property.Property;

-import com.c2kernel.utils.Logger;

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

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

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

+import org.cristalise.kernel.property.Property;

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

+

 import com.novell.ldap.LDAPAttribute;

 import com.novell.ldap.LDAPEntry;

 

diff --git a/src/main/java/com/c2kernel/persistency/LDAPClientReader.java b/src/main/java/org/cristalise/storage/LDAPClientReader.java
index 4458ac6..df37fc4 100644
--- a/src/main/java/com/c2kernel/persistency/LDAPClientReader.java
+++ b/src/main/java/org/cristalise/storage/LDAPClientReader.java
@@ -1,4 +1,4 @@
-package com.c2kernel.persistency;

+package org.cristalise.storage;

 

 /**

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

@@ -6,7 +6,7 @@ package com.c2kernel.persistency;
  * @author abranson

  *

  */

-public class LDAPClientReader extends com.c2kernel.lookup.ldap.LDAPClientReader {

+public class LDAPClientReader extends org.cristalise.lookup.ldap.LDAPClientReader {

 

 	public LDAPClientReader() {

 		super();

diff --git a/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java b/src/main/java/org/cristalise/storage/LDAPClusterStorage.java
index 005c6e8..0b4628e 100644
--- a/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java
+++ b/src/main/java/org/cristalise/storage/LDAPClusterStorage.java
@@ -1,4 +1,4 @@
-package com.c2kernel.persistency;

+package org.cristalise.storage;

 

 /**

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

@@ -6,7 +6,7 @@ package com.c2kernel.persistency;
  * @author abranson

  *

  */

-public class LDAPClusterStorage extends com.c2kernel.lookup.ldap.LDAPClusterStorage {

+public class LDAPClusterStorage extends org.cristalise.lookup.ldap.LDAPClusterStorage {

 	

 	public LDAPClusterStorage() {

 		super();

diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index 521b145..f1b919b 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -3,9 +3,8 @@
 		<Description>LDAP Lookup, Authenticator and NextKeyManager implementations.</Description>

 		<Version>${version}</Version>

 	</Info>

-	<ResourceURL>com/c2kernel/lookup/ldap/resources/</ResourceURL>

-    <Config name="Authenticator">com.c2kernel.lookup.ldap.LDAPAuthManager</Config>

-	<Config name="Lookup">com.c2kernel.lookup.ldap.LDAPLookup</Config>

-	<Config name="NextKeyManager">com.c2kernel.lookup.ldap.LDAPNextKeyManager</Config>

+	<ResourceURL>org/cristalise/lookup/ldap/resources/</ResourceURL>

+    <Config name="Authenticator">org.cristalise.lookup.ldap.LDAPAuthManager</Config>

+	<Config name="Lookup">org.cristalise.lookup.ldap.LDAPLookup</Config>

 	<Imports/>

 </CristalModule>
\ No newline at end of file