Return-Path: X-Original-To: apmail-jspwiki-commits-archive@www.apache.org Delivered-To: apmail-jspwiki-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4EECC100A1 for ; Tue, 1 Apr 2014 18:54:15 +0000 (UTC) Received: (qmail 54038 invoked by uid 500); 1 Apr 2014 18:54:15 -0000 Delivered-To: apmail-jspwiki-commits-archive@jspwiki.apache.org Received: (qmail 53973 invoked by uid 500); 1 Apr 2014 18:54:06 -0000 Mailing-List: contact commits-help@jspwiki.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jspwiki.apache.org Delivered-To: mailing list commits@jspwiki.apache.org Received: (qmail 53965 invoked by uid 99); 1 Apr 2014 18:54:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 18:54:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 18:54:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C6598238890B; Tue, 1 Apr 2014 18:53:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1583750 - in /jspwiki/trunk: ./ jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/ jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/ jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/... Date: Tue, 01 Apr 2014 18:53:38 -0000 To: commits@jspwiki.apache.org From: metskem@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140401185338.C6598238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: metskem Date: Tue Apr 1 18:53:37 2014 New Revision: 1583750 URL: http://svn.apache.org/r1583750 Log: 2014-04-01 Harry Metske (metskem@apache.org) * 2.10.1-svn-13 * Fixed JSPWIKI-831 - Container managed authorization does not work in tomcat Modified: jspwiki/trunk/ChangeLog jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml Modified: jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/ChangeLog (original) +++ jspwiki/trunk/ChangeLog Tue Apr 1 18:53:37 2014 @@ -1,3 +1,9 @@ +2014-04-01 Harry Metske (metskem@apache.org) + + * 2.10.1-svn-13 + + * Fixed JSPWIKI-831 - Container managed authorization does not work in tomcat + 2014-03-17 Harry Metske (metskem@apache.org) * 2.10.1-svn-12 @@ -98,7 +104,7 @@ * Various small fixes on the HADDOCK template (jsp/css/js) : * Fixing %%category dropdowns which were clipped when inside a %%accordion. - Replacing js based animation by css3 animation to show/hide the popup. + Replacing js based animation by2.10.1-svn-12 css3 animation to show/hide the popup. * Fixing bug when saving the Preferences (detected by Harry) Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml (original) +++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml Tue Apr 1 18:53:37 2014 @@ -18,10 +18,10 @@ under the License. --> - + JSPWiki is an open source JSP-based WikiClone. It is licensed Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml (original) +++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml Tue Apr 1 18:53:37 2014 @@ -18,10 +18,10 @@ under the License. --> - + JSPWiki is an open source JSP-based WikiClone. It is licensed Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml (original) +++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml Tue Apr 1 18:53:37 2014 @@ -18,10 +18,10 @@ under the License. --> - + JSPWiki is an open source JSP-based WikiClone. It is licensed Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml (original) +++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml Tue Apr 1 18:53:37 2014 @@ -18,10 +18,10 @@ under the License. --> - + JSPWiki is an open source JSP-based WikiClone. It is licensed Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml (original) +++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml Tue Apr 1 18:53:37 2014 @@ -18,10 +18,10 @@ under the License. --> - + JSPWiki is an open source JSP-based WikiClone. It is licensed Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue Apr 1 18:53:37 2014 @@ -72,7 +72,7 @@ public final class Release { *

* If the build identifier is empty, it is not added. */ - public static final String BUILD = "12"; + public static final String BUILD = "13"; /** * This is the generic version string you should use when printing out the version. It is of Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java (original) +++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java Tue Apr 1 18:53:37 2014 @@ -54,7 +54,7 @@ import org.apache.wiki.WikiSession; */ public class WebContainerAuthorizer implements WebAuthorizer { - private static final String J2EE_SCHEMA_24_NAMESPACE = "http://java.sun.com/xml/ns/j2ee"; + private static final String J2EE_SCHEMA_25_NAMESPACE = "http://java.sun.com/xml/ns/javaee"; protected static final Logger log = Logger.getLogger( WebContainerAuthorizer.class ); @@ -103,7 +103,7 @@ public class WebContainerAuthorizer impl if ( m_webxml != null ) { // Add the J2EE 2.4 schema namespace - m_webxml.getRootElement().setNamespace( Namespace.getNamespace( J2EE_SCHEMA_24_NAMESPACE ) ); + m_webxml.getRootElement().setNamespace( Namespace.getNamespace( J2EE_SCHEMA_25_NAMESPACE ) ); m_containerAuthorized = isConstrained( "/Delete.jsp", Role.ALL ) && isConstrained( "/Login.jsp", Role.ALL ); @@ -240,13 +240,13 @@ public class WebContainerAuthorizer impl // (Note the crazy j: prefix to denote the 2.4 j2ee schema) selector = "//j:web-app/j:security-constraint[j:web-resource-collection/j:url-pattern=\"" + url + "\"]"; xpath = XPath.newInstance( selector ); - xpath.addNamespace( "j", J2EE_SCHEMA_24_NAMESPACE ); + xpath.addNamespace( "j", J2EE_SCHEMA_25_NAMESPACE ); List constraints = xpath.selectNodes( root ); // Get all constraints that match our Role pattern selector = "//j:web-app/j:security-constraint[j:auth-constraint/j:role-name=\"" + role.getName() + "\"]"; xpath = XPath.newInstance( selector ); - xpath.addNamespace( "j", J2EE_SCHEMA_24_NAMESPACE ); + xpath.addNamespace( "j", J2EE_SCHEMA_25_NAMESPACE ); List roles = xpath.selectNodes( root ); // If we can't find either one, we must not be constrained @@ -333,7 +333,7 @@ public class WebContainerAuthorizer impl // Get roles referred to by constraints String selector = "//j:web-app/j:security-constraint/j:auth-constraint/j:role-name"; XPath xpath = XPath.newInstance( selector ); - xpath.addNamespace( "j", J2EE_SCHEMA_24_NAMESPACE ); + xpath.addNamespace( "j", J2EE_SCHEMA_25_NAMESPACE ); List nodes = xpath.selectNodes( root ); for( Iterator it = nodes.iterator(); it.hasNext(); ) { @@ -344,7 +344,7 @@ public class WebContainerAuthorizer impl // Get all defined roles selector = "//j:web-app/j:security-role/j:role-name"; xpath = XPath.newInstance( selector ); - xpath.addNamespace( "j", J2EE_SCHEMA_24_NAMESPACE ); + xpath.addNamespace( "j", J2EE_SCHEMA_25_NAMESPACE ); nodes = xpath.selectNodes( root ); for( Iterator it = nodes.iterator(); it.hasNext(); ) { Modified: jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml?rev=1583750&r1=1583749&r2=1583750&view=diff ============================================================================== --- jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml (original) +++ jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml Tue Apr 1 18:53:37 2014 @@ -23,10 +23,10 @@ and container-managed authentication are enabled. --> - + JSPWiki is an open source JSP-based WikiClone. It is licensed