From e73468fd08cc27aa31f76a27c916e45d5987c628 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 5 Jun 2014 16:47:41 +0200
Subject: Moved old entitycreation package from the predefined step package to
 a new 'imports' package under entity. Renamed most classed with an 'Import'
 prefix to avoid clashes with other API classes. Fixes #194

---
 .../java/com/c2kernel/process/module/Module.java   | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/main/java/com/c2kernel/process/module/Module.java')

diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java
index dae5711..873754f 100644
--- a/src/main/java/com/c2kernel/process/module/Module.java
+++ b/src/main/java/com/c2kernel/process/module/Module.java
@@ -4,14 +4,14 @@ import java.util.ArrayList;
 import java.util.Properties;
 
 import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.entity.imports.ImportDependency;
+import com.c2kernel.entity.imports.ImportDependencyMember;
+import com.c2kernel.entity.imports.ImportAgent;
+import com.c2kernel.entity.imports.ImportItem;
+import com.c2kernel.entity.imports.ImportRole;
+import com.c2kernel.entity.imports.ImportOutcome;
 import com.c2kernel.entity.proxy.AgentProxy;
 import com.c2kernel.entity.proxy.ItemProxy;
-import com.c2kernel.lifecycle.instance.predefined.entitycreation.Dependency;
-import com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember;
-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;
@@ -28,7 +28,7 @@ public class Module {
 	public ModuleImports imports = new ModuleImports();
 	public ArrayList<ModuleConfig> config = new ArrayList<ModuleConfig>();
 	public ArrayList<ModuleScript> scripts = new ArrayList<ModuleScript>();
-	public NewItem moduleItem;
+	public ImportItem moduleItem;
     
 	public Module() {
 		super();
@@ -52,7 +52,7 @@ public class Module {
 	}
 	
 	public void addModuleItem(String moduleXML) {
-		NewItem moduleItem = new NewItem(name, "/desc/modules/", "NoWorkflow", 0);
+		ImportItem moduleItem = new ImportItem(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));
@@ -60,15 +60,15 @@ public class Module {
 		moduleItem.properties.add(new com.c2kernel.property.Property("Layer", String.valueOf(info.layer), true));
 		moduleItem.properties.add(new com.c2kernel.property.Property("Version", info.version, true));
 		// Add dependency for all children
-		Dependency children = new Dependency("Contents");
+		ImportDependency children = new ImportDependency("Contents");
 		for (ModuleImport thisImport : imports.list) {
 			DomainPath path = thisImport.path;
 			if (path != null)
-			children.dependencyMemberList.add(new DependencyMember(path.toString()));
+			children.dependencyMemberList.add(new ImportDependencyMember(path.toString()));
 		}
 		moduleItem.dependencyList.add(children);
 		// Add moduleXML
-		Outcome moduleOutcome = new Outcome("Module", 0, "last", null);
+		ImportOutcome moduleOutcome = new ImportOutcome("Module", 0, "last", null);
 		moduleOutcome.data = moduleXML;
 		moduleItem.outcomes.add(moduleOutcome);
 		imports.list.add(moduleItem);
@@ -87,7 +87,7 @@ public class Module {
 			}
 		}
 
-		for (NewRole thisRole : imports.getRoles()) {
+		for (ImportRole thisRole : imports.getRoles()) {
 			RolePath rolePath;
 			try {
 				rolePath = Gateway.getLookup().getRolePath(thisRole.name);
@@ -101,7 +101,7 @@ public class Module {
 			}
 		}
 		
-		for (NewAgent thisAgent : imports.getAgents()) {
+		for (ImportAgent thisAgent : imports.getAgents()) {
 			try {
 				Gateway.getLookup().getAgentPath(thisAgent.name);
 			    Logger.msg(3, "Module.importAll() - User '"+thisAgent.name+"' found.");
@@ -111,7 +111,7 @@ public class Module {
 			thisAgent.create(systemAgentId);
 		}
 		
-		for (NewItem thisItem : imports.getItems()) {
+		for (ImportItem thisItem : imports.getItems()) {
 			thisItem.setNamespace(ns);
 			thisItem.create(systemAgentId, reset);
 		}
-- 
cgit v1.2.3