diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-04-11 17:00:47 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-04-11 17:03:57 +0200 |
| commit | 410dc5af0fec0e29635cc049351076712f2d4727 (patch) | |
| tree | 900033039ddce3ec3fd285bf9664a436fcc9b9fb /src/main/java | |
| parent | 3ee9c263ca512068d2669cdf9a10679424eb6ce2 (diff) | |
Remove description editing workflows from the kernel - they have been
moved to cristal-dev. Requires future post-processing for previous
Module.debug functionality
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/c2kernel/process/Bootstrap.java | 11 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/Module.java | 2 |
2 files changed, 8 insertions, 5 deletions
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));
|