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

[cz...@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 @@
   </todo>
 
   <changes>
+  <release version="2.1.11" date="TBD">
+    <action dev="CZ" type="fix">
+      Auth Block: Make isUserInRole a static method.
+    </action>
+  </release>
   <release version="2.1.10" date="TBD">
     <action dev="JH" type="fix" fixes-bug="COCOON-1811" due-to="Rob Berens">
       Core: Allow dynamic loading of JavaScript objects even when scope is locked.