From 4a90596e4c8ff50f5624c0739f3710723a90a485 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 7 Oct 2014 09:20:44 +0200 Subject: Repackage to org.cristalise --- bin/Cristal Dev GUI.launch | 6 +-- bin/Cristal Dev Server.launch | 4 +- pom.xml | 44 +++++++++--------- src/main/config/local.clc.example | 4 +- .../c2kernel/dev/DevObjectOutcomeInitiator.java | 25 ++++++----- .../c2kernel/dev/canvas/CanvasEdgeRenderer.java | 8 ++-- .../c2kernel/dev/canvas/CanvasVertexFactory.java | 12 ++--- .../c2kernel/dev/canvas/CanvasVertexRenderer.java | 7 +-- .../com/c2kernel/dev/canvas/CollectionEdge.java | 2 +- .../com/c2kernel/dev/canvas/CollectionVertex.java | 2 +- .../c2kernel/dev/canvas/ItemDescriptionVertex.java | 2 +- .../java/com/c2kernel/dev/canvas/MemberEdge.java | 2 +- .../resources/boot/CA/CompositeActivityFactory.xml | 2 +- .../boot/CA/ElementaryActivityFactory.xml | 2 +- .../resources/boot/CA/ItemDescriptionFactoryWf.xml | 2 +- src/main/resources/boot/CA/ItemDescriptionWf.xml | 2 +- .../boot/CA/ReadOnlyItemDescriptionWf.xml | 2 +- .../resources/boot/CA/StateMachineFactoryWf.xml | 2 +- .../boot/SC/CreateNewNumberedVersionFromLast.xml | 2 +- src/main/resources/boot/SC/InstantiateItem.xml | 2 +- .../resources/boot/SC/LocalObjectDefCreator.xml | 14 +++--- src/main/resources/boot/SC/New.xml | 2 +- .../boot/SC/SetLastNumberedVersionToLast.xml | 2 +- src/main/resources/boot/SC/SetWorkflow.xml | 2 +- src/main/resources/mapFiles/CanvasMap.xml | 52 +++++++++++----------- src/main/resources/module.xml | 2 +- 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 @@ - + - + @@ -12,7 +12,7 @@ - + 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 @@ - - + + diff --git a/pom.xml b/pom.xml index f48b188..7898751 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - cristal - cristal-dev + org.cristalise + cristalise-dev 3.0-SNAPSHOT Cristal Development Module @@ -57,7 +57,7 @@ - com.c2kernel.process.StandardServer + org.cristalise.kernel.process.StandardServer cristal-server -logLevel @@ -71,7 +71,7 @@ - com.c2kernel.gui.Main + org.cristalise.kernel.gui.Main cristal-gui -logLevel @@ -85,7 +85,7 @@ - com.c2kernel.process.UserCodeProcess + org.cristalise.kernel.process.UserCodeProcess cristal-usercode -logLevel @@ -172,43 +172,43 @@ - cristal - cristal-kernel + org.cristalise + cristalise-kernel 3.0-SNAPSHOT - cristal - cristal-gui + org.cristalise + cristalise-gui 3.0-SNAPSHOT - cristal - cristal-xmldb + org.cristalise + cristalise-xmldb 1.0-SNAPSHOT - cristal - cristal-ldap - 1.0-SNAPSHOT + org.cristalise + cristalise-ldap + 3.0-SNAPSHOT - cristal - cristal-kernel + org.cristalise + cristalise-kernel - cristal - cristal-gui + org.cristalise + cristalise-gui - cristal - cristal-xmldb + org.cristalise + cristalise-xmldb - cristal - cristal-ldap + org.cristalise + cristalise-ldap \ 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"> 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"> 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"> 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"> 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"> 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"> 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 @@ - + 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 @@ - +