Return-Path: Delivered-To: apmail-qpid-dev-archive@www.apache.org Received: (qmail 66714 invoked from network); 6 Apr 2009 14:55:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Apr 2009 14:55:27 -0000 Received: (qmail 28093 invoked by uid 500); 6 Apr 2009 14:55:26 -0000 Delivered-To: apmail-qpid-dev-archive@qpid.apache.org Received: (qmail 28043 invoked by uid 500); 6 Apr 2009 14:55:26 -0000 Mailing-List: contact dev-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list dev@qpid.apache.org Received: (qmail 28033 invoked by uid 99); 6 Apr 2009 14:55:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2009 14:55:26 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of robbie.gemmell@gmail.com designates 209.85.218.158 as permitted sender) Received: from [209.85.218.158] (HELO mail-bw0-f158.google.com) (209.85.218.158) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2009 14:55:16 +0000 Received: by bwz2 with SMTP id 2so7713796bwz.33 for ; Mon, 06 Apr 2009 07:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:references :in-reply-to:subject:date:message-id:mime-version:content-type :content-transfer-encoding:x-mailer:thread-index:content-language; bh=XNtC0LxQv59NR4p3TNbCCbRAbgRc+M6ePpbF/tWa37c=; b=Ki8+lGdNG+x2c/TGk8jUeFaE75v8U7skgpub0dLAsiO0I4FQaQtxNJt+hEJLIo4hLo O7Mo2y4WQAsP98I2Y7RkoKvTmfNrl3TCeGEAwZ1uKn/WwNYa/t7ZLP9O+R0fY/XzDCVD AhoyNQndpmiS/4yK5JO13YfNQS4wmP4+T1UHE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:references:in-reply-to:subject:date:message-id:mime-version :content-type:content-transfer-encoding:x-mailer:thread-index :content-language; b=uyA6C+o3T3y2lpVHE//ZkfR8+MkABSFqS51Xo8oCLeAHKLTRID6otijJkm0NdG0v4G j7DhijMSbSArmFWVA8Q0cY3cVRvvzUt9Nox03Wsx7Ehd9QlJqOQ95d0J+I+qFsz1S56V +s/VI/+rMViU07sA6+aX7mjvTEtVIdj9R+XxE= Received: by 10.204.68.77 with SMTP id u13mr1725534bki.101.1239029696467; Mon, 06 Apr 2009 07:54:56 -0700 (PDT) Received: from QUASAR (ip-217.146.114.204.merula.net [217.146.114.204]) by mx.google.com with ESMTPS id 12sm2245380fks.5.2009.04.06.07.54.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 06 Apr 2009 07:54:55 -0700 (PDT) From: "Robbie Gemmell" To: References: <20090406144534.477BF23889E3@eris.apache.org> In-Reply-To: <20090406144534.477BF23889E3@eris.apache.org> Subject: RE: svn commit: r762365 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/logging/management/ management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ Date: Mon, 6 Apr 2009 15:54:50 +0100 Message-ID: <49da17bf.0c135e0a.1c5b.5e3f@mx.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Office Outlook 12.0 thread-index: Acm2xmTw2MqrUhFuTXSMP69oOZOiFwAAFS4Q Content-Language: en-gb X-Virus-Checked: Checked by ClamAV on apache.org Hi everyone, I would like to merge this small change into 0.5 (most of it affects the = console rather than the broker), as it would be useful to have it = available on all released versions of the logging management MBean, = rather than needing to determine in future whether it is there or not. I will merge it over later in the week if there aren=E2=80=99t any = objections. Thanks,=20 Robbie -----Original Message----- From: robbie@apache.org [mailto:robbie@apache.org]=20 Sent: 06 April 2009 15:46 To: commits@qpid.apache.org Subject: svn commit: r762365 - in /qpid/trunk/qpid/java: = broker/src/main/java/org/apache/qpid/server/logging/management/ = management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/vie= ws/ Author: robbie Date: Mon Apr 6 14:45:33 2009 New Revision: 762365 URL: http://svn.apache.org/viewvc?rev=3D762365&view=3Drev Log: QPID-1790: add new attribute to logging management mbean to indicate = available output levels. Update jmx management console to understand = String[] attribute value and display contents properly Modified: = qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/= management/LoggingManagement.java = qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/= management/LoggingManagementMBean.java = qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/q= pid/management/ui/views/AttributesTabControl.java Modified: = qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/= management/LoggingManagement.java URL: = http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/or= g/apache/qpid/server/logging/management/LoggingManagement.java?rev=3D7623= 65&r1=3D762364&r2=3D762365&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- = qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/= management/LoggingManagement.java (original) +++ = qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/= management/LoggingManagement.java Mon Apr 6 14:45:33 2009 @@ -47,6 +47,13 @@ description =3D "The log4j xml configuration file = LogWatch interval (in seconds). 0 indicates not being checked.") Integer getLog4jLogWatchInterval(); =20 + /** + * Attribute to represent the available log4j logger output levels. + * @return The logging level names. + */ + @MBeanAttribute(name=3D"AvailableLoggerLevels", description =3D = "The values to which log output level can be set.") + String[] getAvailableLoggerLevels(); + =20 =20 //****** log4j runtime operations ****** // =20 Modified: = qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/= management/LoggingManagementMBean.java URL: = http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/or= g/apache/qpid/server/logging/management/LoggingManagementMBean.java?rev=3D= 762365&r1=3D762364&r2=3D762365&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- = qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/= management/LoggingManagementMBean.java (original) +++ = qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/= management/LoggingManagementMBean.java Mon Apr 6 14:45:33 2009 @@ -69,7 +69,10 @@ private static final Logger _logger =3D = Logger.getLogger(LoggingManagementMBean.class); private String _log4jConfigFileName; private int _log4jLogWatchInterval; - =20 + private static final String[] LEVELS =3D new = String[]{Level.ALL.toString(), Level.TRACE.toString(),=20 + = Level.DEBUG.toString(), Level.INFO.toString(),=20 + = Level.WARN.toString(), Level.ERROR.toString(),=20 + = Level.FATAL.toString(),Level.OFF.toString()}; =20 static TabularType _loggerLevelTabularType; static CompositeType _loggerLevelCompositeType; =20 @@ -108,7 +111,11 @@ { return _log4jLogWatchInterval; } - + =20 + public String[] getAvailableLoggerLevels() + { + return LEVELS; + } @SuppressWarnings("unchecked") public synchronized boolean setRuntimeLoggerLevel(String logger, = String level) { =20 Modified: = qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/q= pid/management/ui/views/AttributesTabControl.java URL: = http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plug= in/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl= .java?rev=3D762365&r1=3D762364&r2=3D762365&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- = qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/q= pid/management/ui/views/AttributesTabControl.java (original) +++ = qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/q= pid/management/ui/views/AttributesTabControl.java Mon Apr 6 14:45:33 = 2009 @@ -509,10 +509,24 @@ { if (!isSimpleType(attribute.getValue())) { - Composite composite =3D new Composite(parent, = SWT.BORDER); - composite.setLayout(new GridLayout()); - composite.setLayoutData(new GridData(SWT.FILL, = SWT.FILL, true, false)); - ViewUtility.populateCompositeWithData(_toolkit, = composite, attribute.getValue()); + if (attribute.getValue() instanceof String[]) + { + String result =3D new String(""); + for(String val : (String[]) attribute.getValue()){ + result =3D result.concat(val+ "; "); + } + value =3D _toolkit.createText(parent, "", = textStyle); + =20 + value.setText(result); + value.setLayoutData(new GridData(SWT.FILL, SWT.TOP, = true, false)); + } + else + { + Composite composite =3D new Composite(parent, = SWT.BORDER); + composite.setLayout(new GridLayout()); + composite.setLayoutData(new GridData(SWT.FILL, = SWT.FILL, true, false)); + ViewUtility.populateCompositeWithData(_toolkit, = composite, attribute.getValue()); + } } else { @@ -877,7 +891,16 @@ break; case 1 : // attribute value column=20 if (attribute.getValue() !=3D null) - result =3D = String.valueOf(attribute.getValue()); + if (attribute.getValue() instanceof String[]) + { + for(String val : (String[]) = attribute.getValue()){ + result =3D result.concat(val+ "; "); + } + } + else + { + result =3D = String.valueOf(attribute.getValue()); + } break; default : result =3D ""; @@ -933,4 +956,4 @@ return collator.compare(attribtue1.getName(), = attribtue2.getName()); } } -} \ No newline at end of file +} --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscribe@qpid.apache.org --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:dev-subscribe@qpid.apache.org