From b96dd998d6c442be19c342399839896d00d4b6f5 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 2 Jun 2014 11:31:08 +0200
Subject: Initial commit

---
 src/main/java/com/c2kernel/process/module/Module.java       | 6 +++---
 src/main/java/com/c2kernel/process/module/ModuleScript.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java
index 2c182ea..9c52fee 100644
--- a/src/main/java/com/c2kernel/process/module/Module.java
+++ b/src/main/java/com/c2kernel/process/module/Module.java
@@ -75,7 +75,7 @@ public class Module {
 	
 	public void importAll(ItemProxy serverEntity, String moduleXML, boolean reset) throws Exception {
 		addModuleItem(moduleXML);
-		int systemAgentId = Gateway.getLDAPLookup().getRoleManager().getAgentPath("system").getSysKey();
+		int systemAgentId = Gateway.getLookup().getAgentPath("system").getSysKey();
 		
 		for (ModuleResource thisRes : imports.getResources()) {
 			try {
@@ -89,7 +89,7 @@ public class Module {
 		for (NewRole thisRole : imports.getRoles()) {
 			RolePath rolePath;
 			try {
-				rolePath = Gateway.getLDAPLookup().getRoleManager().getRolePath(thisRole.name);
+				rolePath = Gateway.getLookup().getRolePath(thisRole.name);
 				if (rolePath.hasJobList() != thisRole.jobList) {
 					Logger.msg("Module.importAll() - Role '"+thisRole.name+"' has incorrect joblist settings. Correcting.");
 					rolePath.setHasJobList(thisRole.jobList);
@@ -102,7 +102,7 @@ public class Module {
 		
 		for (NewAgent thisAgent : imports.getAgents()) {
 			try {
-				Gateway.getLDAPLookup().getRoleManager().getAgentPath(thisAgent.name);
+				Gateway.getLookup().getAgentPath(thisAgent.name);
 			    Logger.msg(3, "Module.importAll() - User '"+thisAgent.name+"' found.");
 			    continue;
 			 } catch (ObjectNotFoundException ex) { }
diff --git a/src/main/java/com/c2kernel/process/module/ModuleScript.java b/src/main/java/com/c2kernel/process/module/ModuleScript.java
index beed6f9..e948996 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleScript.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleScript.java
@@ -27,7 +27,7 @@ public class ModuleScript {
 		AgentProxy user = Gateway.getCurrentUser();
         try {
         	if (user == null) user = (AgentProxy)Gateway.getProxyManager().getProxy(
-        		Gateway.getLDAPLookup().getRoleManager().getAgentPath("system"));
+        		Gateway.getLookup().getAgentPath("system"));
     		} catch (Exception ex) {
     			throw new ScriptingEngineException("System agent unavailable");
     		}
-- 
cgit v1.2.3