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 +++++++---- src/main/java/com/c2kernel/process/module/Module.java | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/c2kernel') 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)); -- cgit v1.2.3