The changes are to deal with changes made to the identity abstraction
that were keeping us from building cleanly.
This commit is contained in:
parent
245d0fe0bf
commit
429f5e4297
@ -118,7 +118,7 @@ AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar:$(AXIS_JARS_DIR)/saaj.jar:$(AXIS_JARS_DIR)
|
|||||||
#AXIS_LIBS = $(AXIS_JARS_DIR)/wss4j-1.5.0.jar
|
#AXIS_LIBS = $(AXIS_JARS_DIR)/wss4j-1.5.0.jar
|
||||||
|
|
||||||
LIBS = /usr/share/java/servletapi5.jar:/usr/share/java/xerces-j2.jar
|
LIBS = /usr/share/java/servletapi5.jar:/usr/share/java/xerces-j2.jar
|
||||||
CLASSPATH = $(AXIS_LIBS):$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(LIBS)
|
CLASSPATH = $(AXIS_LIBS):$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util.jar:$(IDENT_ABSTRACTION_DIR)/bandit-util-0.2.270.jar:$(LIBS)
|
||||||
|
|
||||||
CUR_DIR := $(shell pwd)
|
CUR_DIR := $(shell pwd)
|
||||||
|
|
||||||
|
@ -42,6 +42,7 @@ import org.xml.sax.XMLReader;
|
|||||||
import org.xml.sax.helpers.XMLReaderFactory;
|
import org.xml.sax.helpers.XMLReaderFactory;
|
||||||
|
|
||||||
import org.bandit.ia.IAContext;
|
import org.bandit.ia.IAContext;
|
||||||
|
import org.bandit.util.config.Realm;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CasaIdentityToken Class.
|
* CasaIdentityToken Class.
|
||||||
@ -552,8 +553,8 @@ public class CasaIdentityToken implements IdentityToken
|
|||||||
// Open a directory context and use it to read the identity attributes.
|
// Open a directory context and use it to read the identity attributes.
|
||||||
Hashtable env = new Hashtable();
|
Hashtable env = new Hashtable();
|
||||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||||
env.put(IAContext.IA_REALM_CONFIG_LOCATION, svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
env.put(Realm.REALM_CONFIG_LOCATION, svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||||
env.put(IAContext.IA_REALM_SELECTOR, sourceName);
|
env.put(Realm.REALM_SELECTOR, sourceName);
|
||||||
|
|
||||||
DirContext ctx = new InitialDirContext(env);
|
DirContext ctx = new InitialDirContext(env);
|
||||||
|
|
||||||
|
@ -49,6 +49,7 @@ import org.ietf.jgss.GSSName;
|
|||||||
import org.ietf.jgss.Oid;
|
import org.ietf.jgss.Oid;
|
||||||
|
|
||||||
import org.bandit.ia.IAContext;
|
import org.bandit.ia.IAContext;
|
||||||
|
import org.bandit.util.config.Realm;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Krb5Authenticate Class.
|
* Krb5Authenticate Class.
|
||||||
@ -195,8 +196,8 @@ public class Krb5Authenticate implements AuthMechanism, Serializable
|
|||||||
// associated with the specified surname.
|
// associated with the specified surname.
|
||||||
Hashtable env = new Hashtable();
|
Hashtable env = new Hashtable();
|
||||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||||
env.put(IAContext.IA_REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||||
env.put(IAContext.IA_REALM_SELECTOR, authReqMsg.getRealm());
|
env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
|
||||||
|
|
||||||
DirContext ctx = new InitialDirContext(env);
|
DirContext ctx = new InitialDirContext(env);
|
||||||
|
|
||||||
|
@ -44,6 +44,7 @@ import javax.naming.directory.SearchControls;
|
|||||||
import javax.naming.NamingException;
|
import javax.naming.NamingException;
|
||||||
|
|
||||||
import org.bandit.ia.IAContext;
|
import org.bandit.ia.IAContext;
|
||||||
|
import org.bandit.util.config.Realm;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -138,8 +139,8 @@ public class PwdAuthenticate implements AuthMechanism, Serializable
|
|||||||
// associated with the specified surname.
|
// associated with the specified surname.
|
||||||
Hashtable env = new Hashtable();
|
Hashtable env = new Hashtable();
|
||||||
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||||
env.put(IAContext.IA_REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||||
env.put(IAContext.IA_REALM_SELECTOR, authReqMsg.getRealm());
|
env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
|
||||||
|
|
||||||
DirContext ctx = new InitialDirContext(env);
|
DirContext ctx = new InitialDirContext(env);
|
||||||
|
|
||||||
@ -177,8 +178,8 @@ public class PwdAuthenticate implements AuthMechanism, Serializable
|
|||||||
{
|
{
|
||||||
Hashtable env2 = new Hashtable();
|
Hashtable env2 = new Hashtable();
|
||||||
env2.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
env2.put(Context.INITIAL_CONTEXT_FACTORY, "org.bandit.ia.IAInitialCtxFactory");
|
||||||
env2.put(IAContext.IA_REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
env2.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
|
||||||
env2.put(IAContext.IA_REALM_SELECTOR, authReqMsg.getRealm());
|
env2.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
|
||||||
env2.put(Context.SECURITY_AUTHENTICATION, "simple");
|
env2.put(Context.SECURITY_AUTHENTICATION, "simple");
|
||||||
env2.put(Context.SECURITY_PRINCIPAL, sr.getNameInNamespace());
|
env2.put(Context.SECURITY_PRINCIPAL, sr.getNameInNamespace());
|
||||||
env2.put(Context.SECURITY_CREDENTIALS, pwToken.getPassword());
|
env2.put(Context.SECURITY_CREDENTIALS, pwToken.getPassword());
|
||||||
|
Loading…
Reference in New Issue
Block a user