Return-Path: Delivered-To: apmail-incubator-qpid-commits-archive@locus.apache.org Received: (qmail 99421 invoked from network); 27 Apr 2007 14:02:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Apr 2007 14:02:59 -0000 Received: (qmail 61116 invoked by uid 500); 27 Apr 2007 14:03:03 -0000 Delivered-To: apmail-incubator-qpid-commits-archive@incubator.apache.org Received: (qmail 61102 invoked by uid 500); 27 Apr 2007 14:03:03 -0000 Mailing-List: contact qpid-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: qpid-dev@incubator.apache.org Delivered-To: mailing list qpid-commits@incubator.apache.org Received: (qmail 61077 invoked by uid 99); 27 Apr 2007 14:03:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2007 07:03:03 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Fri, 27 Apr 2007 07:02:56 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E71771A9838; Fri, 27 Apr 2007 07:02:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r533101 - in /incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui: Constants.java jmx/JMXServerRegistry.java model/OperationData.java views/OperationTabControl.java Date: Fri, 27 Apr 2007 14:02:35 -0000 To: qpid-commits@incubator.apache.org From: bhupendrab@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070427140235.E71771A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bhupendrab Date: Fri Apr 27 07:02:34 2007 New Revision: 533101 URL: http://svn.apache.org/viewvc?view=rev&rev=533101 Log: Merged revisions 533065 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r533065 | bhupendrab | 2007-04-27 12:17:39 +0100 (Fri, 27 Apr 2007) | 1 line QPID-471 ........ Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java?view=diff&rev=533101&r1=533100&r2=533101 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java Fri Apr 27 07:02:34 2007 @@ -60,6 +60,7 @@ public final static String OPERATION_MOVE_MESSAGES = "moveMessages"; public final static String OPERATION_CREATEUSER = "createUser"; + public final static String OPERATION_DELETEUSER = "deleteUser"; public final static String OPERATION_VIEWUSERS = "viewUsers"; public final static String OPERATION_PARAM_USERNAME = "username"; Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java?view=diff&rev=533101&r1=533100&r2=533101 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java Fri Apr 27 07:02:34 2007 @@ -25,6 +25,7 @@ import java.lang.reflect.Constructor; import java.security.Security; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -581,6 +582,7 @@ public void setUserList(List list) { _usersList = list; + Collections.sort(_usersList); } public List getUsernames() Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java?view=diff&rev=533101&r1=533100&r2=533101 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java Fri Apr 27 07:02:34 2007 @@ -89,4 +89,22 @@ { return (_returnType.equals("void") || _returnType.equals("java.lang.Void")); } + + public Object getParameterValue(String paramName) + { + if (_parameters == null) + { + return null; + } + + for (int i = 0; i < _parameters.size(); i++) + { + if (paramName.equalsIgnoreCase(_parameters.get(i).getName())) + { + return _parameters.get(i).getValue(); + } + } + + return null; + } } Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java?view=diff&rev=533101&r1=533100&r2=533101 ============================================================================== --- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java (original) +++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java Fri Apr 27 07:02:34 2007 @@ -278,8 +278,7 @@ { items = EXCHANGE_TYPE_VALUES; } - else if (_mbean.isAdmin() && param.getName().equals(OPERATION_PARAM_USERNAME) - && !_opData.getName().equals(OPERATION_CREATEUSER)) + else if (isUserListParameter(param)) { List list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames(); if (list != null && !list.isEmpty()) @@ -361,6 +360,17 @@ } } + private boolean isUserListParameter(ParameterData param) + { + if (_mbean.isAdmin() && param.getName().equals(OPERATION_PARAM_USERNAME) + && !_opData.getName().equals(OPERATION_CREATEUSER)) + { + return true; + } + + return false; + } + /** * Creates customized dispaly for a method "CreateNewBinding" for Headers exchange * @@ -624,8 +634,16 @@ { executeAndShowResults(); } - clearParameters(); - clearParameterValues(_paramsComposite); + + if (_mbean.isAdmin() && _opData.getName().equals(OPERATION_DELETEUSER)) + { + refresh(_mbean); + } + else + { + clearParameters(); + clearParameterValues(_paramsComposite); + } } } @@ -659,9 +677,32 @@ * Here we are adding the users to a list, which will be used to list username to be selected on * pages like "delete user", "set password" instead of typing the username */ - if (_mbean.isAdmin() && _opData.getName().equals(OPERATION_VIEWUSERS)) + if (_mbean.isAdmin()) { - ApplicationRegistry.getServerRegistry(_mbean).setUserList(extractUserList(result)); + if (_opData.getName().equals(OPERATION_VIEWUSERS)) + { + ApplicationRegistry.getServerRegistry(_mbean).setUserList(extractUserList(result)); + } + else if (_opData.getName().equals(OPERATION_DELETEUSER)) + { + List list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames(); + Object userName = _opData.getParameterValue(OPERATION_PARAM_USERNAME); + if ((list != null) && !list.isEmpty() && (userName != null)) + { + list.remove(userName); + ApplicationRegistry.getServerRegistry(_mbean).setUserList(list); + } + } + else if (_opData.getName().equals(OPERATION_CREATEUSER)) + { + List list = ApplicationRegistry.getServerRegistry(_mbean).getUsernames(); + Object userName = _opData.getParameterValue(OPERATION_PARAM_USERNAME); + if ((list != null) && !list.isEmpty() && (userName != null)) + { + list.add(userName.toString()); + ApplicationRegistry.getServerRegistry(_mbean).setUserList(list); + } + } } // end of custom code @@ -710,7 +751,7 @@ { list.add(data.get(USERNAME).toString()); } - Collections.sort(list); + return list; }