Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C5945D653 for ; Wed, 1 Aug 2012 12:52:44 +0000 (UTC) Received: (qmail 22777 invoked by uid 500); 1 Aug 2012 12:52:44 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 22749 invoked by uid 500); 1 Aug 2012 12:52:44 -0000 Mailing-List: contact commits-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 commits@qpid.apache.org Received: (qmail 22742 invoked by uid 99); 1 Aug 2012 12:52:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Aug 2012 12:52:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Wed, 01 Aug 2012 12:52:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 84F03238889B for ; Wed, 1 Aug 2012 12:51:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1367967 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ broker-plugins/management-jmx/src/test/java/org/apache/qpi... Date: Wed, 01 Aug 2012 12:51:53 -0000 To: commits@qpid.apache.org From: robbie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120801125153.84F03238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: robbie Date: Wed Aug 1 12:51:51 2012 New Revision: 1367967 URL: http://svn.apache.org/viewvc?rev=1367967&view=rev Log: QPID-4170: prevent JMX threads from spinning in the Queue MBean if the content retrieval fails, log an error if it does. Add unit tests to expose issue and verify fix. merged from trunk r1367084 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.18/qpid/java/test-profiles/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaPre010Excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaTransientExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/XAExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/cpp.async.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/cpp.cluster.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/cpp.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/java-dby.0-9-1.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/java-mms.0-9-1.testprofile (props changed) qpid/branches/0.18/qpid/java/test-profiles/log4j-test.xml (props changed) qpid/branches/0.18/qpid/java/test-profiles/test-provider.properties (props changed) qpid/branches/0.18/qpid/java/test-profiles/test_resources/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/testprofile.defaults (props changed) Propchange: qpid/branches/0.18/qpid/java/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java:r1367084 Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-client/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1367084 Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1367084 Propchange: qpid/branches/0.18/qpid/java/amqp-1-0-common/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1367084 Propchange: qpid/branches/0.18/qpid/java/broker/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker:r1367084 Modified: qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java?rev=1367967&r1=1367966&r2=1367967&view=diff ============================================================================== --- qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java (original) +++ qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java Wed Aug 1 12:51:51 2012 @@ -43,6 +43,7 @@ import javax.management.openmbean.Tabula import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; import org.apache.commons.lang.time.FastDateFormat; +import org.apache.log4j.Logger; import org.apache.qpid.management.common.mbeans.ManagedQueue; import org.apache.qpid.server.jmx.AMQManagedObject; import org.apache.qpid.server.jmx.ManagedObject; @@ -59,6 +60,8 @@ import org.apache.qpid.server.queue.Queu public class QueueMBean extends AMQManagedObject implements ManagedQueue, QueueNotificationListener { + private static final Logger LOGGER = Logger.getLogger(QueueMBean.class); + private static final String[] VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC_ARRAY = VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.toArray(new String[VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.size()]); @@ -370,12 +373,14 @@ public class QueueMBean extends AMQManag byte[] msgContent = new byte[bodySize]; ByteBuffer buf = ByteBuffer.wrap(msgContent); - int position = 0; + int stored = serverMsg.getContent(buf, 0); - while(position < bodySize) + if(bodySize != stored) { - position += serverMsg.getContent(buf, position); - + LOGGER.error(String.format("An unexpected amount of content was retrieved " + + "(expected %d, got %d bytes) when viewing content for message with ID %d " + + "on queue '%s' in virtual host '%s'", + bodySize, stored, messageId, _queue.getName(), _vhostMBean.getName())); } AMQMessageHeader header = serverMsg.getMessageHeader(); @@ -591,7 +596,7 @@ public class QueueMBean extends AMQManag } - private static class GetMessageVisitor implements QueueEntryVisitor + protected static class GetMessageVisitor implements QueueEntryVisitor { private final long _messageNumber; Modified: qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java?rev=1367967&r1=1367966&r2=1367967&view=diff ============================================================================== --- qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java (original) +++ qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java Wed Aug 1 12:51:51 2012 @@ -18,12 +18,14 @@ */ package org.apache.qpid.server.jmx.mbeans; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; import static org.mockito.Matchers.isNull; import static org.mockito.Matchers.argThat; +import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collections; @@ -31,19 +33,26 @@ import javax.management.ListenerNotFound import javax.management.Notification; import javax.management.NotificationListener; import javax.management.OperationsException; +import javax.management.openmbean.CompositeDataSupport; +import org.apache.qpid.management.common.mbeans.ManagedQueue; import org.apache.qpid.server.jmx.ManagedObjectRegistry; +import org.apache.qpid.server.jmx.mbeans.QueueMBean.GetMessageVisitor; +import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.model.Exchange; import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.Statistics; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.queue.NotificationCheck; +import org.apache.qpid.server.queue.QueueEntry; +import org.apache.qpid.test.utils.QpidTestCase; import org.mockito.ArgumentMatcher; +import org.mockito.Matchers; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; -import junit.framework.TestCase; - -public class QueueMBeanTest extends TestCase +public class QueueMBeanTest extends QpidTestCase { private static final String QUEUE_NAME = "QUEUE_NAME"; private static final String QUEUE_DESCRIPTION = "QUEUE_DESCRIPTION"; @@ -59,6 +68,7 @@ public class QueueMBeanTest extends Test @Override protected void setUp() throws Exception { + super.setUp(); _mockQueue = mock(Queue.class); _mockQueueStatistics = mock(Statistics.class); when(_mockQueue.getName()).thenReturn(QUEUE_NAME); @@ -365,4 +375,65 @@ public class QueueMBeanTest extends Test verify(_mockQueue).setAttribute(underlyingAttributeName, originalAttributeValue, newAttributeValue); } + public void testViewMessageContent() throws Exception + { + viewMessageContentTestImpl(16L, 1000, 1000); + } + + public void testViewMessageContentWithMissingPayload() throws Exception + { + viewMessageContentTestImpl(16L, 1000, 0); + } + + private void viewMessageContentTestImpl(final long messageNumber, + final int messageSize, + final int messageContentSize) throws Exception + { + final byte[] content = new byte[messageContentSize]; + + //mock message and queue entry to return a given message size, and have a given content + final ServerMessage serverMessage = mock(ServerMessage.class); + when(serverMessage.getMessageNumber()).thenReturn(messageNumber); + when(serverMessage.getSize()).thenReturn((long)messageSize); + doAnswer(new Answer() + { + public Object answer(InvocationOnMock invocation) + { + Object[] args = invocation.getArguments(); + + //verify the arg types / expected values + assertEquals(2, args.length); + assertTrue(args[0] instanceof ByteBuffer); + assertTrue(args[1] instanceof Integer); + + ByteBuffer dest = (ByteBuffer) args[0]; + int offset = (Integer) args[1]; + assertEquals(0, offset); + + dest.put(content); + return messageContentSize; + } + }).when(serverMessage).getContent(Matchers.any(ByteBuffer.class), Matchers.anyInt()); + + final QueueEntry entry = mock(QueueEntry.class); + when(entry.getMessage()).thenReturn(serverMessage); + + //mock the queue.visit() method to ensure we match the mock message + doAnswer(new Answer() + { + public Object answer(InvocationOnMock invocation) + { + Object[] args = invocation.getArguments(); + GetMessageVisitor visitor = (GetMessageVisitor) args[0]; + visitor.visit(entry); + return null; + } + }).when(_mockQueue).visit(Matchers.any(GetMessageVisitor.class)); + + //now retrieve the content and verify its size + CompositeDataSupport comp = (CompositeDataSupport) _queueMBean.viewMessageContent(messageNumber); + assertNotNull(comp); + byte[] data = (byte[]) comp.get(ManagedQueue.CONTENT); + assertEquals(messageSize, data.length); + } } Propchange: qpid/branches/0.18/qpid/java/broker/bin/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/bin:r1367084 Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:r1367084 Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1367084 Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1367084 Propchange: qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:r1367084 Propchange: qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaPre010Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/JavaTransientExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/XAExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.async.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.cluster.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.noprefetch.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.ssl.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/cpp.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-bdb.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-dby.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/java-mms.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/log4j-test.xml ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/test-provider.properties ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/test_resources/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1367084 Propchange: qpid/branches/0.18/qpid/java/test-profiles/testprofile.defaults ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1367084 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org