ResourceImportHandler interface to allow custom <Resource> types or

override the structure of standard ones. Specify with
ResourceImportHandler.<resType> c2kprop. DefaultResourceImportHandler is
used if not defined, which handled the 5 standard types
(CA,EA,OD,SC,SM). Fixes #178

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java
index fda4b1b..a7c707e 100644
--- a/src/main/java/com/c2kernel/process/module/Module.java
+++ b/src/main/java/com/c2kernel/process/module/Module.java
@@ -11,6 +11,7 @@ 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;

@@ -59,10 +60,9 @@ public class Module {
 		// Add dependency for all children

 		Dependency children = new Dependency("Contents");

 		for (ModuleImport thisImport : imports.list) {

-			String path = thisImport.getPath(ns);

+			DomainPath path = thisImport.path;

 			if (path != null)

-			children.dependencyMemberList.add(

-					new DependencyMember(path+"/"+thisImport.name));

+			children.dependencyMemberList.add(new DependencyMember(path.toString()));

 		}

 		moduleItem.dependencyList.add(children);

 		// Add moduleXML

@@ -78,7 +78,8 @@ public class Module {
 		

 		for (ModuleResource thisRes : imports.getResources()) {

 			try {

-				Bootstrap.verifyResource(ns, thisRes.name, thisRes.version, thisRes.resourceType, Gateway.getResource().getTextResource(ns, thisRes.resourceLocation), reset);

+				thisRes.path = Bootstrap.verifyResource(ns, thisRes.name, thisRes.version, 

+						thisRes.resourceType, thisRes.resourceLocation, reset);

 			} catch (Exception ex) {

 				Logger.error(ex);

 			}