diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-06-02 16:52:49 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-06-02 16:52:49 +0200 |
| commit | 28f6763508612fadcc34d87cff383e6a5aef2ad6 (patch) | |
| tree | 2e3e7b6978fc127c19b0189eeca515284521d1e6 | |
| parent | b96dd998d6c442be19c342399839896d00d4b6f5 (diff) | |
more
| -rw-r--r-- | src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/Gateway.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/auth/Authenticator.java | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java b/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java index dcda13b..20d16c3 100644 --- a/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java +++ b/src/main/java/com/c2kernel/lookup/ldap/LDAPAuthManager.java @@ -15,8 +15,8 @@ public class LDAPAuthManager implements Authenticator { @Override
- public boolean authenticate(String resource, String agentName,
- String password) throws InvalidDataException, ObjectNotFoundException {
+ public boolean authenticate(String agentName,
+ String password, String resource) throws InvalidDataException, ObjectNotFoundException {
ldapProps = new LDAPProperties(Gateway.getProperties());
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index 9fe51a0..0c97a77 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -153,6 +153,9 @@ public class Gateway // check top level directory contexts
mLookup.initializeDirectory();
+ // init next key manager
+ mNextKeyManager = (NextKeyManager)mC2KProps.getInstance("NextKeyManager");
+
// start entity proxy server
mProxyServer = new ProxyServer(mC2KProps.getProperty("ItemServer.name"));
@@ -230,7 +233,7 @@ public class Gateway * @throws IllegalAccessException
* @throws InstantiationException
*/
- static public AgentProxy connect(String resource, String agentName, String agentPassword)
+ static public AgentProxy connect(String agentName, String agentPassword, String resource)
throws InvalidDataException, ObjectNotFoundException, ClusterStorageException, InstantiationException, IllegalAccessException, ClassNotFoundException
{
Authenticator auth = (Authenticator)mC2KProps.getInstance("Authenticator");
diff --git a/src/main/java/com/c2kernel/process/auth/Authenticator.java b/src/main/java/com/c2kernel/process/auth/Authenticator.java index 61986a6..40defc4 100644 --- a/src/main/java/com/c2kernel/process/auth/Authenticator.java +++ b/src/main/java/com/c2kernel/process/auth/Authenticator.java @@ -6,7 +6,7 @@ import com.c2kernel.common.ObjectNotFoundException; public interface Authenticator {
- public boolean authenticate(String resource, String agentName, String password) throws InvalidDataException, ObjectNotFoundException;
+ public boolean authenticate(String agentName, String password, String resource) throws InvalidDataException, ObjectNotFoundException;
public boolean authenticate(String resource) throws InvalidDataException, ObjectNotFoundException;
|