[jboss-cvs] JBossAS SVN: r57334 - in branches/JBoss_4_0_2_CP: security/src/main/org/jboss/security/auth/login testsuite/src/main/org/jboss/test/security/test testsuite/src/resources/security testsuite/src/resources/security/dynamicloginconfig

[jboss-cvs-commits at lists.jboss.org]

Author: ryan.campbell at jboss.com
Date: 2006-10-01 19:35:59 -0400 (Sun, 01 Oct 2006)
New Revision: 57334

Added:
   branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java
   branches/JBoss_4_0_2_CP/testsuite/src/resources/security/dynamicloginconfig/
   branches/JBoss_4_0_2_CP/testsuite/src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml
Removed:
   branches/JBoss_4_0_2_CP/testsuite/src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml
Modified:
   branches/JBoss_4_0_2_CP/security/src/main/org/jboss/security/auth/login/DynamicLoginConfig.java
Log:
ASPATCH-40: JBAS-3211: DynamicLoginConfig service fails absolute login-config.xml url

Modified: branches/JBoss_4_0_2_CP/security/src/main/org/jboss/security/auth/login/DynamicLoginConfig.java
===================================================================
--- branches/JBoss_4_0_2_CP/security/src/main/org/jboss/security/auth/login/DynamicLoginConfig.java	2006-10-01 23:28:47 UTC (rev 57333)
+++ branches/JBoss_4_0_2_CP/security/src/main/org/jboss/security/auth/login/DynamicLoginConfig.java	2006-10-01 23:35:59 UTC (rev 57334)
@@ -136,6 +136,17 @@
       // Look for the authConf as resource
       ClassLoader loader = Thread.currentThread().getContextClassLoader();
       URL loginConfig = loader.getResource(authConf);
+      if(loginConfig == null)
+      {
+         try
+         {
+             //JBAS-3120: Allow an absolute url
+             loginConfig = new URL(authConf);
+         }catch(Exception e)
+         {
+             loginConfig = null;
+         }
+      } 
       if( loginConfig != null )
       {
          log.debug("Using JAAS AuthConfig: "+loginConfig.toExternalForm());

Copied: branches/JBoss_4_0_2_CP/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java (from rev 57332, branches/JBoss_4_0_2_JBAS-3211/testsuite/src/main/org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.java)

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/security/dynamicloginconfig (from rev 57332, branches/JBoss_4_0_2_JBAS-3211/testsuite/src/resources/security/dynamicloginconfig)

Deleted: branches/JBoss_4_0_2_CP/testsuite/src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml
===================================================================
--- branches/JBoss_4_0_2_JBAS-3211/testsuite/src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml	2006-10-01 23:12:38 UTC (rev 57332)
+++ branches/JBoss_4_0_2_CP/testsuite/src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml	2006-10-01 23:35:59 UTC (rev 57334)
@@ -1,18 +0,0 @@
-<server>
-   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
-      name="jboss:service=TestDynamicLoginConfig"> 
-      <!-- The service which supports dynamic processing of login-config.xml
-         configurations.
-      -->
-      <depends optional-attribute-name="LoginConfigService">
-         jboss.security:service=XMLLoginConfig
-      </depends>
-      <!-- Optionally specify the security mgr service to use when
-         this service is stopped to flush the auth caches of the domains
-         registered by this service.
-      -->
-      <depends optional-attribute-name="SecurityManagerService">
-         jboss.security:service=JaasSecurityManager
-      </depends>
-   </mbean>
-</server>

Copied: branches/JBoss_4_0_2_CP/testsuite/src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml (from rev 57332, branches/JBoss_4_0_2_JBAS-3211/testsuite/src/resources/security/dynamicloginconfig/dynamicloginconfig-service.xml)