Repackage to org.cristalise

26 files changed, 106 insertions, 102 deletions

diff --git a/bin/Cristal Dev GUI.launch b/bin/Cristal Dev GUI.launch
index 1af6038..0a4a447 100644
--- a/bin/Cristal Dev GUI.launch
+++ b/bin/Cristal Dev GUI.launch
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">

 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/cristal-dev"/>

+<listEntry value="/cristal-gui/src/main/java/org/cristalise/gui/Main.java"/>

 </listAttribute>

 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="4"/>

+<listEntry value="1"/>

 </listAttribute>

 <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>

 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">

@@ -12,7 +12,7 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

 </listAttribute>

 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.gui.Main"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.cristalise.gui.Main"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config bin/client.conf -connect bin/dev.clc"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-dev"/>

 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>

diff --git a/bin/Cristal Dev Server.launch b/bin/Cristal Dev Server.launch
index 9713dfd..ce908a3 100644
--- a/bin/Cristal Dev Server.launch
+++ b/bin/Cristal Dev Server.launch
@@ -13,8 +13,8 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>

 </listAttribute>

 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.c2kernel.process.StandardServer"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 0 -config bin/server.conf -connect bin/dev.clc"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.cristalise.kernel.process.StandardServer"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-logLevel 1 -config bin/server.conf -connect bin/dev.clc"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cristal-dev"/>

 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>

 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256m"/>

diff --git a/pom.xml b/pom.xml
index f48b188..7898751 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <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-dev</artifactId>
+	<groupId>org.cristalise</groupId>
+	<artifactId>cristalise-dev</artifactId>
 	<version>3.0-SNAPSHOT</version>
 	<name>Cristal Development Module</name>
 	<properties>
@@ -57,7 +57,7 @@
 					</defaultJvmSettings>
 					<programs>
 						<program>
-							<mainClass>com.c2kernel.process.StandardServer</mainClass>
+							<mainClass>org.cristalise.kernel.process.StandardServer</mainClass>
 							<id>cristal-server</id>
 							<commandLineArguments>
 								<commandLineArgument>-logLevel</commandLineArgument>
@@ -71,7 +71,7 @@
 							</commandLineArguments>
 						</program>					
 						<program>
-							<mainClass>com.c2kernel.gui.Main</mainClass>
+							<mainClass>org.cristalise.kernel.gui.Main</mainClass>
 							<id>cristal-gui</id>
 							<commandLineArguments>
 								<commandLineArgument>-logLevel</commandLineArgument>
@@ -85,7 +85,7 @@
 							</commandLineArguments>
 						</program>	
 						<program>
-							<mainClass>com.c2kernel.process.UserCodeProcess</mainClass>
+							<mainClass>org.cristalise.kernel.process.UserCodeProcess</mainClass>
 							<id>cristal-usercode</id>
 							<commandLineArguments>
 								<commandLineArgument>-logLevel</commandLineArgument>
@@ -172,43 +172,43 @@
   <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>
-  			<groupId>cristal</groupId>
-  			<artifactId>cristal-gui</artifactId>
+  			<groupId>org.cristalise</groupId>
+  			<artifactId>cristalise-gui</artifactId>
   			<version>3.0-SNAPSHOT</version>
   		</dependency>
   		<dependency>
-  			<groupId>cristal</groupId>
-  			<artifactId>cristal-xmldb</artifactId>
+  			<groupId>org.cristalise</groupId>
+  			<artifactId>cristalise-xmldb</artifactId>
   			<version>1.0-SNAPSHOT</version>
   		</dependency>
   		<dependency>
-  			<groupId>cristal</groupId>
-  			<artifactId>cristal-ldap</artifactId>
-  			<version>1.0-SNAPSHOT</version>
+  			<groupId>org.cristalise</groupId>
+  			<artifactId>cristalise-ldap</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>cristal</groupId>
-  		<artifactId>cristal-gui</artifactId>
+  		<groupId>org.cristalise</groupId>
+  		<artifactId>cristalise-gui</artifactId>
   	</dependency>
   	<dependency>
