From kalumet-commits-return-234-apmail-incubator-kalumet-commits-archive=incubator.apache.org@incubator.apache.org  Fri Aug 31 10:37:09 2012
Return-Path: <kalumet-commits-return-234-apmail-incubator-kalumet-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-kalumet-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-kalumet-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 86596D1E6
	for <apmail-incubator-kalumet-commits-archive@minotaur.apache.org>; Fri, 31 Aug 2012 10:37:09 +0000 (UTC)
Received: (qmail 88401 invoked by uid 500); 31 Aug 2012 10:37:09 -0000
Delivered-To: apmail-incubator-kalumet-commits-archive@incubator.apache.org
Received: (qmail 88338 invoked by uid 500); 31 Aug 2012 10:37:08 -0000
Mailing-List: contact kalumet-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:kalumet-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:kalumet-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:kalumet-commits@incubator.apache.org>
List-Id: <kalumet-commits.incubator.apache.org>
Reply-To: kalumet-dev@incubator.apache.org
Delivered-To: mailing list kalumet-commits@incubator.apache.org
Received: (qmail 88239 invoked by uid 99); 31 Aug 2012 10:37:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Aug 2012 10:37:07 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED,T_FRT_STOCK2
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; Fri, 31 Aug 2012 10:37:04 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 6E2312388C63;
	Fri, 31 Aug 2012 10:36:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1379410 [2/3] - in /incubator/kalumet/trunk/kalumet-modules:
 common/src/main/java/org/apache/kalumet/model/
 console/src/main/java/org/apache/kalumet/console/app/
Date: Fri, 31 Aug 2012 10:36:19 -0000
To: kalumet-commits@incubator.apache.org
From: jbonofre@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120831103621.6E2312388C63@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ConnectionPoolWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ConnectionPoolWindow.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ConnectionPoolWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ConnectionPoolWindow.java Fri Aug 31 10:36:18 2012
@@ -185,7 +185,7 @@ public class ConnectionPoolWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -228,7 +228,7 @@ public class ConnectionPoolWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricited" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -623,7 +623,7 @@ public class ConnectionPoolWindow
     copyButton.setStyleName( "control" );
     copyButton.addActionListener( copy );
     controlRow.add( copyButton );
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // add the paste button
       Button pasteButton = new Button( Messages.getString( "paste" ), Styles.PAGE_PASTE );
@@ -649,7 +649,7 @@ public class ConnectionPoolWindow
       updateButton.addActionListener( update );
       controlRow.add( updateButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // add the delete button
       Button deleteButton = new Button( Messages.getString( "delete" ), Styles.DELETE );

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ConnectionPoolsPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ConnectionPoolsPane.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ConnectionPoolsPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/ConnectionPoolsPane.java Fri Aug 31 10:36:18 2012
@@ -170,7 +170,7 @@ public class ConnectionPoolsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -383,7 +383,7 @@ public class ConnectionPoolsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricited" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -432,7 +432,7 @@ public class ConnectionPoolsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -537,7 +537,7 @@ public class ConnectionPoolsPane
     }
 
     // add the create button
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       Button createButton = new Button( Messages.getString( "connectionpool.add" ), Styles.ADD );
       createButton.addActionListener( create );
