[jboss-cvs] JBossAS SVN: r103074 - in trunk: server/src/main/java/org/jboss/web and 1 other directories.

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

Author: sguilhen at redhat.com
Date: 2010-03-26 20:06:30 -0400 (Fri, 26 Mar 2010)
New Revision: 103074

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/main/java/org/jboss/web/WebPermissionMapping.java
   trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java
Log:
JBEE-33: Upgraded JACC 1.4 API version

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-03-26 23:16:09 UTC (rev 103073)
+++ trunk/component-matrix/pom.xml	2010-03-27 00:06:30 UTC (rev 103074)
@@ -1132,7 +1132,7 @@
       <dependency>
         <groupId>org.jboss.spec.javax.security.jacc</groupId>
         <artifactId>jboss-jacc-api_1.4_spec</artifactId>
-        <version>${version.org.jboss.spec.javaee}</version>
+        <version>1.0.0.Beta2</version>
       </dependency>
 
       <dependency>

Modified: trunk/server/src/main/java/org/jboss/web/WebPermissionMapping.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/WebPermissionMapping.java	2010-03-26 23:16:09 UTC (rev 103073)
+++ trunk/server/src/main/java/org/jboss/web/WebPermissionMapping.java	2010-03-27 00:06:30 UTC (rev 103074)
@@ -740,7 +740,7 @@
             StringBuffer tmp = new StringBuffer(pattern);
             for(int n = 0; n < qualifiers.size(); n ++)
             {
-               tmp.append("%3A"); // JACC 1.4: colons must be escaped.
+               tmp.append(":");
                PatternInfo info = (PatternInfo) qualifiers.get(n);
                tmp.append(info.pattern);
             }

Modified: trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java	2010-03-26 23:16:09 UTC (rev 103073)
+++ trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java	2010-03-27 00:06:30 UTC (rev 103074)
@@ -89,7 +89,7 @@
    private void checkUncheckedPermissions(Permissions p)
    {
       assertTrue(p.implies(new WebResourcePermission("/sslprotected.jsp", "!GET,POST")));
-      assertTrue(p.implies(new WebResourcePermission("/%3A/secured.jsp%3A/unchecked.jsp%3A/excluded.jsp%3A/sslprotected.jsp",
+      assertTrue(p.implies(new WebResourcePermission("/:/secured.jsp:/unchecked.jsp:/excluded.jsp:/sslprotected.jsp",
             (String) null)));
       assertTrue(p.implies(new WebResourcePermission("/excluded.jsp", "!GET,POST")));
       assertTrue(p.implies(new WebResourcePermission("/secured.jsp", "!GET,POST")));
@@ -99,7 +99,7 @@
       assertTrue(p.implies(new WebUserDataPermission("/excluded.jsp", "!GET,POST")));
       assertTrue(p.implies(new WebUserDataPermission("/sslprotected.jsp", "!GET,POST")));
       assertTrue(p.implies(new WebUserDataPermission("/secured.jsp", (String) null)));
-      assertTrue(p.implies(new WebUserDataPermission("/%3A/unchecked.jsp%3A/secured.jsp%3A/sslprotected.jsp%3A/excluded.jsp",
+      assertTrue(p.implies(new WebUserDataPermission("/:/unchecked.jsp:/secured.jsp:/sslprotected.jsp:/excluded.jsp",
             (String) null)));
       assertTrue(p.implies(new WebUserDataPermission("/unchecked.jsp", (String) null)));
    }