-  		<groupId>cristal</groupId>
-  		<artifactId>cristal-xmldb</artifactId>
+  		<groupId>org.cristalise</groupId>
+  		<artifactId>cristalise-xmldb</artifactId>
   	</dependency>
   	<dependency>
-  		<groupId>cristal</groupId>
-  		<artifactId>cristal-ldap</artifactId>
+  		<groupId>org.cristalise</groupId>
+  		<artifactId>cristalise-ldap</artifactId>
   	</dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/main/config/local.clc.example b/src/main/config/local.clc.example
index f6fe35d..af92205 100644
--- a/src/main/config/local.clc.example
+++ b/src/main/config/local.clc.example
@@ -12,8 +12,8 @@ ItemServer.Proxy.port=1553
 ItemServer.Console.port=8080

 

 // LDAP config

-Authenticator=com.c2kernel.lookup.ldap.LDAPAuthManager

-Lookup=com.c2kernel.lookup.ldap.LDAPLookup

+Authenticator=org.cristalise.kernel.lookup.ldap.LDAPAuthManager

+Lookup=org.cristalise.kernel.lookup.ldap.LDAPLookup

 LDAP.GlobalPath=LDAPROOTPATH

 LDAP.RootPath=cn=cristal

 LDAP.LocalPath=cn=dev

diff --git a/src/main/java/com/c2kernel/dev/DevObjectOutcomeInitiator.java b/src/main/java/com/c2kernel/dev/DevObjectOutcomeInitiator.java
index 363a905..4ce631b 100644
--- a/src/main/java/com/c2kernel/dev/DevObjectOutcomeInitiator.java
+++ b/src/main/java/com/c2kernel/dev/DevObjectOutcomeInitiator.java
@@ -1,17 +1,18 @@
 package com.c2kernel.dev;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.entity.agent.Job;

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

-import com.c2kernel.lifecycle.ActivityDef;

-import com.c2kernel.lifecycle.CompositeActivityDef;

-import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;

-import com.c2kernel.lookup.DomainPath;

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

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

-import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.DescriptionObject;

-import com.c2kernel.utils.Logger;

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

+import org.cristalise.kernel.entity.agent.Job;

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

+import org.cristalise.kernel.lifecycle.ActivityDef;

+import org.cristalise.kernel.lifecycle.CompositeActivityDef;

+import org.cristalise.kernel.lifecycle.instance.stateMachine.StateMachine;

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

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

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

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

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

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

