From d4fa3bd9dd48f4d5e26850a23f5ba48a9c10ad64 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 5 Jun 2014 15:02:07 +0200
Subject: LDAP refactored behind interfaces. All functions of LDAP now hidden
 behind interfaces: Authenticator, Lookup and NextKeyManager (LDAP property
 storage was already a ClusterStorage). Gateway holds additional objects, and
 Fixes #26 #191. Refs #27 (needs additional work for read perms and auth
 tokens)

---
 .../java/com/c2kernel/entity/transfer/TransferItem.java    | 14 +++++++-------
 .../java/com/c2kernel/entity/transfer/TransferSet.java     |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main/java/com/c2kernel/entity/transfer')

diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
index df81721..9a4cfc5 100644
--- a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
+++ b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
@@ -2,7 +2,7 @@ package com.c2kernel.entity.transfer;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Enumeration;
+import java.util.Iterator;
 
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.C2KLocalObject;
@@ -26,7 +26,7 @@ public class TransferItem {
 
     public TransferItem() throws Exception {
         try {
-            importAgentId = Gateway.getLDAPLookup().getRoleManager().getAgentPath("system").getSysKey();
+            importAgentId = Gateway.getLookup().getAgentPath("system").getSysKey();
         } catch (ObjectNotFoundException e) {
             Logger.error("TransferItem - System user not found!");
             throw e;
@@ -37,9 +37,9 @@ public class TransferItem {
         this.sysKey = sysKey;
         domainPaths = new ArrayList<String>();
         Property name = (Property)Gateway.getStorage().get(sysKey, ClusterStorage.PROPERTY + "/Name", null);
-        Enumeration<Path> paths = Gateway.getLDAPLookup().search(new DomainPath(), name.getValue());
-        while (paths.hasMoreElements()) {
-            DomainPath thisPath = (DomainPath)paths.nextElement();
+        Iterator<Path> paths = Gateway.getLookup().search(new DomainPath(), name.getValue());
+        while (paths.hasNext()) {
+            DomainPath thisPath = (DomainPath)paths.next();
             domainPaths.add(thisPath.toString());
         }
     }
@@ -91,7 +91,7 @@ public class TransferItem {
         // create item
         ItemPath entityPath = new ItemPath(sysKey);
         TraceableEntity newItem = (TraceableEntity)Gateway.getCorbaServer().createEntity(entityPath);
-        Gateway.getLDAPLookup().add(entityPath);
+        Gateway.getLookup().add(entityPath);
 
         PropertyArrayList props = new PropertyArrayList();
         Workflow wf = null;
@@ -121,7 +121,7 @@ public class TransferItem {
         // add domPaths
         for (String element : domainPaths) {
             DomainPath newPath = new DomainPath(element, entityPath);
-            Gateway.getLDAPLookup().add(newPath);
+            Gateway.getLookup().add(newPath);
         }
     }
 
diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferSet.java b/src/main/java/com/c2kernel/entity/transfer/TransferSet.java
index a7d81b6..7a5833f 100644
--- a/src/main/java/com/c2kernel/entity/transfer/TransferSet.java
+++ b/src/main/java/com/c2kernel/entity/transfer/TransferSet.java
@@ -4,7 +4,7 @@ import java.io.File;
 import java.util.ArrayList;
 
 import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.NextKeyManager;
+import com.c2kernel.persistency.NextKeyManager;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.FileStringUtility;
 import com.c2kernel.utils.Logger;
@@ -84,7 +84,7 @@ public class TransferSet {
 
         try
         {   // find the current last key
-            NextKeyManager nextKeyMan = Gateway.getLDAPLookup().getNextKeyManager();
+            NextKeyManager nextKeyMan = Gateway.getNextKeyManager();
             ItemPath lastKey = nextKeyMan.getLastEntityPath();
             Logger.msg(1, "Last key imported was "+packageLastKey+". LDAP lastkey was "+lastKey.getSysKey());
 
-- 
cgit v1.2.3