@@ -646,7 +646,7 @@ public class ConnectionPoolsPane
         activeButton = new Button( Styles.LIGHTBULB_OFF );
         activeButton.setToolTipText( Messages.getString( "switch.enable" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         activeButton.setActionCommand( connectionPool.getName() );
         activeButton.addActionListener( toggleActive );
@@ -664,7 +664,7 @@ public class ConnectionPoolsPane
         blockerButton = new Button( Styles.PLUGIN_DISABLED );
         blockerButton.setToolTipText( Messages.getString( "switch.blocker" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         blockerButton.setActionCommand( connectionPool.getName() );
         blockerButton.addActionListener( toggleBlocker );
@@ -686,7 +686,7 @@ public class ConnectionPoolsPane
         row.add( updateButton );
       }
       // delete
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         Button deleteButton = new Button( Styles.DELETE );
         deleteButton.setToolTipText( Messages.getString( "delete" ) );

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/DataSourcesPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/DataSourcesPane.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/DataSourcesPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/DataSourcesPane.java Fri Aug 31 10:36:18 2012
@@ -179,7 +179,7 @@ public class DataSourcesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -261,7 +261,7 @@ public class DataSourcesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -327,7 +327,7 @@ public class DataSourcesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -510,7 +510,7 @@ public class DataSourcesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -559,7 +559,7 @@ public class DataSourcesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -825,7 +825,7 @@ public class DataSourcesPane
         activeButton = new Button( Styles.LIGHTBULB_OFF );
         activeButton.setToolTipText( Messages.getString( "switch.enable" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         activeButton.setActionCommand( dataSource.getName() );
         activeButton.addActionListener( toggleActive );
@@ -843,7 +843,7 @@ public class DataSourcesPane
         blockerButton = new Button( Styles.PLUGIN_DISABLED );
         blockerButton.setToolTipText( Messages.getString( "switch.blocker" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         blockerButton.setActionCommand( dataSource.getName() );
         blockerButton.addActionListener( toggleBlocker );
@@ -864,7 +864,7 @@ public class DataSourcesPane
         updateButton.addActionListener( update );
         row.add( updateButton );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         // edit
         Button editButton = new Button( Styles.ACCEPT );
@@ -906,7 +906,7 @@ public class DataSourcesPane
     }
 
     // add create data source row in the JDBC data sources grid
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // row
       Row row = new Row();

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/EnvironmentWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/EnvironmentWindow.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/EnvironmentWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/EnvironmentWindow.java Fri Aug 31 10:36:18 2012
@@ -63,23 +63,23 @@ public class EnvironmentWindow
 
   public boolean updatePermission = false;
 
-  public boolean jeeServersPermission = false;
+  public boolean jeeApplicationServersChangePermission = false;
 
-  public boolean jeeServersUpdatePermission = false;
+  public boolean jeeApplicationServersUpdatePermission = false;
 
-  public boolean jeeServersControlPermission = false;
+  public boolean jeeApplicationServersControlPermission = false;
 
-  public boolean jeeResourcesPermission = false;
+  public boolean jeeResourcesChangePermission = false;
 
   public boolean jeeResourcesUpdatePermission = false;
 
-  public boolean jeeApplicationsPermission = false;
+  public boolean jeeApplicationsChangePermission = false;
 
   public boolean jeeApplicationsUpdatePermission = false;
 
-  public boolean softwaresPermission = false;
+  public boolean softwareChangePermission = false;
 
-  public boolean softwaresUpdatePermission = false;
+  public boolean softwareUpdatePermission = false;
 
   public boolean releasePermission = false;
 
@@ -174,10 +174,10 @@ public class EnvironmentWindow
     public void actionPerformed( ActionEvent event )
     {
       // if the user is only read-only
-      if ( environmentName == null || ( !adminPermission && !updatePermission && !jeeServersPermission
-        && !jeeServersUpdatePermission && !jeeServersControlPermission && !jeeResourcesPermission
-        && !jeeResourcesUpdatePermission && !jeeApplicationsPermission && !jeeApplicationsUpdatePermission
-        && !softwaresPermission && !softwaresUpdatePermission && !releasePermission && !homepagePermission ) )
+      if ( environmentName == null || ( !adminPermission && !updatePermission && !jeeApplicationServersChangePermission
+        && !jeeApplicationServersUpdatePermission && !jeeApplicationServersControlPermission && !jeeResourcesChangePermission
+        && !jeeResourcesUpdatePermission && !jeeApplicationsChangePermission && !jeeApplicationsUpdatePermission
+        && !softwareChangePermission && !softwareUpdatePermission && !releasePermission && !homepagePermission ) )
       {
         // only close the window
         EnvironmentWindow.this.userClose();
@@ -265,10 +265,10 @@ public class EnvironmentWindow
         return;
       }
       // if the lock is free, take it if I can
-      if ( ( adminPermission || updatePermission || jeeServersPermission || jeeServersUpdatePermission
-        || jeeServersControlPermission || jeeResourcesPermission || jeeResourcesUpdatePermission
-        || jeeApplicationsPermission || jeeApplicationsUpdatePermission || softwaresPermission
-        || softwaresUpdatePermission || releasePermission || homepagePermission ) && ( current.getLock() == null
+      if ( ( adminPermission || updatePermission || jeeApplicationServersChangePermission || jeeApplicationServersUpdatePermission
+        || jeeApplicationServersControlPermission || jeeResourcesChangePermission || jeeResourcesUpdatePermission
+        || jeeApplicationsChangePermission || jeeApplicationsUpdatePermission || softwareChangePermission
+        || softwareUpdatePermission || releasePermission || homepagePermission ) && ( current.getLock() == null
         || current.getLock().trim().length() < 1 ) )
       {
         current.setLock( KalumetConsoleApplication.getApplication().getUserid() );
@@ -737,33 +737,33 @@ public class EnvironmentWindow
       updatePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                            KalumetConsoleApplication.getApplication().getUserid(),
                                                                            "update" );
-      jeeServersPermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
+      jeeApplicationServersChangePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                                KalumetConsoleApplication.getApplication().getUserid(),
-                                                                               "jee_servers" );
-      jeeServersUpdatePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
+                                                                               "jee_application_servers_change" );
+      jeeApplicationServersUpdatePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                                      KalumetConsoleApplication.getApplication().getUserid(),
-                                                                                     "jee_servers_update" );
-      jeeServersControlPermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
+                                                                                     "jee_application_servers_update" );
+      jeeApplicationServersControlPermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                                       KalumetConsoleApplication.getApplication().getUserid(),
-                                                                                      "jee_servers_control" );
-      jeeResourcesPermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
+                                                                                      "jee_application_servers_control" );
+      jeeResourcesChangePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                                  KalumetConsoleApplication.getApplication().getUserid(),
-                                                                                 "jee_resources" );
+                                                                                 "jee_resources_change" );
       jeeResourcesUpdatePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                                        KalumetConsoleApplication.getApplication().getUserid(),
                                                                                        "jee_resources_update" );
