diff options
Diffstat (limited to 'src/main/java/com/c2kernel/process/module')
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/Module.java | 13 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/ModuleManager.java | 6 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java index a7a85bb..c93a695 100644 --- a/src/main/java/com/c2kernel/process/module/Module.java +++ b/src/main/java/com/c2kernel/process/module/Module.java @@ -11,7 +11,6 @@ import com.c2kernel.lifecycle.instance.predefined.entitycreation.NewAgent; import com.c2kernel.lifecycle.instance.predefined.entitycreation.NewItem;
import com.c2kernel.lifecycle.instance.predefined.entitycreation.NewRole;
import com.c2kernel.lifecycle.instance.predefined.entitycreation.Outcome;
-import com.c2kernel.lookup.DomainPath;
import com.c2kernel.lookup.RolePath;
import com.c2kernel.process.Bootstrap;
import com.c2kernel.process.Gateway;
@@ -74,13 +73,13 @@ public class Module { imports.list.add(moduleItem);
}
- public void importAll(ItemProxy serverEntity, String moduleXML) throws Exception {
+ public void importAll(ItemProxy serverEntity, String moduleXML, boolean reset) throws Exception {
addModuleItem(moduleXML);
int systemAgentId = Gateway.getLDAPLookup().getRoleManager().getAgentPath("system").getSysKey();
for (ModuleResource thisRes : imports.getResources()) {
try {
- Bootstrap.verifyResource(ns, thisRes.name, thisRes.resourceType, Resource.getTextResource(ns, thisRes.resourceLocation));
+ Bootstrap.verifyResource(ns, thisRes.name, thisRes.resourceType, Resource.getTextResource(ns, thisRes.resourceLocation), reset);
} catch (Exception ex) {
Logger.error(ex);
}
@@ -112,13 +111,7 @@ public class Module { for (NewItem thisItem : imports.getItems()) {
thisItem.setNamespace(ns);
- try {
- new DomainPath(new DomainPath(thisItem.initialPath), thisItem.name).getEntity();
- Logger.msg(3, "Module.importAll() - Item '"+thisItem.name+"' found.");
- continue;
- } catch (ObjectNotFoundException ex) { }
- Logger.msg("Module.importAll() - Item '"+thisItem.name+"' not found. Creating.");
- thisItem.create(systemAgentId);
+ thisItem.create(systemAgentId, reset);
}
}
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());
|