diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-06-25 17:03:15 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-06-25 17:03:15 +0200 |
| commit | 779718755c22b6a6ad1c8a4b5d040f8a65cc4058 (patch) | |
| tree | b1706b3999c09bdf801d963dee35de60436651d5 /src/main/java/com/c2kernel/process/module/Module.java | |
| parent | 339eac0a04102ca05bb49a43d905601a4972a2a3 (diff) | |
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.
Diffstat (limited to 'src/main/java/com/c2kernel/process/module/Module.java')
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/Module.java | 13 |
1 files changed, 3 insertions, 10 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);
}
}
|