-      jeeApplicationsPermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
+      jeeApplicationsChangePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                                     KalumetConsoleApplication.getApplication().getUserid(),
-                                                                                    "jee_applications" );
+                                                                                    "jee_applications_change" );
       jeeApplicationsUpdatePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                                           KalumetConsoleApplication.getApplication().getUserid(),
                                                                                           "jee_applications_update" );
-      softwaresPermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
+      softwareChangePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                               KalumetConsoleApplication.getApplication().getUserid(),
-                                                                              "softwares" );
-      softwaresUpdatePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
+                                                                              "software_change" );
+      softwareUpdatePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                                     KalumetConsoleApplication.getApplication().getUserid(),
-                                                                                    "softwares_update" );
+                                                                                    "software_update" );
       releasePermission = kalumet.getSecurity().checkEnvironmentUserAccess( this.environment,
                                                                             KalumetConsoleApplication.getApplication().getUserid(),
                                                                             "release" );
@@ -793,10 +793,10 @@ public class EnvironmentWindow
     }
 
     // try to take the environment lock (if the user can)
-    if ( ( adminPermission || updatePermission || jeeServersPermission || jeeServersUpdatePermission
-      || jeeServersControlPermission || jeeResourcesPermission || jeeResourcesUpdatePermission
-      || jeeApplicationsPermission || jeeApplicationsUpdatePermission || softwaresPermission
-      || softwaresUpdatePermission || releasePermission || homepagePermission ) && ( this.environment.getLock() == null
+    if ( ( adminPermission || updatePermission || jeeApplicationServersChangePermission || jeeApplicationServersUpdatePermission
+      || jeeApplicationServersControlPermission || jeeResourcesChangePermission || jeeResourcesUpdatePermission
+      || jeeApplicationsChangePermission || jeeApplicationsUpdatePermission || softwareChangePermission
+      || softwareUpdatePermission || releasePermission || homepagePermission ) && ( this.environment.getLock() == null
       || this.environment.getLock().trim().length() < 1 ) )
     {
       // lock the environment (but not yet saved)
@@ -858,8 +858,8 @@ public class EnvironmentWindow
     copyButton.setToolTipText( Messages.getString( "copy" ) );
     copyButton.addActionListener( copy );
     controlRow.add( copyButton );
-    if ( this.adminPermission || this.jeeServersPermission || this.jeeResourcesPermission
-      || this.jeeApplicationsPermission || this.softwaresPermission || this.releasePermission )
+    if ( this.adminPermission || this.jeeApplicationServersChangePermission || this.jeeResourcesChangePermission
+      || this.jeeApplicationsChangePermission || this.softwareChangePermission || this.releasePermission )
     {
       // add the paste button
       Button pasteButton = new Button( Messages.getString( "paste" ), Styles.PAGE_PASTE );
@@ -875,10 +875,10 @@ public class EnvironmentWindow
       controlRow.add( saveButton );
     }
     // add the force unlock button if the user has the lock
-    if ( this.adminPermission || this.updatePermission || this.jeeServersPermission || this.jeeServersControlPermission
-      || this.jeeServersUpdatePermission || this.jeeResourcesPermission || this.jeeResourcesUpdatePermission
-      || this.jeeApplicationsPermission || this.jeeApplicationsUpdatePermission || this.softwaresPermission
-      || this.softwaresUpdatePermission || this.releasePermission || this.homepagePermission )
+    if ( this.adminPermission || this.updatePermission || this.jeeApplicationServersChangePermission || this.jeeApplicationServersControlPermission
+      || this.jeeApplicationServersUpdatePermission || this.jeeResourcesChangePermission || this.jeeResourcesUpdatePermission
+      || this.jeeApplicationsChangePermission || this.jeeApplicationsUpdatePermission || this.softwareChangePermission
+      || this.softwareUpdatePermission || this.releasePermission || this.homepagePermission )
     {
       lockButton = new Button( Styles.LOCK );
       lockButton.addActionListener( toggleLock );

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsQueuesPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsQueuesPane.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsQueuesPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsQueuesPane.java Fri Aug 31 10:36:18 2012
@@ -59,7 +59,7 @@ public class JmsQueuesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -108,7 +108,7 @@ public class JmsQueuesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -173,7 +173,7 @@ public class JmsQueuesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -259,7 +259,7 @@ public class JmsQueuesPane
       row.setCellSpacing( new Extent( 2 ) );
       row.setInsets( new Insets( 2 ) );
       grid.add( row );
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         // edit
         Button editButton = new Button( Styles.ACCEPT );
@@ -284,7 +284,7 @@ public class JmsQueuesPane
       nameField.setText( queue.getName() );
       grid.add( nameField );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // row
       Row row = new Row();

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsServerWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsServerWindow.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsServerWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsServerWindow.java Fri Aug 31 10:36:18 2012
@@ -182,7 +182,7 @@ public class JmsServerWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -226,7 +226,7 @@ public class JmsServerWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -536,7 +536,7 @@ public class JmsServerWindow
     copyButton.setStyleName( "control" );
     copyButton.addActionListener( copy );
     controlRow.add( copyButton );
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // add the paste button
       Button pasteButton = new Button( Messages.getString( "paste" ), Styles.PAGE_PASTE );
@@ -557,7 +557,7 @@ public class JmsServerWindow
       updateButton.addActionListener( update );
       controlRow.add( updateButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // add the apply button
       Button applyButton = new Button( Messages.getString( "apply" ), Styles.ACCEPT );

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsServersPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsServersPane.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsServersPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsServersPane.java Fri Aug 31 10:36:18 2012
@@ -169,7 +169,7 @@ public class JmsServersPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -218,7 +218,7 @@ public class JmsServersPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -267,7 +267,7 @@ public class JmsServersPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -540,7 +540,7 @@ public class JmsServersPane
     }
 
     // add the create button
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       Button createButton = new Button( Messages.getString( "jmsserver.add" ), Styles.ADD );
       createButton.setStyleName( "default" );
@@ -651,7 +651,7 @@ public class JmsServersPane
         activeButton = new Button( Styles.LIGHTBULB_OFF );
         activeButton.setToolTipText( Messages.getString( "switch.enable" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         activeButton.setActionCommand( jmsServer.getName() );
         activeButton.addActionListener( toggleActive );
@@ -669,7 +669,7 @@ public class JmsServersPane
         blockerButton = new Button( Styles.PLUGIN_DISABLED );
         blockerButton.setToolTipText( Messages.getString( "switch.blocker" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         blockerButton.setActionCommand( jmsServer.getName() );
         blockerButton.addActionListener( toggleBlocker );
@@ -690,7 +690,7 @@ public class JmsServersPane
         updateButton.addActionListener( update );
         row.add( updateButton );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         // delete
         Button deleteButton = new Button( Styles.DELETE );

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsTopicsPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsTopicsPane.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsTopicsPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/JmsTopicsPane.java Fri Aug 31 10:36:18 2012
@@ -59,7 +59,7 @@ public class JmsTopicsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -108,7 +108,7 @@ public class JmsTopicsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -173,7 +173,7 @@ public class JmsTopicsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "environment.locked" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -259,7 +259,7 @@ public class JmsTopicsPane
       row.setCellSpacing( new Extent( 2 ) );
       row.setInsets( new Insets( 2 ) );
       grid.add( row );
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         // add edit button
         Button editButton = new Button( Styles.ACCEPT );
@@ -284,7 +284,7 @@ public class JmsTopicsPane
       nameField.setText( topic.getName() );
       grid.add( nameField );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // row
       Row row = new Row();

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/NameSpaceBindingsPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/NameSpaceBindingsPane.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/NameSpaceBindingsPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/NameSpaceBindingsPane.java Fri Aug 31 10:36:18 2012
@@ -183,7 +183,7 @@ public class NameSpaceBindingsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -233,7 +233,7 @@ public class NameSpaceBindingsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -320,7 +320,7 @@ public class NameSpaceBindingsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -402,7 +402,7 @@ public class NameSpaceBindingsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -453,7 +453,7 @@ public class NameSpaceBindingsPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -836,7 +836,7 @@ public class NameSpaceBindingsPane
         activeButton = new Button( Styles.LIGHTBULB_OFF );
         activeButton.setToolTipText( Messages.getString( "switch.enable" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         activeButton.setActionCommand( nameSpaceBinding.getName() );
         activeButton.addActionListener( toggleActive );
@@ -854,7 +854,7 @@ public class NameSpaceBindingsPane
         blockerButton = new Button( Styles.PLUGIN_DISABLED );
         blockerButton.setToolTipText( Messages.getString( "switch.blocker" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         blockerButton.setActionCommand( nameSpaceBinding.getName() );
         blockerButton.addActionListener( toggleBlocker );
@@ -875,7 +875,7 @@ public class NameSpaceBindingsPane
         updateButton.addActionListener( update );
         row.add( updateButton );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         // edit
         Button editButton = new Button( Styles.ACCEPT );
@@ -925,7 +925,7 @@ public class NameSpaceBindingsPane
     }
 
     // add create name space binding row in the name space bindings grid
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // row
       Row row = new Row();

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SecurityPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SecurityPane.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SecurityPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SecurityPane.java Fri Aug 31 10:36:18 2012
@@ -91,22 +91,22 @@ public class SecurityPane
       access.getProperties().add( property );
       // JEE servers
       property = new Property();
-      property.setName( "jee_servers" );
+      property.setName( "jee_application_servers_change" );
       property.setValue( "false" );
       access.getProperties().add( property );
       // JEE servers update
       property = new Property();
-      property.setName( "jee_servers_update" );
+      property.setName( "jee_application_servers_update" );
       property.setValue( "false" );
       access.getProperties().add( property );
       // JEE servers control
       property = new Property();
-      property.setName( "jee_servers_control" );
+      property.setName( "jee_application_servers_control" );
       property.setValue( "false" );
       access.getProperties().add( property );
       // JEE resources
       property = new Property();
-      property.setName( "jee_resources" );
+      property.setName( "jee_resources_change" );
       property.setValue( "false" );
       access.getProperties().add( property );
       // JEE resources update
@@ -116,7 +116,7 @@ public class SecurityPane
       access.getProperties().add( property );
       // JEE applications
       property = new Property();
-      property.setName( "jee_applications" );
+      property.setName( "jee_applications_change" );
       property.setValue( "false" );
       access.getProperties().add( property );
       // JEE applications update
@@ -126,12 +126,12 @@ public class SecurityPane
       access.getProperties().add( property );
       // softwares
       property = new Property();
-      property.setName( "softwares" );
+      property.setName( "software_change" );
       property.setValue( "false" );
       access.getProperties().add( property );
       // softwares update
       property = new Property();
-      property.setName( "softwares_update" );
+      property.setName( "software_update" );
       property.setValue( "false" );
       access.getProperties().add( property );
       // release
@@ -659,13 +659,13 @@ public class SecurityPane
         return;
       }
       // switch admin ACL
-      if ( access.getProperty( "softwares_update" ).getValue().equals( "true" ) )
+      if ( access.getProperty( "software_update" ).getValue().equals( "true" ) )
       {
-        access.getProperty( "softwares_update" ).setValue( "false" );
+        access.getProperty( "software_update" ).setValue( "false" );
       }
       else
       {
-        access.getProperty( "softwares_update" ).setValue( "true" );
+        access.getProperty( "software_update" ).setValue( "true" );
       }
       // change the update flag
       parent.setUpdated( true );

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SharedLibrariesPane.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SharedLibrariesPane.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SharedLibrariesPane.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SharedLibrariesPane.java Fri Aug 31 10:36:18 2012
@@ -179,7 +179,7 @@ public class SharedLibrariesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -229,7 +229,7 @@ public class SharedLibrariesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -316,7 +316,7 @@ public class SharedLibrariesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -367,7 +367,7 @@ public class SharedLibrariesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -441,7 +441,7 @@ public class SharedLibrariesPane
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().jeeResourcesChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -808,7 +808,7 @@ public class SharedLibrariesPane
         activeButton = new Button( Styles.LIGHTBULB_OFF );
         activeButton.setToolTipText( Messages.getString( "switch.enable" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         activeButton.setActionCommand( sharedLibrary.getName() );
         activeButton.addActionListener( toggleActive );
@@ -826,7 +826,7 @@ public class SharedLibrariesPane
         blockerButton = new Button( Styles.PLUGIN_DISABLED );
         blockerButton.setToolTipText( Messages.getString( "switch.blocker" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         blockerButton.setActionCommand( sharedLibrary.getName() );
         blockerButton.addActionListener( toggleBlocker );
@@ -847,7 +847,7 @@ public class SharedLibrariesPane
         updateButton.addActionListener( update );
         row.add( updateButton );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
       {
         // edit
         Button editButton = new Button( Styles.ACCEPT );
@@ -881,7 +881,7 @@ public class SharedLibrariesPane
     }
 
     // add create shared library row in the shared libraries grid
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().jeeResourcesChangePermission)
     {
       // row
       Row row = new Row();

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareCommandWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareCommandWindow.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareCommandWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareCommandWindow.java Fri Aug 31 10:36:18 2012
@@ -165,7 +165,7 @@ public class SoftwareCommandWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -246,7 +246,7 @@ public class SoftwareCommandWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -294,7 +294,7 @@ public class SoftwareCommandWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresUpdatePermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareUpdatePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -409,7 +409,7 @@ public class SoftwareCommandWindow
     copyButton.setStyleName( "control" );
     copyButton.addActionListener( copy );
     controlRow.add( copyButton );
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // paste
       Button pasteButton = new Button( Messages.getString( "paste" ), Styles.PAGE_PASTE );
@@ -417,7 +417,7 @@ public class SoftwareCommandWindow
       pasteButton.addActionListener( paste );
       controlRow.add( pasteButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresUpdatePermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareUpdatePermission)
     {
       // execute
       Button executeButton = new Button( Messages.getString( "execute" ), Styles.COG );
@@ -425,7 +425,7 @@ public class SoftwareCommandWindow
       executeButton.addActionListener( execute );
       controlRow.add( executeButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // apply
       Button applyButton = new Button( Messages.getString( "apply" ), Styles.ACCEPT );

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareConfigurationFileWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareConfigurationFileWindow.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareConfigurationFileWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareConfigurationFileWindow.java Fri Aug 31 10:36:18 2012
@@ -155,7 +155,7 @@ public class SoftwareConfigurationFileWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -199,7 +199,7 @@ public class SoftwareConfigurationFileWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -341,7 +341,7 @@ public class SoftwareConfigurationFileWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -413,7 +413,7 @@ public class SoftwareConfigurationFileWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -545,7 +545,7 @@ public class SoftwareConfigurationFileWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresUpdatePermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareUpdatePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -665,7 +665,7 @@ public class SoftwareConfigurationFileWi
     copyButton.setStyleName( "control" );
     copyButton.addActionListener( copy );
     controlRow.add( copyButton );
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // add the paste button
       Button pasteButton = new Button( Messages.getString( "paste" ), Styles.PAGE_PASTE );
@@ -673,7 +673,7 @@ public class SoftwareConfigurationFileWi
       pasteButton.addActionListener( paste );
       controlRow.add( pasteButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresUpdatePermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareUpdatePermission)
     {
       // add the update button
       Button updateButton = new Button( Messages.getString( "update" ), Styles.COG );
@@ -681,7 +681,7 @@ public class SoftwareConfigurationFileWi
       updateButton.addActionListener( update );
       controlRow.add( updateButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // add the apply button
       Button applyButton = new Button( Messages.getString( "apply" ), Styles.ACCEPT );
@@ -864,7 +864,7 @@ public class SoftwareConfigurationFileWi
       copyButton.addActionListener( copyMapping );
       row.add( copyButton );
       // delete / edit
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
       {
         // delete
         Button deleteButton = new Button( Styles.DELETE );
@@ -898,7 +898,7 @@ public class SoftwareConfigurationFileWi
       mappingValueField.setText( mapping.getValue() );
       mappingsGrid.add( mappingValueField );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // row
       Row row = new Row();

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareDatabaseSqlScriptWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareDatabaseSqlScriptWindow.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareDatabaseSqlScriptWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareDatabaseSqlScriptWindow.java Fri Aug 31 10:36:18 2012
@@ -104,7 +104,7 @@ public class SoftwareDatabaseSqlScriptWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -148,7 +148,7 @@ public class SoftwareDatabaseSqlScriptWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -250,7 +250,7 @@ public class SoftwareDatabaseSqlScriptWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -292,7 +292,7 @@ public class SoftwareDatabaseSqlScriptWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -364,7 +364,7 @@ public class SoftwareDatabaseSqlScriptWi
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -537,7 +537,7 @@ public class SoftwareDatabaseSqlScriptWi
     copyButton.setStyleName( "control" );
     copyButton.addActionListener( copy );
     controlRow.add( copyButton );
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // add the paste button
       Button pasteButton = new Button( Messages.getString( "paste" ), Styles.PAGE_PASTE );
@@ -683,7 +683,7 @@ public class SoftwareDatabaseSqlScriptWi
       copyButton.addActionListener( copyMapping );
       row.add( copyButton );
       // mapping delete / edit
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
       {
         // mapping delete
         Button deleteButton = new Button( Styles.DELETE );
@@ -718,7 +718,7 @@ public class SoftwareDatabaseSqlScriptWi
       mappingsGrid.add( mappingValueField );
     }
     // add a new mapping
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // row
       Row row = new Row();

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareDatabaseWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareDatabaseWindow.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareDatabaseWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareDatabaseWindow.java Fri Aug 31 10:36:18 2012
@@ -167,7 +167,7 @@ public class SoftwareDatabaseWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -211,7 +211,7 @@ public class SoftwareDatabaseWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -343,7 +343,7 @@ public class SoftwareDatabaseWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -393,7 +393,7 @@ public class SoftwareDatabaseWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -569,7 +569,7 @@ public class SoftwareDatabaseWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -613,7 +613,7 @@ public class SoftwareDatabaseWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -657,7 +657,7 @@ public class SoftwareDatabaseWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresUpdatePermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareUpdatePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -775,7 +775,7 @@ public class SoftwareDatabaseWindow
     copyButton.setStyleName( "control" );
     copyButton.addActionListener( copy );
     controlRow.add( copyButton );
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // add the paste button
       Button pasteButton = new Button( Messages.getString( "paste" ), Styles.PAGE_PASTE );
@@ -783,7 +783,7 @@ public class SoftwareDatabaseWindow
       pasteButton.addActionListener( paste );
       controlRow.add( pasteButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresUpdatePermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareUpdatePermission)
     {
       // add the update button
       Button updateButton = new Button( Messages.getString( "update" ), Styles.COG );
@@ -791,7 +791,7 @@ public class SoftwareDatabaseWindow
       updateButton.addActionListener( update );
       controlRow.add( updateButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // add the apply button
       Button applyButton = new Button( Messages.getString( "apply" ), Styles.ACCEPT );
@@ -1040,7 +1040,7 @@ public class SoftwareDatabaseWindow
         activeButton = new Button( Styles.LIGHTBULB_OFF );
         activeButton.setToolTipText( Messages.getString( "switch.enable" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
       {
         activeButton.setActionCommand( sqlScript.getName() );
         activeButton.addActionListener( toggleActiveSqlScript );
@@ -1058,7 +1058,7 @@ public class SoftwareDatabaseWindow
         blockerButton = new Button( Styles.PLUGIN_DISABLED );
         blockerButton.setToolTipText( Messages.getString( "switch.blocker" ) );
       }
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
       {
         blockerButton.setActionCommand( sqlScript.getName() );
         blockerButton.addActionListener( toggleBlockerSqlScript );
@@ -1071,7 +1071,7 @@ public class SoftwareDatabaseWindow
       copyButton.addActionListener( copySqlScript );
       row.add( copyButton );
       // up / down / delete
-      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+      if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
       {
         // up button
         Button upButton = new Button( Styles.ARROW_UP );

Modified: incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareLocationWindow.java
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareLocationWindow.java?rev=1379410&r1=1379409&r2=1379410&view=diff
==============================================================================
--- incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareLocationWindow.java (original)
+++ incubator/kalumet/trunk/kalumet-modules/console/src/main/java/org/apache/kalumet/console/app/SoftwareLocationWindow.java Fri Aug 31 10:36:18 2012
@@ -166,7 +166,7 @@ public class SoftwareLocationWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -248,7 +248,7 @@ public class SoftwareLocationWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresPermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareChangePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -296,7 +296,7 @@ public class SoftwareLocationWindow
         return;
       }
       // check if the user can do it
-      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwaresUpdatePermission )
+      if ( !getEnvironmentWindow().adminPermission && !getEnvironmentWindow().softwareUpdatePermission)
       {
         KalumetConsoleApplication.getApplication().getLogPane().addWarning( Messages.getString( "action.restricted" ),
                                                                             getEnvironmentWindow().getEnvironmentName() );
@@ -414,7 +414,7 @@ public class SoftwareLocationWindow
     copyButton.setStyleName( "control" );
     copyButton.addActionListener( copy );
     controlRow.add( copyButton );
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // paste
       Button pasteButton = new Button( Messages.getString( "paste" ), Styles.PAGE_PASTE );
@@ -422,7 +422,7 @@ public class SoftwareLocationWindow
       pasteButton.addActionListener( paste );
       controlRow.add( pasteButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresUpdatePermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareUpdatePermission)
     {
       // update
       Button updateButton = new Button( Messages.getString( "update" ), Styles.COG );
@@ -430,7 +430,7 @@ public class SoftwareLocationWindow
       updateButton.addActionListener( update );
       controlRow.add( updateButton );
     }
-    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwaresPermission )
+    if ( getEnvironmentWindow().adminPermission || getEnvironmentWindow().softwareChangePermission)
     {
       // apply
       Button applyButton = new Button( Messages.getString( "apply" ), Styles.ACCEPT );