From 779718755c22b6a6ad1c8a4b5d040f8a65cc4058 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 25 Jun 2013 17:03:15 +0200 Subject: More intelligent import of module resources. If resources or outcomes have been modified by a different user, do no overwrite them. Reset the properties and workflow though (should be fairly stateless), but leave the collections. --- src/main/java/com/c2kernel/process/module/ModuleManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/c2kernel/process/module/ModuleManager.java') diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java index b4c990f..f072f66 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleManager.java +++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java @@ -144,11 +144,15 @@ public class ModuleManager { } Logger.debug(3, "Registering modules"); + boolean reset = Gateway.getProperty("Module.reset", "false").equals("true"); + for (Module thisMod : modules) { Logger.msg("Registering module "+thisMod.getName()); try { - thisMod.importAll(serverEntity, modulesXML.get(thisMod.ns)); + String nsReset = Gateway.getProperty("Module."+thisMod.ns+".reset"); + boolean thisReset = nsReset == null?reset:nsReset.equals("true"); + thisMod.importAll(serverEntity, modulesXML.get(thisMod.ns), thisReset); } catch (Exception e) { Logger.error(e); throw new ModuleException("Error importing items for module "+thisMod.getName()); -- cgit v1.2.3