[jboss-cvs] Picketbox SVN: r176 - in trunk/security-jboss-sx/jbosssx/src: main/java/org/jboss/security/config/parser and 1 other directories.

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

Author: mmoyses
Date: 2011-03-18 20:52:10 -0400 (Fri, 18 Mar 2011)
New Revision: 176

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/SecurityUtil.java
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/ApplicationPolicyParser.java
   trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/UtilTestCase.java
Log:
changing context from java:/jaas to java:jboss/jaas/ for AS7

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/SecurityUtil.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/SecurityUtil.java	2011-03-19 00:49:41 UTC (rev 175)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/SecurityUtil.java	2011-03-19 00:52:10 UTC (rev 176)
@@ -59,9 +59,9 @@
       if (securityDomain != null)
       {
          if (securityDomain.startsWith(SecurityConstants.JAAS_CONTEXT_ROOT))
-            result = securityDomain.substring(SecurityConstants.JAAS_CONTEXT_ROOT.length() + 1);
+            result = securityDomain.substring(SecurityConstants.JAAS_CONTEXT_ROOT.length());
          else if (securityDomain.startsWith(SecurityConstants.JASPI_CONTEXT_ROOT))
-            result = securityDomain.substring(SecurityConstants.JASPI_CONTEXT_ROOT.length() + 1);
+            result = securityDomain.substring(SecurityConstants.JASPI_CONTEXT_ROOT.length());
          else
             result = securityDomain;
       }

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/ApplicationPolicyParser.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/ApplicationPolicyParser.java	2011-03-19 00:49:41 UTC (rev 175)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/parser/ApplicationPolicyParser.java	2011-03-19 00:52:10 UTC (rev 176)
@@ -273,7 +273,7 @@
             case AUTHENTICATION : {
                AuthenticationConfigParser parser = new AuthenticationConfigParser();
                Set<AppConfigurationEntry> entries = parser.parse(reader);
-               AuthenticationInfo authInfo = new AuthenticationInfo();
+               AuthenticationInfo authInfo = new AuthenticationInfo(appPolicy.getName());
                authInfo.setAppConfigurationEntry(new ArrayList(entries));
                appPolicy.setAuthenticationInfo(authInfo);
                break;

Modified: trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/UtilTestCase.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/UtilTestCase.java	2011-03-19 00:49:41 UTC (rev 175)
+++ trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/UtilTestCase.java	2011-03-19 00:52:10 UTC (rev 176)
@@ -76,8 +76,8 @@
    public void testUnPrefixSecurityDomain() throws Exception
    {
       assertEquals("sd==sd", "sd", SecurityUtil.unprefixSecurityDomain("sd"));
-      assertEquals("java:/jaas/sd==sd","sd",  SecurityUtil.unprefixSecurityDomain("java:/jaas/sd"));
-      assertEquals("java:/jbsx/sd==sd","sd",  SecurityUtil.unprefixSecurityDomain("java:/jbsx/sd"));
+      assertEquals("java:jboss/jaas/sd==sd","sd",  SecurityUtil.unprefixSecurityDomain("java:jboss/jaas/sd"));
+      assertEquals("java:jboss/jbsx/sd==sd","sd",  SecurityUtil.unprefixSecurityDomain("java:jboss/jbsx/sd"));
    }
 
    public static void main(java.lang.String[] args)