svn commit: r927658 - in /roller/trunk/weblogger-web/src/main: java/org/apache/roller/weblogger/ui/core/util/menu/ resources/org/apache/roller/weblogger/ui/struts2/admin/ resources/org/apache/roller/weblogger/ui/struts2/editor/

[sn...@apache.org]

Author: snoopdave
Date: Fri Mar 26 00:55:59 2010
New Revision: 927658

URL: http://svn.apache.org/viewvc?rev=927658&view=rev
Log:
Fixing regression caused by the externalization of user management work from back in 2008

Modified:
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
    roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml
    roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml

Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?rev=927658&r1=927657&r2=927658&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java Fri Mar 26 00:55:59 2010
@@ -266,8 +266,8 @@ public class MenuHelper {
         Document doc = builder.build(instream);
         
         Element root = doc.getRootElement();
-        List menus = root.getChildren("menu");
-        Iterator iter = menus.iterator();
+        List parsedMenus = root.getChildren("menu");
+        Iterator iter = parsedMenus.iterator();
         while (iter.hasNext()) {
             Element e = (Element) iter.next();
             config.addTab(elementToParsedTab(e));

Modified: roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml?rev=927658&r1=927657&r2=927658&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml (original)
+++ roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/admin/admin-menu.xml Fri Mar 26 00:55:59 2010
@@ -6,7 +6,7 @@ See comments in editor-menu.xml for info
 -->
 <menu-bar>
     
-    <menu name="tabbedmenu.admin" roles="admin">
+    <menu name="tabbedmenu.admin" globalPerms="admin">
         
         <menu-item action="globalConfig"       
                    name="tabbedmenu.admin.config" 
@@ -31,7 +31,7 @@ See comments in editor-menu.xml for info
                    globalPerms="admin" />
     </menu>
     
-    <menu name="tabbedmenu.planet" roles="admin" enabledProperty="planet.aggregator.enabled">
+    <menu name="tabbedmenu.planet" globalPerms="admin" enabledProperty="planet.aggregator.enabled">
         
         <menu-item action="planetConfig"       
                    name="tabbedmenu.admin.planetConfig" 

Modified: roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=927658&r1=927657&r2=927658&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml (original)
+++ roller/trunk/weblogger-web/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml Fri Mar 26 00:55:59 2010
@@ -23,7 +23,7 @@ Each menu or menu item is governed by fo
 -->
 <menu-bar>
     
-    <menu name="tabbedmenu.weblog" perms="limited" roles="editor">
+    <menu name="tabbedmenu.weblog" globalPerms="limited" weblogPerms="editor">
         
         <menu-item action="entryAdd" 
                    name="tabbedmenu.weblog.newEntry" 
@@ -74,7 +74,7 @@ Each menu or menu item is governed by fo
     </menu>
     
     
-    <menu name="tabbedmenu.design" perms="admin" roles="editor" enabledProperty="themes.customtheme.allowed">
+    <menu name="tabbedmenu.design" globalPerms="admin" weblogPerms="editor" enabledProperty="themes.customtheme.allowed">
         
         <menu-item action="themeEdit"         
                    name="tabbedmenu.website.themes" 
@@ -95,7 +95,7 @@ Each menu or menu item is governed by fo
     </menu>
     
     
-    <menu name="tabbedmenu.website" perms="admin" roles="editor">
+    <menu name="tabbedmenu.website" globalPerms="admin" weblogPerms="editor">
         
         <menu-item action="weblogConfig"       
                    name="tabbedmenu.website.settings" 
@@ -106,7 +106,7 @@ Each menu or menu item is governed by fo
         <menu-item action="members" 
                    name="tabbedmenu.website.members" 
                    globalPerms="login"
-                   perms="admin" 
+                   weblogPerms="admin"
                    subactions="invite" 
                    enabledProperty="groupblogging.enabled"/>