[jboss-cvs] JBossAS SVN: r103053 - in trunk: client and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 26 12:54:17 EDT 2010
Author: sguilhen at redhat.com
Date: 2010-03-26 12:54:14 -0400 (Fri, 26 Mar 2010)
New Revision: 103053
Modified:
trunk/build/build.xml
trunk/build/pom.xml
trunk/client/pom.xml
trunk/component-matrix/pom.xml
trunk/deployment/pom.xml
trunk/profileservice/pom.xml
trunk/security/pom.xml
trunk/server/pom.xml
trunk/server/src/main/java/org/jboss/web/WebPermissionMapping.java
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java
trunk/tomcat/pom.xml
Log:
JBEE-33: upgraded JACC API in AS trunk
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/build/build.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -1877,7 +1877,7 @@
<fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar"/>
<fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
<fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
<fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
@@ -2088,7 +2088,7 @@
<fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar"/>
<fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
<fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
<fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/build/pom.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -607,7 +607,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/client/pom.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -234,7 +234,7 @@
<dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
</dependency>
<dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/component-matrix/pom.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -1131,7 +1131,7 @@
<dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
<version>${version.org.jboss.spec.javaee}</version>
</dependency>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/deployment/pom.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -206,7 +206,7 @@
<dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
</dependency>
<dependency>
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/profileservice/pom.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -221,7 +221,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.security.auth.message</groupId>
Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/security/pom.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
</dependency>
<dependency>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/server/pom.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -427,7 +427,7 @@
<dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
</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 16:39:12 UTC (rev 103052)
+++ trunk/server/src/main/java/org/jboss/web/WebPermissionMapping.java 2010-03-26 16:54:14 UTC (rev 103053)
@@ -740,7 +740,7 @@
StringBuffer tmp = new StringBuffer(pattern);
for(int n = 0; n < qualifiers.size(); n ++)
{
- tmp.append(':');
+ tmp.append("%3A"); // JACC 1.4: colons must be escaped.
PatternInfo info = (PatternInfo) qualifiers.get(n);
tmp.append(info.pattern);
}
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/testsuite/build.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -412,7 +412,7 @@
<fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar"/>
<fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
<fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
<fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
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 16:39:12 UTC (rev 103052)
+++ trunk/testsuite/src/main/org/jboss/test/jacc/test/WebPermissionsValidationTestCase.java 2010-03-26 16:54:14 UTC (rev 103053)
@@ -89,7 +89,7 @@
private void checkUncheckedPermissions(Permissions p)
{
assertTrue(p.implies(new WebResourcePermission("/sslprotected.jsp", "!GET,POST")));
- assertTrue(p.implies(new WebResourcePermission("/:/secured.jsp:/unchecked.jsp:/excluded.jsp:/sslprotected.jsp",
+ assertTrue(p.implies(new WebResourcePermission("/%3A/secured.jsp%3A/unchecked.jsp%3A/excluded.jsp%3A/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("/:/unchecked.jsp:/secured.jsp:/sslprotected.jsp:/excluded.jsp",
+ assertTrue(p.implies(new WebUserDataPermission("/%3A/unchecked.jsp%3A/secured.jsp%3A/sslprotected.jsp%3A/excluded.jsp",
(String) null)));
assertTrue(p.implies(new WebUserDataPermission("/unchecked.jsp", (String) null)));
}
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2010-03-26 16:39:12 UTC (rev 103052)
+++ trunk/tomcat/pom.xml 2010-03-26 16:54:14 UTC (rev 103053)
@@ -376,7 +376,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.resource</groupId>
More information about the jboss-cvs-commits
mailing list