Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 49911 invoked from network); 20 Dec 2006 12:36:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Dec 2006 12:36:57 -0000 Received: (qmail 51111 invoked by uid 500); 20 Dec 2006 12:37:04 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 51063 invoked by uid 500); 20 Dec 2006 12:37:03 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 51052 invoked by uid 99); 20 Dec 2006 12:37:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Dec 2006 04:37:03 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Dec 2006 04:36:55 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id A538C1A981A; Wed, 20 Dec 2006 04:36:06 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r489068 - in /cocoon/branches/BRANCH_2_1_X: forrest.properties src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java src/java/org/apache/cocoon/cocoon.properties status.xml Date: Wed, 20 Dec 2006 12:36:06 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061220123606.A538C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Dec 20 04:36:05 2006 New Revision: 489068 URL: http://svn.apache.org/viewvc?view=rev&rev=489068 Log: Prepare for next version and fix bug in auth block Modified: cocoon/branches/BRANCH_2_1_X/forrest.properties cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.properties cocoon/branches/BRANCH_2_1_X/status.xml Modified: cocoon/branches/BRANCH_2_1_X/forrest.properties URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/forrest.properties?view=diff&rev=489068&r1=489067&r2=489068 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/forrest.properties (original) +++ cocoon/branches/BRANCH_2_1_X/forrest.properties Wed Dec 20 04:36:05 2006 @@ -22,7 +22,7 @@ #forrest.echo=true # Project name (used to name .war file) -project.name=cocoon-2.1.10-dev +project.name=cocoon-2.1.11-dev # Specifies name of Forrest skin to use #project.skin=tigris Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java?view=diff&rev=489068&r1=489067&r2=489068 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/ApplicationUtil.java Wed Dec 20 04:36:05 2006 @@ -82,7 +82,7 @@ * @param objectModel The Cocoon object model. * @return This returns true, if the user has the role; otherwise false is returned. */ - public boolean isUserInRole(final User user, final String role, final Map objectModel) { + public static boolean isUserInRole(final User user, final String role, final Map objectModel) { boolean result = user.isUserInRole(role); if ( !result ) { final Request req = ObjectModelHelper.getRequest(objectModel); Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.properties URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.properties?view=diff&rev=489068&r1=489067&r2=489068 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.properties (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/cocoon.properties Wed Dec 20 04:36:05 2006 @@ -20,8 +20,8 @@ # very high chance of breaking the build system. Do it only if you know what # you're doing. -version=2.1.10-dev -released.version=2.1.9 +version=2.1.11-dev +released.version=2.1.10 year=1999-2006 name=cocoon Name=Cocoon Modified: cocoon/branches/BRANCH_2_1_X/status.xml URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=489068&r1=489067&r2=489068 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Dec 20 04:36:05 2006 @@ -180,6 +180,11 @@ + + + Auth Block: Make isUserInRole a static method. + + Core: Allow dynamic loading of JavaScript objects even when scope is locked.