+

 

 public class DevObjectOutcomeInitiator implements OutcomeInitiator {

 

diff --git a/src/main/java/com/c2kernel/dev/canvas/CanvasEdgeRenderer.java b/src/main/java/com/c2kernel/dev/canvas/CanvasEdgeRenderer.java
index 9d95141..f0521bc 100644
--- a/src/main/java/com/c2kernel/dev/canvas/CanvasEdgeRenderer.java
+++ b/src/main/java/com/c2kernel/dev/canvas/CanvasEdgeRenderer.java
@@ -22,8 +22,10 @@ package com.c2kernel.dev.canvas;
 

 import java.awt.Graphics2D;

 

-import com.c2kernel.graph.model.DirectedEdge;

-import com.c2kernel.gui.graph.view.DirectedEdgeRenderer;

+import org.cristalise.kernel.graph.model.DirectedEdge;

+

+import org.cristalise.gui.graph.view.DirectedEdgeRenderer;

+

 

 public class CanvasEdgeRenderer implements DirectedEdgeRenderer {

 

@@ -35,7 +37,7 @@ public class CanvasEdgeRenderer implements DirectedEdgeRenderer {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.gui.graph.view.DirectedEdgeRenderer#draw(java.awt.Graphics2D, com.c2kernel.graph.model.DirectedEdge)

+	 * @see org.cristalise.kernel.gui.graph.view.DirectedEdgeRenderer#draw(java.awt.Graphics2D, org.cristalise.kernel.graph.model.DirectedEdge)

 	 */

 	@Override

 	public void draw(Graphics2D g2d, DirectedEdge directedEdge) {

diff --git a/src/main/java/com/c2kernel/dev/canvas/CanvasVertexFactory.java b/src/main/java/com/c2kernel/dev/canvas/CanvasVertexFactory.java
index 5c615cf..01544ed 100644
--- a/src/main/java/com/c2kernel/dev/canvas/CanvasVertexFactory.java
+++ b/src/main/java/com/c2kernel/dev/canvas/CanvasVertexFactory.java
@@ -20,10 +20,10 @@
 

 package com.c2kernel.dev.canvas;

 

-import com.c2kernel.graph.model.GraphModelManager;

-import com.c2kernel.graph.model.GraphPoint;

-import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

-import com.c2kernel.graph.model.VertexFactory;

+import org.cristalise.kernel.graph.model.GraphModelManager;

+import org.cristalise.kernel.graph.model.GraphPoint;

+import org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo;

+import org.cristalise.kernel.graph.model.VertexFactory;

 

 public class CanvasVertexFactory implements VertexFactory {

 

@@ -35,7 +35,7 @@ public class CanvasVertexFactory implements VertexFactory {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.graph.model.VertexFactory#create(com.c2kernel.graph.model.GraphModelManager, com.c2kernel.graph.model.GraphPoint, com.c2kernel.graph.model.TypeNameAndConstructionInfo)

+	 * @see org.cristalise.kernel.graph.model.VertexFactory#create(org.cristalise.kernel.graph.model.GraphModelManager, org.cristalise.kernel.graph.model.GraphPoint, org.cristalise.kernel.graph.model.TypeNameAndConstructionInfo)

 	 */

 	@Override

 	public void create(GraphModelManager graphModelManager,

@@ -47,7 +47,7 @@ public class CanvasVertexFactory implements VertexFactory {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.graph.model.VertexFactory#setCreationContext(java.lang.Object)

+	 * @see org.cristalise.kernel.graph.model.VertexFactory#setCreationContext(java.lang.Object)

 	 */

 	@Override

 	public void setCreationContext(Object newContext) {

diff --git a/src/main/java/com/c2kernel/dev/canvas/CanvasVertexRenderer.java b/src/main/java/com/c2kernel/dev/canvas/CanvasVertexRenderer.java
index 3f03d5b..e98b3af 100644
--- a/src/main/java/com/c2kernel/dev/canvas/CanvasVertexRenderer.java
+++ b/src/main/java/com/c2kernel/dev/canvas/CanvasVertexRenderer.java
@@ -22,8 +22,9 @@ package com.c2kernel.dev.canvas;
 

 import java.awt.Graphics2D;

 

-import com.c2kernel.graph.model.Vertex;

-import com.c2kernel.gui.graph.view.VertexRenderer;

+import org.cristalise.gui.graph.view.VertexRenderer;

+import org.cristalise.kernel.graph.model.Vertex;

+

 

 public class CanvasVertexRenderer implements VertexRenderer {

 

@@ -35,7 +36,7 @@ public class CanvasVertexRenderer implements VertexRenderer {
 	}

 

 	/* (non-Javadoc)

-	 * @see com.c2kernel.gui.graph.view.VertexRenderer#draw(java.awt.Graphics2D, com.c2kernel.graph.model.Vertex)

+	 * @see org.cristalise.kernel.gui.graph.view.VertexRenderer#draw(java.awt.Graphics2D, org.cristalise.kernel.graph.model.Vertex)

 	 */

 	@Override

 	public void draw(Graphics2D g2d, Vertex vertex) {

diff --git a/src/main/java/com/c2kernel/dev/canvas/CollectionEdge.java b/src/main/java/com/c2kernel/dev/canvas/CollectionEdge.java
index 13936cf..7ed1a0f 100644
--- a/src/main/java/com/c2kernel/dev/canvas/CollectionEdge.java
+++ b/src/main/java/com/c2kernel/dev/canvas/CollectionEdge.java
@@ -20,7 +20,7 @@
 

 package com.c2kernel.dev.canvas;

 

-import com.c2kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.DirectedEdge;

 

 public class CollectionEdge extends DirectedEdge {

 

diff --git a/src/main/java/com/c2kernel/dev/canvas/CollectionVertex.java b/src/main/java/com/c2kernel/dev/canvas/CollectionVertex.java
index 15f366f..54f5e5e 100644
--- a/src/main/java/com/c2kernel/dev/canvas/CollectionVertex.java
+++ b/src/main/java/com/c2kernel/dev/canvas/CollectionVertex.java
@@ -20,7 +20,7 @@
 

 package com.c2kernel.dev.canvas;

 

-import com.c2kernel.graph.model.GraphableVertex;

+import org.cristalise.kernel.graph.model.GraphableVertex;

 

 public class CollectionVertex extends GraphableVertex {

 

diff --git a/src/main/java/com/c2kernel/dev/canvas/ItemDescriptionVertex.java b/src/main/java/com/c2kernel/dev/canvas/ItemDescriptionVertex.java
index 4992908..f95dc8a 100644
--- a/src/main/java/com/c2kernel/dev/canvas/ItemDescriptionVertex.java
+++ b/src/main/java/com/c2kernel/dev/canvas/ItemDescriptionVertex.java
@@ -20,7 +20,7 @@
 

 package com.c2kernel.dev.canvas;

 

-import com.c2kernel.graph.model.Vertex;

+import org.cristalise.kernel.graph.model.Vertex;

 

 public class ItemDescriptionVertex extends Vertex {

 

diff --git a/src/main/java/com/c2kernel/dev/canvas/MemberEdge.java b/src/main/java/com/c2kernel/dev/canvas/MemberEdge.java
index 19110a3..3115926 100644
--- a/src/main/java/com/c2kernel/dev/canvas/MemberEdge.java
+++ b/src/main/java/com/c2kernel/dev/canvas/MemberEdge.java
@@ -20,7 +20,7 @@
 

 package com.c2kernel.dev.canvas;

 

-import com.c2kernel.graph.model.DirectedEdge;

+import org.cristalise.kernel.graph.model.DirectedEdge;

 

 public class MemberEdge extends DirectedEdge {

 

diff --git a/src/main/resources/boot/CA/CompositeActivityFactory.xml b/src/main/resources/boot/CA/CompositeActivityFactory.xml
index c917a33..19fb910 100644
--- a/src/main/resources/boot/CA/CompositeActivityFactory.xml
+++ b/src/main/resources/boot/CA/CompositeActivityFactory.xml
@@ -2,7 +2,7 @@
 	Height="0" Width="0" IsLayoutable="false" IsComposite="true">

 	<childrenGraphModel>

 		<GraphModelCastorData

-			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

+			ClassNameOfVertexOutlineCreator="org.cristalise.kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

 			StartVertexId="5" NextId="14">

 			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true"

 				IsComposite="false">

diff --git a/src/main/resources/boot/CA/ElementaryActivityFactory.xml b/src/main/resources/boot/CA/ElementaryActivityFactory.xml
index ab736ea..f103d5a 100644
--- a/src/main/resources/boot/CA/ElementaryActivityFactory.xml
+++ b/src/main/resources/boot/CA/ElementaryActivityFactory.xml
@@ -3,7 +3,7 @@
 	IsComposite="true">

 	<childrenGraphModel>

 		<GraphModelCastorData

-			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

+			ClassNameOfVertexOutlineCreator="org.cristalise.kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

 			StartVertexId="5" NextId="14">

 			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true"

 				IsComposite="false">

diff --git a/src/main/resources/boot/CA/ItemDescriptionFactoryWf.xml b/src/main/resources/boot/CA/ItemDescriptionFactoryWf.xml
index 56ab47f..c0caf2d 100644
--- a/src/main/resources/boot/CA/ItemDescriptionFactoryWf.xml
+++ b/src/main/resources/boot/CA/ItemDescriptionFactoryWf.xml
@@ -2,7 +2,7 @@
 	Height="0" Width="0" IsLayoutable="false" IsComposite="true">

 	<childrenGraphModel>

 		<GraphModelCastorData

-			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

+			ClassNameOfVertexOutlineCreator="org.cristalise.kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

 			StartVertexId="1" NextId="14">

 			<JoinDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true"

 				IsComposite="false">

diff --git a/src/main/resources/boot/CA/ItemDescriptionWf.xml b/src/main/resources/boot/CA/ItemDescriptionWf.xml
index 34e38c7..74c8f63 100644
--- a/src/main/resources/boot/CA/ItemDescriptionWf.xml
+++ b/src/main/resources/boot/CA/ItemDescriptionWf.xml
@@ -2,7 +2,7 @@
 	Height="0" Width="0" IsLayoutable="false" IsComposite="true">

 	<childrenGraphModel>

 		<GraphModelCastorData

-			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

+			ClassNameOfVertexOutlineCreator="org.cristalise.kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

 			StartVertexId="0" NextId="37">

 			<ActivitySlotDef ID="33" Name="CreateItem slot"

 				Height="60" Width="130" IsLayoutable="true" IsComposite="false">

diff --git a/src/main/resources/boot/CA/ReadOnlyItemDescriptionWf.xml b/src/main/resources/boot/CA/ReadOnlyItemDescriptionWf.xml
index 7ca7ce9..5170576 100644
--- a/src/main/resources/boot/CA/ReadOnlyItemDescriptionWf.xml
+++ b/src/main/resources/boot/CA/ReadOnlyItemDescriptionWf.xml
@@ -2,7 +2,7 @@
 	Height="0" Width="0" IsLayoutable="false" IsComposite="true">

 	<childrenGraphModel>

 		<GraphModelCastorData

-			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

+			ClassNameOfVertexOutlineCreator="org.cristalise.kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

 			StartVertexId="9" NextId="37">

 			<ActivitySlotDef ID="33" Name="CreateItem slot"

 				Height="60" Width="130" IsLayoutable="true" IsComposite="false">

diff --git a/src/main/resources/boot/CA/StateMachineFactoryWf.xml b/src/main/resources/boot/CA/StateMachineFactoryWf.xml
index 07a5af1..e5985d7 100644
--- a/src/main/resources/boot/CA/StateMachineFactoryWf.xml
+++ b/src/main/resources/boot/CA/StateMachineFactoryWf.xml
@@ -2,7 +2,7 @@
 	Height="0" Width="0" IsLayoutable="false" IsComposite="true">

 	<childrenGraphModel>

 		<GraphModelCastorData

-			ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

+			ClassNameOfVertexOutlineCreator="org.cristalise.kernel.lifecycle.gui.model.WfVertexDefOutlineCreator"

 			StartVertexId="5" NextId="14">

 			<JoinDef ID="6" Name="" Height="24" Width="60" IsLayoutable="true"

 				IsComposite="false">

diff --git a/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml b/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
index 7a63b76..490ac3b 100644
--- a/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
+++ b/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <cristalscript>

-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>

+	<output name="errors" type="org.cristalise.kernel.scripting.ErrorInfo"/>

 	<script language="javascript" name="CreateNewNumberedVersionFromLast"><![CDATA[

 

 		var viewName = job.getActPropString("ViewName");

diff --git a/src/main/resources/boot/SC/InstantiateItem.xml b/src/main/resources/boot/SC/InstantiateItem.xml
index d4920f4..1365d61 100644
--- a/src/main/resources/boot/SC/InstantiateItem.xml
+++ b/src/main/resources/boot/SC/InstantiateItem.xml
@@ -1,5 +1,5 @@
 <cristalscript>
-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />
+	<output name="errors" type="org.cristalise.kernel.scripting.ErrorInfo" />
 	<script language="javascript" name="InstantiateItem"><![CDATA[
 		importClass(Packages.com.c2kernel.lookup.DomainPath);
 
diff --git a/src/main/resources/boot/SC/LocalObjectDefCreator.xml b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
index 5fc3627..39f49e7 100644
--- a/src/main/resources/boot/SC/LocalObjectDefCreator.xml
+++ b/src/main/resources/boot/SC/LocalObjectDefCreator.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <cristalscript>

-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />

+	<output name="errors" type="org.cristalise.kernel.scripting.ErrorInfo" />

 	<script language="javascript" name="LocalObjectDefCreator"><![CDATA[

-		importClass(com.c2kernel.process.Gateway);

-		importClass(com.c2kernel.process.Bootstrap);

-		importClass(com.c2kernel.lifecycle.CompositeActivityDef);

-		importClass(com.c2kernel.lifecycle.ActivityDef);

-		importClass(com.c2kernel.lookup.DomainPath);

-		importClass(com.c2kernel.process.resource.DefaultResourceImportHandler);

+		importClass(org.cristalise.kernel.process.Gateway);

+		importClass(org.cristalise.kernel.process.Bootstrap);

+		importClass(org.cristalise.kernel.lifecycle.CompositeActivityDef);

+		importClass(org.cristalise.kernel.lifecycle.ActivityDef);

+		importClass(org.cristalise.kernel.lookup.DomainPath);

+		importClass(org.cristalise.kernel.process.resource.DefaultResourceImportHandler);

 	

 		var name = job.getOutcome().getField("ObjectName");

 		var folder = job.getOutcome().getField("SubFolder");

diff --git a/src/main/resources/boot/SC/New.xml b/src/main/resources/boot/SC/New.xml
index 385f410..f3d5aa5 100644
--- a/src/main/resources/boot/SC/New.xml
+++ b/src/main/resources/boot/SC/New.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <cristalscript>

-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />

+	<output name="errors" type="org.cristalise.kernel.scripting.ErrorInfo" />

 	<script language="javascript" name=""><![CDATA[

 

 		]]></script>

diff --git a/src/main/resources/boot/SC/SetLastNumberedVersionToLast.xml b/src/main/resources/boot/SC/SetLastNumberedVersionToLast.xml
index dab9875..80ce682 100644
--- a/src/main/resources/boot/SC/SetLastNumberedVersionToLast.xml
+++ b/src/main/resources/boot/SC/SetLastNumberedVersionToLast.xml
@@ -1,5 +1,5 @@
 <cristalscript>
-    <output name="errors" type="com.c2kernel.scripting.ErrorInfo"/>
+    <output name="errors" type="org.cristalise.kernel.scripting.ErrorInfo"/>
     <script language="javascript" name="SetLastNumberedVersionFromLast"><![CDATA[
 
 		var viewName = job.getActPropString("ViewName");
diff --git a/src/main/resources/boot/SC/SetWorkflow.xml b/src/main/resources/boot/SC/SetWorkflow.xml
index be8fbe6..6efdec7 100644
--- a/src/main/resources/boot/SC/SetWorkflow.xml
+++ b/src/main/resources/boot/SC/SetWorkflow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <cristalscript>

-	<output name="errors" type="com.c2kernel.scripting.ErrorInfo" />

+	<output name="errors" type="org.cristalise.kernel.scripting.ErrorInfo" />

 	<script language="javascript" name="SetWorkflow"><![CDATA[

 
        // Fetch the requested name from the outcome field

         var wfDefName    = job.getOutcome().getField("WorkflowDefinitionName");

diff --git a/src/main/resources/mapFiles/CanvasMap.xml b/src/main/resources/mapFiles/CanvasMap.xml
index f623e52..04323b8 100644
--- a/src/main/resources/mapFiles/CanvasMap.xml
+++ b/src/main/resources/mapFiles/CanvasMap.xml
@@ -1,49 +1,49 @@
 <?xml version="1.0"?>

 <mapping>

-	<class name="com.c2kernel.lifecycle.NextDef" extends="com.c2kernel.graph.model.GraphableEdge">

+	<class name="org.cristalise.kernel.lifecycle.NextDef" extends="org.cristalise.kernel.graph.model.GraphableEdge">

 		<map-to xml="NextDef"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.WfVertexDef" extends="com.c2kernel.graph.model.GraphableVertex">

+	<class name="org.cristalise.kernel.lifecycle.WfVertexDef" extends="org.cristalise.kernel.graph.model.GraphableVertex">

 		<map-to xml="WfVertexDef"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.ActivityDef" extends="com.c2kernel.lifecycle.WfVertexDef">

+	<class name="org.cristalise.kernel.lifecycle.ActivityDef" extends="org.cristalise.kernel.lifecycle.WfVertexDef">

 		<map-to xml="ActivityDef"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.CompositeActivityDef" extends="com.c2kernel.lifecycle.ActivityDef">

+	<class name="org.cristalise.kernel.lifecycle.CompositeActivityDef" extends="org.cristalise.kernel.lifecycle.ActivityDef">

 		<map-to xml="CompositeActivityDef"/>

 		<field name="castorNonLayoutableChildren" type="string" direct="false" collection="array">

 			<bind-xml name="castorNonLayoutableChildren" node="element"/>

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.ActivitySlotDef" extends="com.c2kernel.lifecycle.WfVertexDef">

+	<class name="org.cristalise.kernel.lifecycle.ActivitySlotDef" extends="org.cristalise.kernel.lifecycle.WfVertexDef">

 		<map-to xml="ActivitySlotDef"/>

 		<field name="activityDef" type="string" direct="false">

 			<bind-xml name="activityDef" node="element"/>

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.JoinDef" extends="com.c2kernel.lifecycle.WfVertexDef">

+	<class name="org.cristalise.kernel.lifecycle.JoinDef" extends="org.cristalise.kernel.lifecycle.WfVertexDef">

 		<map-to xml="JoinDef"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.AndSplitDef" extends="com.c2kernel.lifecycle.WfVertexDef">

+	<class name="org.cristalise.kernel.lifecycle.AndSplitDef" extends="org.cristalise.kernel.lifecycle.WfVertexDef">

 		<map-to xml="AndSplitDef"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.OrSplitDef" extends="com.c2kernel.lifecycle.AndSplitDef">

+	<class name="org.cristalise.kernel.lifecycle.OrSplitDef" extends="org.cristalise.kernel.lifecycle.AndSplitDef">

 		<map-to xml="OrSplitDef"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.XOrSplitDef" extends="com.c2kernel.lifecycle.AndSplitDef">

+	<class name="org.cristalise.kernel.lifecycle.XOrSplitDef" extends="org.cristalise.kernel.lifecycle.AndSplitDef">

 		<map-to xml="XOrSplitDef"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.LoopDef" extends="com.c2kernel.lifecycle.XOrSplitDef">

+	<class name="org.cristalise.kernel.lifecycle.LoopDef" extends="org.cristalise.kernel.lifecycle.XOrSplitDef">

 		<map-to xml="LoopDef"/>

 		<field name="isNext" type="integer" direct="true">

 			<bind-xml name="isNext" node="attribute"/>

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.Next" extends="com.c2kernel.graph.model.GraphableEdge">

+	<class name="org.cristalise.kernel.lifecycle.instance.Next" extends="org.cristalise.kernel.graph.model.GraphableEdge">

 		<map-to xml="Next"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.WfVertex" extends="com.c2kernel.graph.model.GraphableVertex"/>

-	<class name="com.c2kernel.lifecycle.instance.Activity" extends="com.c2kernel.lifecycle.instance.WfVertex">

+	<class name="org.cristalise.kernel.lifecycle.instance.WfVertex" extends="org.cristalise.kernel.graph.model.GraphableVertex"/>

+	<class name="org.cristalise.kernel.lifecycle.instance.Activity" extends="org.cristalise.kernel.lifecycle.instance.WfVertex">

 		<map-to xml="AtomicActivity"/>

 		<field name="active" type="boolean" direct="false">

 			<bind-xml name="active" node="attribute"/>

@@ -54,50 +54,50 @@
 		<field name="type" type="string" direct="false">

 			<bind-xml name="Type" node="attribute"/>

 		</field>

-		<field name="startDate" type="com.c2kernel.common.GTimeStamp" direct="false">

+		<field name="startDate" type="org.cristalise.kernel.common.GTimeStamp" direct="false">

 			<bind-xml name="startDate" node="element"/>

 		</field>

-		<field name="activeDate" type="com.c2kernel.common.GTimeStamp" direct="false">

+		<field name="activeDate" type="org.cristalise.kernel.common.GTimeStamp" direct="false">

 			<bind-xml name="activeDate" node="element"/>

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.CompositeActivity" extends="com.c2kernel.lifecycle.instance.Activity">

+	<class name="org.cristalise.kernel.lifecycle.instance.CompositeActivity" extends="org.cristalise.kernel.lifecycle.instance.Activity">

 		<map-to xml="CompositeActivity"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.Workflow" extends="com.c2kernel.lifecycle.instance.CompositeActivity">

+	<class name="org.cristalise.kernel.lifecycle.instance.Workflow" extends="org.cristalise.kernel.lifecycle.instance.CompositeActivity">

 		<map-to xml="Workflow"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.Join" extends="com.c2kernel.lifecycle.instance.WfVertex">

+	<class name="org.cristalise.kernel.lifecycle.instance.Join" extends="org.cristalise.kernel.lifecycle.instance.WfVertex">

 		<map-to xml="Join"/>

 		<field name="counter" type="integer" direct="true">

 			<bind-xml name="counter" node="attribute"/>

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.Split" extends="com.c2kernel.lifecycle.instance.WfVertex">

+	<class name="org.cristalise.kernel.lifecycle.instance.Split" extends="org.cristalise.kernel.lifecycle.instance.WfVertex">

 		<map-to xml="Split"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.AndSplit" extends="com.c2kernel.lifecycle.instance.Split">

+	<class name="org.cristalise.kernel.lifecycle.instance.AndSplit" extends="org.cristalise.kernel.lifecycle.instance.Split">

 		<map-to xml="AndSplit"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.OrSplit" extends="com.c2kernel.lifecycle.instance.Split">

+	<class name="org.cristalise.kernel.lifecycle.instance.OrSplit" extends="org.cristalise.kernel.lifecycle.instance.Split">

 		<map-to xml="OrSplit"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.XOrSplit" extends="com.c2kernel.lifecycle.instance.Split">

+	<class name="org.cristalise.kernel.lifecycle.instance.XOrSplit" extends="org.cristalise.kernel.lifecycle.instance.Split">

 		<map-to xml="XOrSplit"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.Loop" extends="com.c2kernel.lifecycle.instance.XOrSplit">

+	<class name="org.cristalise.kernel.lifecycle.instance.Loop" extends="org.cristalise.kernel.lifecycle.instance.XOrSplit">

 		<map-to xml="Loop"/>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer">

+	<class name="org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer">

 		<map-to xml="PredefinedStepContainer"/>

 		<field name="ID" type="integer" direct="false">

 			<bind-xml name="id" node="attribute"/>

 		</field>

 	</class>

-	<class name="com.c2kernel.lifecycle.instance.predefined.ServerPredefinedStepContainer" extends="com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer">

+	<class name="org.cristalise.kernel.lifecycle.instance.predefined.ServerPredefinedStepContainer" extends="org.cristalise.kernel.lifecycle.instance.predefined.PredefinedStepContainer">

 		<map-to xml="ServerPredefinedStepContainer"/>

 	</class>

-	<class name="com.c2kernel.scripting.ErrorInfo">

+	<class name="org.cristalise.kernel.scripting.ErrorInfo">

 		<map-to xml="Errors"/>

 		<field name="fatal" type="boolean" direct="false">

 			<bind-xml name="fatal" node="attribute"/>

diff --git a/src/main/resources/module.xml b/src/main/resources/module.xml
index fe90883..51c4f7d 100644
--- a/src/main/resources/module.xml
+++ b/src/main/resources/module.xml
@@ -6,7 +6,7 @@
 	</Info>

 	<ResourceURL>uk/ac/uwe/cristaldev/resources/</ResourceURL>

     <Config name="Module.dev.debug">true</Config>

-    <Config name="OutcomeInit.Dev">com.c2kernel.dev.DevObjectOutcomeInitiator</Config>

+    <Config name="OutcomeInit.Dev">org.cristalise.kernel.dev.DevObjectOutcomeInitiator</Config>

 	<Imports>

 		<Resource name="NewDevObjectDef" version="0" type="OD">boot/OD/NewDevObjectDef.xsd</Resource>

 		<Resource name="ChooseWorkflow" version="0" type="OD">boot/OD/ChooseWorkflow.xsd</Resource>