Author: rhs
Date: Tue Jan 23 14:31:40 2007
New Revision: 499163
URL: http://svn.apache.org/viewvc?view=rev&rev=499163
Log:
fixed headers exchange, filled in more stubs
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java?view=diff&rev=499163&r1=499162&r2=499163
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
Tue Jan 23 14:31:40 2007
@@ -187,7 +187,7 @@
public void route(AMQMessage payload) throws AMQException
{
- FieldTable headers = payload.getHeadersTable();
+ FieldTable headers = payload.getApplicationHeaders();
if (_logger.isDebugEnabled())
{
_logger.debug("Exchange " + getName() + ": routing message with
headers " + headers);
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java?view=diff&rev=499163&r1=499162&r2=499163
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
Tue Jan 23 14:31:40 2007
@@ -154,12 +154,8 @@
return size;
}
- public FieldTable getHeadersTable() {
- throw new Error("XXX");
- }
-
public FieldTable getApplicationHeaders() {
- throw new Error("XXX");
+ return _transferBody.getApplicationHeaders();
}
public void setXXXMessageId(String messageId) {
@@ -191,7 +187,15 @@
}
public String getReplyTo() {
- throw new Error("XXX");
+ return _transferBody.getReplyTo();
+ }
+
+ public String getAppId() {
+ return _transferBody.getAppId();
+ }
+
+ public String getUserId() {
+ return _transferBody.getUserId();
}
public void setCorrelationId(String correlationId) {
Modified:
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java?view=diff&rev=499163&r1=499162&r2=499163
==============================================================================
---
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
(original)
+++
incubator/qpid/branches/qpid.0-9/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
Tue Jan 23 14:31:40 2007
@@ -31,9 +31,12 @@
import javax.management.MBeanNotificationInfo;
import javax.management.OperationsException;
import javax.management.monitor.MonitorNotification;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
-import java.util.ArrayList;
/**
* MBean class for AMQQueue. It implements all the management features exposed
@@ -282,6 +285,21 @@
return new CompositeDataSupport(_msgContentType,
_msgContentAttributes, itemValues);
}
+ private static Map getHeaders(AMQMessage msg) {
+ Map hdrs = new LinkedHashMap();
+ hdrs.put("Reply-To", msg.getReplyTo());
+ hdrs.put("Application-Id", msg.getAppId());
+ hdrs.put("User-Id", msg.getUserId());
+ hdrs.put("Message-Id", msg.getXXXMessageId());
+ hdrs.put("Correlation-Id", msg.getCorrelationId());
+ hdrs.put("DeliveryMode", msg.getDeliveryMode());
+ hdrs.put("Expiration", msg.getExpiration());
+ hdrs.put("Priority", msg.getPriority());
+ hdrs.put("Timestamp", msg.getTimestamp());
+ hdrs.put("Type", msg.getType());
+ return hdrs;
+ }
+
/**
* Returns the header contents of the messages stored in this queue in
tabular form.
*/
@@ -301,8 +319,8 @@
{
AMQMessage msg = list.get(i - 1);
// Create header attributes list
- FieldTable headers = msg.getHeadersTable();
- Set<String> names = headers.keys();
+ Map headers = getHeaders(msg);
+ Set<String> names = headers.keySet();
String[] values = new String[names.size()];
int index = 0;
for (String name : names) {
