14 files changed, 79 insertions, 77 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java b/src/main/java/com/c2kernel/entity/imports/Geometry.java
index f18b6d4..cb973d3 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java
+++ b/src/main/java/com/c2kernel/entity/imports/Geometry.java
@@ -1,6 +1,6 @@
 
 
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 
 
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java b/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
index 10e5e6f..26e3325 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
@@ -1,4 +1,4 @@
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
@@ -16,17 +16,17 @@ import com.c2kernel.property.Property;
 import com.c2kernel.property.PropertyArrayList;
 import com.c2kernel.utils.Logger;
 
-public class NewAgent extends ModuleImport implements java.io.Serializable {
+public class ImportAgent extends ModuleImport implements java.io.Serializable {
 
     public String password;
 
     public ArrayList<String> roles = new ArrayList<String>();
     public ArrayList<Property> properties  = new ArrayList<Property>();
 
-    public NewAgent() {
+    public ImportAgent() {
     }
 
-    public NewAgent(String name, String password) {
+    public ImportAgent(String name, String password) {
         this.name = name;
         this.password = password;
     }
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java b/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java
index 40e0604..1c75990 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java
@@ -1,4 +1,4 @@
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 import java.util.ArrayList;
 
@@ -10,17 +10,17 @@ import com.c2kernel.property.PropertyDescription;
 import com.c2kernel.property.PropertyDescriptionList;
 import com.c2kernel.property.PropertyUtility;
 
-public class Aggregation implements java.io.Serializable {
+public class ImportAggregation implements java.io.Serializable {
 
     public boolean isDescription;
-    public ArrayList<AggregationMember> aggregationMemberList = new ArrayList<AggregationMember>();
+    public ArrayList<ImportAggregationMember> aggregationMemberList = new ArrayList<ImportAggregationMember>();
     public String name;
 
-    public Aggregation() {
+    public ImportAggregation() {
         super();
     }
 
-    public Aggregation(String name, boolean isDescription) {
+    public ImportAggregation(String name, boolean isDescription) {
         this();
         this.name = name;
         this.isDescription = isDescription;
@@ -29,7 +29,7 @@ public class Aggregation implements java.io.Serializable {
 	public com.c2kernel.collection.Aggregation create() throws MembershipException, ObjectNotFoundException {
         com.c2kernel.collection.Aggregation newAgg = isDescription?new com.c2kernel.collection.AggregationDescription(name):new com.c2kernel.collection.AggregationInstance(name);
         newAgg.setName(name);
-        for (AggregationMember thisMem : aggregationMemberList) {
+        for (ImportAggregationMember thisMem : aggregationMemberList) {
             StringBuffer classProps = new StringBuffer();
             if (thisMem.itemDescriptionPath != null && thisMem.itemDescriptionPath.length()>0) {
                  PropertyDescriptionList propList = PropertyUtility.getPropertyDescriptionOutcome(new DomainPath(thisMem.itemDescriptionPath).getSysKey());
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java b/src/main/java/com/c2kernel/entity/imports/ImportAggregationMember.java
index 82c0437..7a1cf21 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportAggregationMember.java
@@ -1,9 +1,9 @@
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 import com.c2kernel.utils.CastorHashMap;
 import com.c2kernel.utils.KeyValuePair;
 
-public class AggregationMember implements java.io.Serializable {
+public class ImportAggregationMember implements java.io.Serializable {
 
     public int slotNo;
     public String itemDescriptionPath;
@@ -12,11 +12,11 @@ public class AggregationMember implements java.io.Serializable {
     public CastorHashMap props = new CastorHashMap();
 
 
-    public AggregationMember() {
+    public ImportAggregationMember() {
         super();
     }
 
-    public AggregationMember(int slotNo, String itemDescPath, String itemPath, Geometry geometry) {
+    public ImportAggregationMember(int slotNo, String itemDescPath, String itemPath, Geometry geometry) {
         this.slotNo = slotNo;
         this.itemDescriptionPath = itemDescPath;
         this.itemPath = itemPath;
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java b/src/main/java/com/c2kernel/entity/imports/ImportDependency.java
index b3be9d1..e6ce909 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportDependency.java
@@ -1,4 +1,4 @@
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 import java.util.ArrayList;
 
@@ -11,19 +11,19 @@ import com.c2kernel.property.PropertyUtility;
 import com.c2kernel.utils.CastorHashMap;
 import com.c2kernel.utils.KeyValuePair;
 
-public class Dependency implements java.io.Serializable {
+public class ImportDependency implements java.io.Serializable {
 
     public String name;
     public boolean isDescription;
     public String itemDescriptionPath;
-    public ArrayList<DependencyMember> dependencyMemberList = new ArrayList<DependencyMember>();
+    public ArrayList<ImportDependencyMember> dependencyMemberList = new ArrayList<ImportDependencyMember>();
     public CastorHashMap props = new CastorHashMap();
 
-    public Dependency() {
+    public ImportDependency() {
         super();
     }
 
-    public Dependency(String name) {
+    public ImportDependency(String name) {
         this();
         this.name = name;
     }
@@ -53,7 +53,7 @@ public class Dependency implements java.io.Serializable {
              newDep.setClassProps(classProps.toString());
         }
 
-        for (DependencyMember thisMem : dependencyMemberList) {
+        for (ImportDependencyMember thisMem : dependencyMemberList) {
             int syskey = new DomainPath(thisMem.itemPath).getSysKey();
             if (syskey == -1)
             	throw new MembershipException("Cannot find "+thisMem.itemPath+" specified for collection.");
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java b/src/main/java/com/c2kernel/entity/imports/ImportDependencyMember.java
index 573cdc8..6fc6b5a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportDependencyMember.java
@@ -1,20 +1,20 @@
 
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 import com.c2kernel.utils.CastorHashMap;
 import com.c2kernel.utils.KeyValuePair;
 
-public class DependencyMember implements java.io.Serializable {
+public class ImportDependencyMember implements java.io.Serializable {
 
 
     public String itemPath;
     public CastorHashMap props  = new CastorHashMap();
 
-    public DependencyMember() {
+    public ImportDependencyMember() {
         super();
     }
 
-    public DependencyMember(String itemPath) {
+    public ImportDependencyMember(String itemPath) {
         this.itemPath = itemPath;
 
     }
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/src/main/java/com/c2kernel/entity/imports/ImportItem.java
index b1ef0e4..a27d88d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportItem.java
@@ -1,4 +1,4 @@
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 
 import java.util.ArrayList;
@@ -36,21 +36,21 @@ import com.c2kernel.utils.Logger;
  * @version $Revision: 1.8 $ $Date: 2006/03/03 13:52:21 $
  */
 
-public class NewItem extends ModuleImport {
+public class ImportItem extends ModuleImport {
 
     public String initialPath;
     public String workflow;
     public Integer workflowVer;
     public ArrayList<Property> properties  = new ArrayList<Property>();
-    public ArrayList<Aggregation> aggregationList = new ArrayList<Aggregation>();
-    public ArrayList<Dependency> dependencyList = new ArrayList<Dependency>();
-    public ArrayList<Outcome> outcomes = new ArrayList<Outcome>();
+    public ArrayList<ImportAggregation> aggregationList = new ArrayList<ImportAggregation>();
+    public ArrayList<ImportDependency> dependencyList = new ArrayList<ImportDependency>();
+    public ArrayList<ImportOutcome> outcomes = new ArrayList<ImportOutcome>();
     private String ns;
 
-    public NewItem() {
+    public ImportItem() {
     }
 
-    public NewItem(String name, String initialPath, String wf, int wfVer) {
+    public ImportItem(String name, String initialPath, String wf, int wfVer) {
         this();
         this.name = name;
         this.initialPath = initialPath;
@@ -101,7 +101,7 @@ public class NewItem extends ModuleImport {
         
         // create collections
         CollectionArrayList colls = new CollectionArrayList();
-        for (Dependency element: dependencyList) {
+        for (ImportDependency element: dependencyList) {
             try {
             	com.c2kernel.collection.Dependency newDep = element.create();
             	colls.put(newDep);
@@ -111,7 +111,7 @@ public class NewItem extends ModuleImport {
             }
         }
 
-        for (Aggregation element : aggregationList) {
+        for (ImportAggregation element : aggregationList) {
             try {
             	com.c2kernel.collection.Aggregation newAgg = element.create();           	
             	colls.put(newAgg);
@@ -138,7 +138,7 @@ public class NewItem extends ModuleImport {
         XMLUnit.setIgnoreWhitespace(true);
         XMLUnit.setIgnoreComments(true);
         History hist = new History(entPath.getSysKey(), null);
-        for (Outcome thisOutcome : outcomes) {
+        for (ImportOutcome thisOutcome : outcomes) {
             com.c2kernel.persistency.outcome.Outcome newOutcome = new com.c2kernel.persistency.outcome.Outcome(-1, thisOutcome.getData(ns), thisOutcome.schema, thisOutcome.version);
         	Viewpoint impView;
         	try {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Outcome.java b/src/main/java/com/c2kernel/entity/imports/ImportOutcome.java
index 1a966b5..1428483 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/Outcome.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportOutcome.java
@@ -1,16 +1,16 @@
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.process.Gateway;
 
-public class Outcome {
+public class ImportOutcome {
 	public String schema, viewname, path, data;
 	public int version;
 	
-	public Outcome() {
+	public ImportOutcome() {
 	}
 	
-	public Outcome(String schema, int version, String viewname, String path) {
+	public ImportOutcome(String schema, int version, String viewname, String path) {
 		super();
 		this.schema = schema;
 		this.version = version;
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewRole.java b/src/main/java/com/c2kernel/entity/imports/ImportRole.java
index 74415a5..8313c24 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewRole.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportRole.java
@@ -1,15 +1,15 @@
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.entity.imports;
 
 import com.c2kernel.common.ObjectAlreadyExistsException;
 import com.c2kernel.common.ObjectCannotBeUpdated;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.process.module.ModuleImport;
 
-public class NewRole extends ModuleImport {
+public class ImportRole extends ModuleImport {
 
 	public boolean jobList;
 	
-	public NewRole() {
+	public ImportRole() {
 	}
 	
 	public void create(int agentId) throws ObjectAlreadyExistsException, ObjectCannotBeUpdated {
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ServerPredefinedStepContainer.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ServerPredefinedStepContainer.java
index 667ae5d..32cf7b2 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ServerPredefinedStepContainer.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ServerPredefinedStepContainer.java
@@ -1,9 +1,9 @@
 package com.c2kernel.lifecycle.instance.predefined;
 
 import com.c2kernel.graph.model.GraphPoint;
-import com.c2kernel.lifecycle.instance.predefined.entitycreation.CreateNewAgent;
-import com.c2kernel.lifecycle.instance.predefined.entitycreation.CreateNewItem;
 import com.c2kernel.lifecycle.instance.predefined.server.AddDomainContext;
+import com.c2kernel.lifecycle.instance.predefined.server.CreateNewAgent;
+import com.c2kernel.lifecycle.instance.predefined.server.CreateNewItem;
 import com.c2kernel.lifecycle.instance.predefined.server.RemoveAgent;
 import com.c2kernel.lifecycle.instance.predefined.server.RemoveDomainContext;
 import com.c2kernel.lifecycle.instance.predefined.server.SetAgentPassword;
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
index 7715e2a..f2396da 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
@@ -5,9 +5,10 @@
  * All rights reserved.
  **************************************************************************/
 
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.lifecycle.instance.predefined.server;
 
 import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.entity.imports.ImportAgent;
 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.process.Gateway;
@@ -28,7 +29,7 @@ public class CreateNewAgent extends PredefinedStep
     	
         String redactedRequestData;
         try {
-            NewAgent newAgent = (NewAgent)Gateway.getMarshaller().unmarshall(requestData);
+            ImportAgent newAgent = (ImportAgent)Gateway.getMarshaller().unmarshall(requestData);
             newAgent.create(agent.getSysKey());
             newAgent.password = "REDACTED";
             redactedRequestData = Gateway.getMarshaller().marshall(newAgent);
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
index bddb39f..19fd80a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
@@ -5,12 +5,13 @@
  * All rights reserved.
  **************************************************************************/
 
-package com.c2kernel.lifecycle.instance.predefined.entitycreation;
+package com.c2kernel.lifecycle.instance.predefined.server;
 
 
 
 
 import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.entity.imports.ImportItem;
 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.process.Gateway;
@@ -30,7 +31,7 @@ public class CreateNewItem extends PredefinedStep
 			int transitionID, String requestData) throws InvalidDataException {
     	
         try {
-            NewItem item = (NewItem)Gateway.getMarshaller().unmarshall(requestData);
+            ImportItem item = (ImportItem)Gateway.getMarshaller().unmarshall(requestData);
             item.create(agent.getSysKey(), false);
             return requestData;
         } catch (Exception ex) {
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);
 		}
diff --git a/src/main/java/com/c2kernel/process/module/ModuleImports.java b/src/main/java/com/c2kernel/process/module/ModuleImports.java
index 5dfde42..e0ddd90 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleImports.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleImports.java
@@ -2,9 +2,9 @@ package com.c2kernel.process.module;
 
 import java.util.ArrayList;
 
-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.entity.imports.ImportAgent;
+import com.c2kernel.entity.imports.ImportItem;
+import com.c2kernel.entity.imports.ImportRole;
 import com.c2kernel.utils.CastorArrayList;
 
 public class ModuleImports extends CastorArrayList<ModuleImport> {
@@ -28,29 +28,29 @@ public class ModuleImports extends CastorArrayList<ModuleImport> {
     	return subset;
     }
     
-    public ArrayList<NewItem> getItems() {
-    	ArrayList<NewItem> subset = new ArrayList<NewItem>();
+    public ArrayList<ImportItem> getItems() {
+    	ArrayList<ImportItem> subset = new ArrayList<ImportItem>();
     	for (ModuleImport imp : list) {
-			if (imp instanceof NewItem)
-				subset.add((NewItem)imp);
+			if (imp instanceof ImportItem)
+				subset.add((ImportItem)imp);
 		}
     	return subset;
     }
     
-    public ArrayList<NewAgent> getAgents() {
-    	ArrayList<NewAgent> subset = new ArrayList<NewAgent>();
+    public ArrayList<ImportAgent> getAgents() {
+    	ArrayList<ImportAgent> subset = new ArrayList<ImportAgent>();
     	for (ModuleImport imp : list) {
-			if (imp instanceof NewAgent)
-				subset.add((NewAgent)imp);
+			if (imp instanceof ImportAgent)
+				subset.add((ImportAgent)imp);
 		}
     	return subset;
     }
     
-    public ArrayList<NewRole> getRoles() {
-    	ArrayList<NewRole> subset = new ArrayList<NewRole>();
+    public ArrayList<ImportRole> getRoles() {
+    	ArrayList<ImportRole> subset = new ArrayList<ImportRole>();
     	for (ModuleImport imp : list) {
-			if (imp instanceof NewRole)
-				subset.add((NewRole)imp);
+			if (imp instanceof ImportRole)
+				subset.add((ImportRole)imp);
 		}
     	return subset;
     }