[jboss-cvs] JBossAS SVN: r62650 - in projects/security/security-jboss-sx/trunk/src: tests/org/jboss/test and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2007-04-30 13:10:11 -0400 (Mon, 30 Apr 2007)
New Revision: 62650

Modified:
   projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/Util.java
   projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/UtilTestCase.java
Log:
fix the util unprefix security domain

Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/Util.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/Util.java	2007-04-30 16:50:32 UTC (rev 62649)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/Util.java	2007-04-30 17:10:11 UTC (rev 62650)
@@ -611,11 +611,13 @@
       String result = null;
       if(securityDomain != null)
       {
-         if(securityDomain.startsWith("java:/jaas"))
-            result = securityDomain.substring("java:/jaas/".length());
+         if(securityDomain.startsWith(SecurityConstants.JAAS_CONTEXT_ROOT))
+            result = securityDomain.substring(SecurityConstants.JAAS_CONTEXT_ROOT.length() + 1);
          else
-            if(securityDomain.startsWith("java:/jbsx"))
-               result = securityDomain.substring("java:/jbsx/".length()); 
+            if(securityDomain.startsWith(SecurityConstants.JASPI_CONTEXT_ROOT))
+               result = securityDomain.substring(SecurityConstants.JASPI_CONTEXT_ROOT.length() + 1); 
+            else
+               result = securityDomain;
       } 
       return result;
       

Modified: projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/UtilTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/UtilTestCase.java	2007-04-30 16:50:32 UTC (rev 62649)
+++ projects/security/security-jboss-sx/trunk/src/tests/org/jboss/test/UtilTestCase.java	2007-04-30 17:10:11 UTC (rev 62650)
@@ -69,6 +69,13 @@
       System.out.println("b16_2 = "+b16_2);
       super.assertEquals("encodeBase16 == BigInteger", b16_1, b16_2);
    }
+   
+   public void testUnPrefixSecurityDomain() throws Exception
+   {
+      assertEquals("sd==sd", "sd",Util.unprefixSecurityDomain("sd"));
+      assertEquals("java:/jaas/sd==sd","sd", Util.unprefixSecurityDomain("java:/jaas/sd"));
+      assertEquals("java:/jbsx/sd==sd","sd", Util.unprefixSecurityDomain("java:/jbsx/sd"));
+   }
 
    public static void main(java.lang.String[] args)
    {