[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/security SecurityInitializer.java

[djencks]

djencks     2005/11/14 22:59:32

  Modified:    modules/core/src/java/org/openejb/corba/security
                        SecurityInitializer.java
  Log:

  GERONIMO-1172.  Use configuration classloader to load principals.  Also 
rename our principal info classes to avoid name conflict with 
java.security.Principal
  
  Revision  Changes    Path
  1.9       +11 -8     
openejb/modules/core/src/java/org/openejb/corba/security/SecurityInitializer.java
  
  Index: SecurityInitializer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/security/SecurityInitializer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SecurityInitializer.java  27 Oct 2005 19:10:12 -0000      1.8
  +++ SecurityInitializer.java  15 Nov 2005 03:59:32 -0000      1.9
  @@ -74,6 +74,9 @@
       public final static String DEFAULT_DOMAIN_PRINCIPAL = 
"default-domain-principal::";
       public final static String DEFAULT_PRINCIPAL = "default-principal::";
   
  +    //TODO see if there is a better way... TCCL??
  +    private final ClassLoader classLoader = this.getClass().getClassLoader();
  +
       public SecurityInitializer() {
           if (log.isDebugEnabled()) log.debug("SecurityInitializer.<init>");
       }
  @@ -163,13 +166,13 @@
               throw new GeronimoSecurityException("Unable to create primary 
realm principal");
           }
   
  -        RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(realm, domain, className, 
principalName);
  +        RealmPrincipal realmPrincipal = 
ConfigurationUtil.generateRealmPrincipal(realm, domain, className, 
principalName, classLoader);
           if (realmPrincipal == null) {
               throw new GeronimoSecurityException("Unable to create realm 
principal");
           }
           PrimaryRealmPrincipal primaryRealmPrincipal = null;
           try {
  -            primaryRealmPrincipal = 
ConfigurationUtil.generatePrimaryRealmPrincipal(realm, domain, className, 
principalName);
  +            primaryRealmPrincipal = 
ConfigurationUtil.generatePrimaryRealmPrincipal(realm, domain, className, 
principalName, classLoader);
           } catch (DeploymentException e) {
               throw new GeronimoSecurityException("Unable to create primary 
realm principal", e);
           }
  @@ -194,13 +197,13 @@
               throw new GeronimoSecurityException("Unable to create primary 
domain principal");
           }
   
  -        DomainPrincipal domainPrincipal = 
ConfigurationUtil.generateDomainPrincipal(realm, className, principalName);
  +        DomainPrincipal domainPrincipal = 
ConfigurationUtil.generateDomainPrincipal(realm, className, principalName, 
classLoader);
           if (domainPrincipal == null) {
               throw new GeronimoSecurityException("Unable to create domain 
principal");
           }
           PrimaryDomainPrincipal primaryDomainPrincipal = null;
           try {
  -            primaryDomainPrincipal = 
ConfigurationUtil.generatePrimaryDomainPrincipal(realm, className, 
principalName);
  +            primaryDomainPrincipal = 
ConfigurationUtil.generatePrimaryDomainPrincipal(realm, className, 
principalName, classLoader);
           } catch (DeploymentException e) {
               throw new GeronimoSecurityException("Unable to create primary 
domain principal", e);
           }
  @@ -224,13 +227,13 @@
               throw new GeronimoSecurityException("Unable to create primary 
principal");
           }
   
  -        Principal domainPrincipal = 
ConfigurationUtil.generatePrincipal(className, principalName);
  +        Principal domainPrincipal = 
ConfigurationUtil.generatePrincipal(className, principalName, classLoader);
           if (domainPrincipal == null) {
               throw new GeronimoSecurityException("Unable to create 
principal");
           }
           PrimaryPrincipal primaryDomainPrincipal = null;
           try {
  -            primaryDomainPrincipal = 
ConfigurationUtil.generatePrimaryPrincipal(className, principalName);
  +            primaryDomainPrincipal = 
ConfigurationUtil.generatePrimaryPrincipal(className, principalName, 
classLoader);
           } catch (DeploymentException e) {
               throw new GeronimoSecurityException("Unable to create primary 
principal", e);
           }