Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

applied patch and test from https://issues.apache.org/activemq/browse/AMQ-3029 with thanks 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1035264 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-11-15 13:20:31 +00:00
parent d31e6beb56
commit eb034b4bc9
3 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/CompositeDataConstants.java
View File

@ -28,6 +28,8 @@ public interface CompositeDataConstants {
String BODY_PREVIEW = "BodyPreview";
String CONTENT_MAP = "ContentMap";
String MESSAGE_TEXT = "Text";
String MESSAGE_URL = "Url";
String ORIGINAL_DESTINATION = "OriginalDestination";
// User properties

30
activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java
View File

@ -23,6 +23,8 @@ import static org.apache.activemq.broker.jmx.CompositeDataConstants.JMSXGROUP_ID
import static org.apache.activemq.broker.jmx.CompositeDataConstants.JMSXGROUP_SEQ;
import static org.apache.activemq.broker.jmx.CompositeDataConstants.MESSAGE_TEXT;
import static org.apache.activemq.broker.jmx.CompositeDataConstants.ORIGINAL_DESTINATION;
import static org.apache.activemq.broker.jmx.CompositeDataConstants.MESSAGE_URL;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
@ -45,6 +47,7 @@ import javax.management.openmbean.TabularType;
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.broker.region.policy.SlowConsumerEntry;
import org.apache.activemq.broker.scheduler.Job;
import org.apache.activemq.command.ActiveMQBlobMessage;
import org.apache.activemq.command.ActiveMQBytesMessage;
import org.apache.activemq.command.ActiveMQMapMessage;
import org.apache.activemq.command.ActiveMQMessage;
@ -432,6 +435,32 @@ public final class OpenTypeSupport {
}
}
static class ActiveMQBlobMessageOpenTypeFactory extends MessageOpenTypeFactory {
@Override
protected String getTypeName() {
return ActiveMQBlobMessage.class.getName();
}
@Override
protected void init() throws OpenDataException {
super.init();
addItem(MESSAGE_URL, "Body Url", SimpleType.STRING);
}
@Override
public Map<String, Object> getFields(Object o) throws OpenDataException {
ActiveMQBlobMessage m = (ActiveMQBlobMessage)o;
Map<String, Object> rc = super.getFields(o);
try {
rc.put(MESSAGE_URL, "" + m.getURL().toString());
} catch (JMSException e) {
rc.put(MESSAGE_URL, "");
}
return rc;
}
}
static class SlowConsumerEntryOpenTypeFactory extends AbstractOpenTypeFactory {
@Override
protected String getTypeName() {
@ -466,6 +495,7 @@ public final class OpenTypeSupport {
OPEN_TYPE_FACTORIES.put(ActiveMQTextMessage.class, new TextMessageOpenTypeFactory());
OPEN_TYPE_FACTORIES.put(Job.class, new JobOpenTypeFactory());
OPEN_TYPE_FACTORIES.put(SlowConsumerEntry.class, new SlowConsumerEntryOpenTypeFactory());
OPEN_TYPE_FACTORIES.put(ActiveMQBlobMessage.class, new ActiveMQBlobMessageOpenTypeFactory());
}
private OpenTypeSupport() {

53
activemq-core/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
View File

@ -19,6 +19,7 @@ package org.apache.activemq.broker.jmx;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.URI;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@ -37,12 +38,15 @@ import javax.management.openmbean.TabularData;
import junit.textui.TestRunner;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQSession;
import org.apache.activemq.BlobMessage;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.BaseDestination;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy;
import org.apache.activemq.command.ActiveMQBlobMessage;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -575,6 +579,25 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
Thread.sleep(1000);
}
protected void useConnectionWithBlobMessage(Connection connection) throws Exception {
connection.setClientID(clientID);
connection.start();
ActiveMQSession session = (ActiveMQSession) connection.createSession(transacted, authMode);
destination = createDestination();
MessageProducer producer = session.createProducer(destination);
for (int i = 0; i < MESSAGE_COUNT; i++) {
BlobMessage message = session.createBlobMessage(new URL("http://foo.bar/test"));
message.setIntProperty("counter", i);
message.setJMSCorrelationID("MyCorrelationID");
message.setJMSReplyTo(new ActiveMQQueue("MyReplyTo"));
message.setJMSType("MyType");
message.setJMSPriority(5);
producer.send(message);
}
Thread.sleep(1000);
}
protected void echo(String text) {
LOG.info(text);
}
@ -583,4 +606,34 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
protected String getSecondDestinationString() {
return "test.new.destination." + getClass() + "." + getName();
}
// Test for AMQ-3029
public void testBrowseBlobMessages() throws Exception {
connection = connectionFactory.createConnection();
useConnectionWithBlobMessage(connection);
ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + ":Type=Queue,Destination=" + getDestinationString() + ",BrokerName=localhost");
QueueViewMBean queue = (QueueViewMBean)MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, QueueViewMBean.class, true);
CompositeData[] compdatalist = queue.browse();
int initialQueueSize = compdatalist.length;
if (initialQueueSize == 0) {
fail("There is no message in the queue:");
}
else {
echo("Current queue size: " + initialQueueSize);
}
int messageCount = initialQueueSize;
String[] messageIDs = new String[messageCount];
for (int i = 0; i < messageCount; i++) {
CompositeData cdata = compdatalist[i];
String messageID = (String) cdata.get("JMSMessageID");
assertNotNull("Should have a message ID for message " + i, messageID);
messageIDs[i] = messageID;
}
assertTrue("dest has some memory usage", queue.getMemoryPercentUsage() > 0);
}
}