From 410dc5af0fec0e29635cc049351076712f2d4727 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 11 Apr 2014 17:00:47 +0200 Subject: Remove description editing workflows from the kernel - they have been moved to cristal-dev. Requires future post-processing for previous Module.debug functionality --- src/main/java/com/c2kernel/process/Bootstrap.java | 11 +- .../java/com/c2kernel/process/module/Module.java | 2 +- .../resources/boot/CA/ManageCompositeActDef.xml | 208 -------------------- .../resources/boot/CA/ManageElementaryActDef.xml | 212 -------------------- src/main/resources/boot/CA/ManageSchema.xml | 216 -------------------- src/main/resources/boot/CA/ManageScript.xml | 217 --------------------- src/main/resources/boot/CA/ManageStateMachine.xml | 214 -------------------- src/main/resources/boot/CA/ModuleWorkflow.xml | 100 ---------- .../resources/boot/EA/AssignNewVersionFromLast.xml | 20 -- src/main/resources/boot/EA/EditActivityDef.xml | 19 -- .../resources/boot/EA/EditModuleDefinition.xml | 1 - src/main/resources/boot/EA/EditSchema.xml | 19 -- .../resources/boot/EA/EditScriptDefinition.xml | 19 -- src/main/resources/boot/EA/EditStateMachine.xml | 19 -- .../boot/SC/CreateNewNumberedVersionFromLast.xml | 31 --- src/main/resources/boot/allbootitems.txt | 13 -- 16 files changed, 8 insertions(+), 1313 deletions(-) delete mode 100644 src/main/resources/boot/CA/ManageCompositeActDef.xml delete mode 100644 src/main/resources/boot/CA/ManageElementaryActDef.xml delete mode 100644 src/main/resources/boot/CA/ManageSchema.xml delete mode 100644 src/main/resources/boot/CA/ManageScript.xml delete mode 100644 src/main/resources/boot/CA/ManageStateMachine.xml delete mode 100644 src/main/resources/boot/CA/ModuleWorkflow.xml delete mode 100644 src/main/resources/boot/EA/AssignNewVersionFromLast.xml delete mode 100644 src/main/resources/boot/EA/EditActivityDef.xml delete mode 100644 src/main/resources/boot/EA/EditModuleDefinition.xml delete mode 100644 src/main/resources/boot/EA/EditSchema.xml delete mode 100644 src/main/resources/boot/EA/EditScriptDefinition.xml delete mode 100644 src/main/resources/boot/EA/EditStateMachine.xml delete mode 100644 src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java index a750b3f..601db31 100644 --- a/src/main/java/com/c2kernel/process/Bootstrap.java +++ b/src/main/java/com/c2kernel/process/Bootstrap.java @@ -238,11 +238,14 @@ public class Bootstrap props.list.add(new Property(propName, propVal, pd.getIsMutable())); } - CompositeActivity ca; + CompositeActivity ca = new CompositeActivity(); if (ns!=null && Gateway.getProperties().getBoolean("Module.debug", false)) - ca = (CompositeActivity) ((CompositeActivityDef)LocalObjectLoader.getActDef(impHandler.getWorkflowName(), 0)).instantiate(); - else - ca = new CompositeActivity(); + try { + ca = (CompositeActivity) ((CompositeActivityDef)LocalObjectLoader.getActDef(impHandler.getWorkflowName(), 0)).instantiate(); + } catch (ObjectNotFoundException ex) { + Logger.error("Module resource workflow "+impHandler.getWorkflowName()+" not found. Using empty."); + } + EntityPath entityPath = Gateway.getLDAPLookup().getNextKeyManager().generateNextEntityKey(); TraceableEntity newItem = (TraceableEntity)Gateway.getCorbaServer().createEntity(entityPath); diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java index 3e8ab2a..32a5997 100644 --- a/src/main/java/com/c2kernel/process/module/Module.java +++ b/src/main/java/com/c2kernel/process/module/Module.java @@ -51,7 +51,7 @@ public class Module { } public void addModuleItem(String moduleXML) { - NewItem moduleItem = new NewItem(name, "/desc/modules/", "ModuleWorkflow", 0); + NewItem moduleItem = new NewItem(name, "/desc/modules/", "NoWorkflow", 0); // Module properties moduleItem.properties.add(new com.c2kernel.property.Property("Namespace", ns, false)); moduleItem.properties.add(new com.c2kernel.property.Property("Name", name, false)); diff --git a/src/main/resources/boot/CA/ManageCompositeActDef.xml b/src/main/resources/boot/CA/ManageCompositeActDef.xml deleted file mode 100644 index f1def44..0000000 --- a/src/main/resources/boot/CA/ManageCompositeActDef.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - 19 - 20 - 21 - - - - - - - - - - - - 17 - 20 - 18 - - - - - - - - - - - 16 - 17 - - - - - - - - - 8 - 21 - - - - - - - - - - - 25 - 7 - 8 - - - - - - - - - - - - 18 - 19 - - - - - AssignNewVersionFromLast - - - - - - - - 7 - 16 - 24 - - - - - - - - - - - 24 - 25 - - - - - EditActivityDef - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml deleted file mode 100644 index 756fb8a..0000000 --- a/src/main/resources/boot/CA/ManageElementaryActDef.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - 19 - 20 - 21 - - - - - - - - - - - - 17 - 20 - 18 - - - - - - - - - - - 8 - 21 - - - - - - - - - - - 16 - 17 - - - - - - - - - 25 - 7 - 8 - - - - - - - - - - - - 7 - 16 - 24 - - - - - - - - - - - 18 - 19 - - - - - - - AssignNewVersionFromLast - - - - - - - - 24 - 25 - - - - - - - EditActivityDef - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/CA/ManageSchema.xml b/src/main/resources/boot/CA/ManageSchema.xml deleted file mode 100644 index 69580fe..0000000 --- a/src/main/resources/boot/CA/ManageSchema.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - 19 - 20 - 21 - - - - - - - - - - - - - 17 - 20 - 18 - - - - - - - - - - - 16 - 17 - - - - - - - - - - - - 8 - 21 - - - - - - - - - - - 6 - 7 - 8 - - - - - - - - - - - - - 18 - 19 - - - - - - - AssignNewVersionFromLast - - - - - - - - 7 - 16 - 5 - - - - - - - - - - - 5 - 6 - - - - - - EditSchema - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/CA/ManageScript.xml b/src/main/resources/boot/CA/ManageScript.xml deleted file mode 100644 index 9dff06f..0000000 --- a/src/main/resources/boot/CA/ManageScript.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - 24 - 25 - 26 - - - - - - - - - - - - - 21 - 22 - 23 - - - - - - - - - - - - - 18 - 25 - 20 - - - - - - - - - - - 17 - 23 - 19 - - - - - - - - - - - 17 - 18 - - - - - - - - - - - - 19 - 21 - - - - - - EditScriptDefinition - - - - - - - - 20 - 24 - - - - - - - AssignNewVersionFromLast - - - - - - - - 22 - 26 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/CA/ManageStateMachine.xml b/src/main/resources/boot/CA/ManageStateMachine.xml deleted file mode 100644 index 47d769b..0000000 --- a/src/main/resources/boot/CA/ManageStateMachine.xml +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - 19 - 20 - 21 - - - - - - - - - - - - - 17 - 20 - 18 - - - - - - - - - - - 16 - 17 - - - - - - - - - - - - 8 - 21 - - - - - - - - - - - 6 - 7 - 8 - - - - - - - - - - - - - 18 - 19 - - - - - AssignNewVersionFromLast - - - - - - - - 7 - 16 - 5 - - - - - - - - - - - 5 - 6 - - - - - - EditStateMachine - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/CA/ModuleWorkflow.xml b/src/main/resources/boot/CA/ModuleWorkflow.xml deleted file mode 100644 index 1eb3ee4..0000000 --- a/src/main/resources/boot/CA/ModuleWorkflow.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - 7 - - - - - - - - - - - 4 - 5 - 7 - - - - - - - - - - - - - 5 - 3 - - - - - - - - - - - 3 - 4 - - - - - EditModuleDefinition - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/boot/EA/AssignNewVersionFromLast.xml b/src/main/resources/boot/EA/AssignNewVersionFromLast.xml deleted file mode 100644 index 248dfee..0000000 --- a/src/main/resources/boot/EA/AssignNewVersionFromLast.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/EA/EditActivityDef.xml b/src/main/resources/boot/EA/EditActivityDef.xml deleted file mode 100644 index e90c225..0000000 --- a/src/main/resources/boot/EA/EditActivityDef.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/EA/EditModuleDefinition.xml b/src/main/resources/boot/EA/EditModuleDefinition.xml deleted file mode 100644 index 04afe4d..0000000 --- a/src/main/resources/boot/EA/EditModuleDefinition.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/main/resources/boot/EA/EditSchema.xml b/src/main/resources/boot/EA/EditSchema.xml deleted file mode 100644 index 3b01fdc..0000000 --- a/src/main/resources/boot/EA/EditSchema.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/EA/EditScriptDefinition.xml b/src/main/resources/boot/EA/EditScriptDefinition.xml deleted file mode 100644 index 11c14ec..0000000 --- a/src/main/resources/boot/EA/EditScriptDefinition.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/EA/EditStateMachine.xml b/src/main/resources/boot/EA/EditStateMachine.xml deleted file mode 100644 index a1060b7..0000000 --- a/src/main/resources/boot/EA/EditStateMachine.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml b/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml deleted file mode 100644 index 7a63b76..0000000 --- a/src/main/resources/boot/SC/CreateNewNumberedVersionFromLast.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - diff --git a/src/main/resources/boot/allbootitems.txt b/src/main/resources/boot/allbootitems.txt index 9bbea75..7a3cd03 100644 --- a/src/main/resources/boot/allbootitems.txt +++ b/src/main/resources/boot/allbootitems.txt @@ -12,21 +12,8 @@ OD/Schema OD/Script OD/Errors OD/StateMachine -EA/AssignNewVersionFromLast -EA/EditActivityDef -EA/EditSchema -EA/EditScriptDefinition -EA/EditStateMachine EA/CreateNewItem EA/CreateNewAgent -EA/EditModuleDefinition CA/NoWorkflow CA/ServerItemWorkflow -CA/ModuleWorkflow -CA/ManageCompositeActDef -CA/ManageElementaryActDef -CA/ManageSchema -CA/ManageScript -CA/ManageStateMachine -SC/CreateNewNumberedVersionFromLast SC/ServerNewEntity -- cgit v1.2.3