activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1084175 [1/7] - in /activemq/trunk/activemq-core: ./ src/main/java/org/apache/activemq/ src/main/java/org/apache/activemq/broker/ src/main/java/org/apache/activemq/broker/jmx/ src/main/java/org/apache/activemq/broker/region/ src/main/java/...
Date Tue, 22 Mar 2011 13:46:19 GMT
Author: gtully
Date: Tue Mar 22 13:46:16 2011
New Revision: 1084175

URL: http://svn.apache.org/viewvc?rev=1084175&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3236 - In the case of DLQ processing due to an exception from onMessage, provide the exception string as a message property. New property, org.apache.activemq.command.ActiveMQMessage#DLQ_DELIVERY_FAILURE_CAUSE_PROPERTY will hold the string form of the exception that causes a posion ack for a dlq message. It may be null if the cause was regular calls to rollback or message expiry. Wireformat change to have exception included with messageAck. new version 7

Added:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTextMessageMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTopicMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseCommandMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BaseDataStreamMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/BrokerInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionControlMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionErrorMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConnectionInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerControlMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ConsumerInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ControlCommandMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataArrayResponseMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DataResponseMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DestinationInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/DiscoveryEventMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ExceptionResponseMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/FlushCommandMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/IntegerResponseMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalQueueAckMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTopicAckMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTraceMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/JournalTransactionMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/KeepAliveInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/LastPartialCommandMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/LocalTransactionIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MarshallerFactory.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageAckMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/MessagePullMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerAckMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ProducerInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ReplayCommandMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ResponseMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SessionInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ShutdownInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/SubscriptionInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/TransactionInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/BaseCommandTestSupport.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/BrokerIdTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/BrokerInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ConnectionControlTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ConnectionErrorTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ConnectionIdTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ConnectionInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ConsumerControlTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ConsumerIdTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ConsumerInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ControlCommandTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/DataArrayResponseTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/DataResponseTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/DestinationInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/DiscoveryEventTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ExceptionResponseTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/FlushCommandTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/IntegerResponseTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/JournalQueueAckTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/JournalTopicAckTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/JournalTraceTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/JournalTransactionTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/KeepAliveInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/LastPartialCommandTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/LocalTransactionIdTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageAckTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageDispatchNotificationTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageDispatchTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageIdTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessagePullTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/MessageTestSupport.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/NetworkBridgeFilterTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/PartialCommandTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ProducerAckTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ProducerIdTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ProducerInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/RemoveInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/RemoveSubscriptionInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ReplayCommandTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ResponseTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/SessionIdTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/SessionInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/ShutdownInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/SubscriptionInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/TransactionIdTestSupport.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/TransactionInfoTest.java   (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v7/XATransactionIdTest.java   (with props)
Modified:
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Tue Mar 22 13:46:16 2011
@@ -678,7 +678,7 @@
                   <tasks>
                     <echo>Running OpenWire Generator</echo>
                     <taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGeneratorTask" classpathref="maven.compile.classpath" />
-                    <generate version="6" basedir="${basedir}" />
+                    <generate version="7" basedir="${basedir}" />
                   </tasks>
                 </configuration>
                 <goals>

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Tue Mar 22 13:46:16 2011
@@ -1123,6 +1123,7 @@ public class ActiveMQMessageConsumer imp
                     // Acknowledge the last message.
                     
                     MessageAck ack = new MessageAck(lastMd, MessageAck.POSION_ACK_TYPE, deliveredMessages.size());
+                    ack.setPoisonCause(lastMd.getRollbackCause());
 					ack.setFirstMessageId(firstMsgId);
                     session.sendAck(ack,true);
                     // Adjust the window size.
@@ -1233,6 +1234,7 @@ public class ActiveMQMessageConsumer imp
                                 LOG.error(getConsumerId() + " Exception while processing message: " + md.getMessage().getMessageId(), e);
                                 if (isAutoAcknowledgeBatch() || isAutoAcknowledgeEach() || session.isIndividualAcknowledge()) {
                                     // schedual redelivery and possible dlq processing
+                                    md.setRollbackCause(e);
                                     rollback();
                                 } else {
                                     // Transacted or Client ack: Deliver the

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/SslBrokerService.java Tue Mar 22 13:46:16 2011
@@ -21,7 +21,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.security.KeyManagementException;
 import java.security.SecureRandom;
-import java.util.Arrays;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.TrustManager;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Tue Mar 22 13:46:16 2011
@@ -81,6 +81,7 @@ import org.apache.activemq.state.Consume
 import org.apache.activemq.state.ProducerState;
 import org.apache.activemq.state.SessionState;
 import org.apache.activemq.state.TransactionState;
+import org.apache.activemq.thread.DefaultThreadPools;
 import org.apache.activemq.thread.Task;
 import org.apache.activemq.thread.TaskRunner;
 import org.apache.activemq.thread.TaskRunnerFactory;
@@ -95,10 +96,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
-import static org.apache.activemq.thread.DefaultThreadPools.getDefaultTaskRunnerFactory;
-/**
- * 
- */
 public class TransportConnection implements Connection, Task, CommandVisitor {
     private static final Logger LOG = LoggerFactory.getLogger(TransportConnection.class);
     private static final Logger TRANSPORTLOG = LoggerFactory.getLogger(TransportConnection.class.getName() + ".Transport");
@@ -947,7 +944,7 @@ public class TransportConnection impleme
             }
             try {
                 final Map context = MDCHelper.getCopyOfContextMap();
-                getDefaultTaskRunnerFactory().execute(new Runnable(){
+                DefaultThreadPools.getDefaultTaskRunnerFactory().execute(new Runnable(){
                     public void run() {
                         serviceLock.writeLock().lock();
                         try {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java Tue Mar 22 13:46:16 2011
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.broker;
 
-import static org.apache.activemq.thread.DefaultThreadPools.getDefaultTaskRunnerFactory;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -32,6 +31,7 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.BrokerInfo;
 import org.apache.activemq.command.ConnectionControl;
 import org.apache.activemq.security.MessageAuthorizationPolicy;
+import org.apache.activemq.thread.DefaultThreadPools;
 import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportAcceptListener;
@@ -213,7 +213,7 @@ public class TransportConnector implemen
         getServer().setAcceptListener(new TransportAcceptListener() {
             public void onAccept(final Transport transport) {
                 try {
-                    getDefaultTaskRunnerFactory().execute(new Runnable() {
+                    DefaultThreadPools.getDefaultTaskRunnerFactory().execute(new Runnable() {
                         public void run() {
                             MDCHelper.setContextMap(context);
                             try {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/OpenTypeSupport.java Tue Mar 22 13:46:16 2011
@@ -16,15 +16,6 @@
  */
 package org.apache.activemq.broker.jmx;
 
-import static org.apache.activemq.broker.jmx.CompositeDataConstants.BODY_LENGTH;
-import static org.apache.activemq.broker.jmx.CompositeDataConstants.BODY_PREVIEW;
-import static org.apache.activemq.broker.jmx.CompositeDataConstants.CONTENT_MAP;
-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;
@@ -44,7 +35,6 @@ import javax.management.openmbean.Simple
 import javax.management.openmbean.TabularDataSupport;
 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;
@@ -54,7 +44,6 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQObjectMessage;
 import org.apache.activemq.command.ActiveMQStreamMessage;
 import org.apache.activemq.command.ActiveMQTextMessage;
-import org.apache.activemq.command.Message;
 
 public final class OpenTypeSupport {
 
@@ -137,9 +126,9 @@ public final class OpenTypeSupport {
             addItem("JMSPriority", "JMSPriority", SimpleType.INTEGER);
             addItem("JMSRedelivered", "JMSRedelivered", SimpleType.BOOLEAN);
             addItem("JMSTimestamp", "JMSTimestamp", SimpleType.DATE);
-            addItem(JMSXGROUP_ID, "Message Group ID", SimpleType.STRING);
-            addItem(JMSXGROUP_SEQ, "Message Group Sequence Number", SimpleType.INTEGER);
-            addItem(ORIGINAL_DESTINATION, "Original Destination Before Senting To DLQ", SimpleType.STRING);
+            addItem(CompositeDataConstants.JMSXGROUP_ID, "Message Group ID", SimpleType.STRING);
+            addItem(CompositeDataConstants.JMSXGROUP_SEQ, "Message Group Sequence Number", SimpleType.INTEGER);
+            addItem(CompositeDataConstants.ORIGINAL_DESTINATION, "Original Destination Before Senting To DLQ", SimpleType.STRING);
             addItem(CompositeDataConstants.PROPERTIES, "User Properties Text", SimpleType.STRING);
 
             // now lets expose the type safe properties
@@ -176,9 +165,9 @@ public final class OpenTypeSupport {
             rc.put("JMSPriority", Integer.valueOf(m.getJMSPriority()));
             rc.put("JMSRedelivered", Boolean.valueOf(m.getJMSRedelivered()));
             rc.put("JMSTimestamp", new Date(m.getJMSTimestamp()));
-            rc.put(JMSXGROUP_ID, m.getGroupID());
-            rc.put(JMSXGROUP_SEQ, m.getGroupSequence());
-            rc.put(ORIGINAL_DESTINATION, toString(m.getOriginalDestination()));
+            rc.put(CompositeDataConstants.JMSXGROUP_ID, m.getGroupID());
+            rc.put(CompositeDataConstants.JMSXGROUP_SEQ, m.getGroupSequence());
+            rc.put(CompositeDataConstants.ORIGINAL_DESTINATION, toString(m.getOriginalDestination()));
             try {
                 rc.put(CompositeDataConstants.PROPERTIES, "" + m.getProperties());
             } catch (IOException e) {
@@ -276,8 +265,8 @@ public final class OpenTypeSupport {
         @Override
         protected void init() throws OpenDataException {
             super.init();
-            addItem(BODY_LENGTH, "Body length", SimpleType.LONG);
-            addItem(BODY_PREVIEW, "Body preview", new ArrayType(1, SimpleType.BYTE));
+            addItem(CompositeDataConstants.BODY_LENGTH, "Body length", SimpleType.LONG);
+            addItem(CompositeDataConstants.BODY_PREVIEW, "Body preview", new ArrayType(1, SimpleType.BYTE));
         }
 
         @Override
@@ -288,9 +277,9 @@ public final class OpenTypeSupport {
             long length = 0;
             try {
                 length = m.getBodyLength();
-                rc.put(BODY_LENGTH, Long.valueOf(length));
+                rc.put(CompositeDataConstants.BODY_LENGTH, Long.valueOf(length));
             } catch (JMSException e) {
-                rc.put(BODY_LENGTH, Long.valueOf(0));
+                rc.put(CompositeDataConstants.BODY_LENGTH, Long.valueOf(0));
             }
             try {
                 byte preview[] = new byte[(int)Math.min(length, 255)];
@@ -304,9 +293,9 @@ public final class OpenTypeSupport {
                     data[i] = new Byte(preview[i]);
                 }
 
-                rc.put(BODY_PREVIEW, data);
+                rc.put(CompositeDataConstants.BODY_PREVIEW, data);
             } catch (JMSException e) {
-                rc.put(BODY_PREVIEW, new Byte[] {});
+                rc.put(CompositeDataConstants.BODY_PREVIEW, new Byte[] {});
             }
             return rc;
         }
@@ -323,7 +312,7 @@ public final class OpenTypeSupport {
         @Override
         protected void init() throws OpenDataException {
             super.init();
-            addItem(CONTENT_MAP, "Content map", SimpleType.STRING);
+            addItem(CompositeDataConstants.CONTENT_MAP, "Content map", SimpleType.STRING);
         }
 
         @Override
@@ -331,9 +320,9 @@ public final class OpenTypeSupport {
             ActiveMQMapMessage m = (ActiveMQMapMessage)o;
             Map<String, Object> rc = super.getFields(o);
             try {
-                rc.put(CONTENT_MAP, "" + m.getContentMap());
+                rc.put(CompositeDataConstants.CONTENT_MAP, "" + m.getContentMap());
             } catch (JMSException e) {
-                rc.put(CONTENT_MAP, "");
+                rc.put(CompositeDataConstants.CONTENT_MAP, "");
             }
             return rc;
         }
@@ -385,7 +374,7 @@ public final class OpenTypeSupport {
         @Override
         protected void init() throws OpenDataException {
             super.init();
-            addItem(MESSAGE_TEXT, MESSAGE_TEXT, SimpleType.STRING);
+            addItem(CompositeDataConstants.MESSAGE_TEXT, CompositeDataConstants.MESSAGE_TEXT, SimpleType.STRING);
         }
 
         @Override
@@ -393,9 +382,9 @@ public final class OpenTypeSupport {
             ActiveMQTextMessage m = (ActiveMQTextMessage)o;
             Map<String, Object> rc = super.getFields(o);
             try {
-                rc.put(MESSAGE_TEXT, "" + m.getText());
+                rc.put(CompositeDataConstants.MESSAGE_TEXT, "" + m.getText());
             } catch (JMSException e) {
-                rc.put(MESSAGE_TEXT, "");
+                rc.put(CompositeDataConstants.MESSAGE_TEXT, "");
             }
             return rc;
         }
@@ -446,7 +435,7 @@ public final class OpenTypeSupport {
         @Override
         protected void init() throws OpenDataException {
             super.init();
-            addItem(MESSAGE_URL, "Body Url", SimpleType.STRING);
+            addItem(CompositeDataConstants.MESSAGE_URL, "Body Url", SimpleType.STRING);
         }
 
         @Override
@@ -454,9 +443,9 @@ public final class OpenTypeSupport {
             ActiveMQBlobMessage m = (ActiveMQBlobMessage)o;
             Map<String, Object> rc = super.getFields(o);
             try {
-                rc.put(MESSAGE_URL, "" + m.getURL().toString());
+                rc.put(CompositeDataConstants.MESSAGE_URL, "" + m.getURL().toString());
             } catch (JMSException e) {
-                rc.put(MESSAGE_URL, "");
+                rc.put(CompositeDataConstants.MESSAGE_URL, "");
             }
             return rc;
         }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java Tue Mar 22 13:46:16 2011
@@ -29,6 +29,7 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.broker.region.cursors.PendingMessageCursor;
 import org.apache.activemq.broker.region.cursors.VMPendingMessageCursor;
+import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ConsumerControl;
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.command.Message;
@@ -359,6 +360,10 @@ public abstract class PrefetchSubscripti
                         inAckRange = true;
                     }
                     if (inAckRange) {
+                        if (ack.getPoisonCause() != null) {
+                            node.getMessage().setProperty(ActiveMQMessage.DLQ_DELIVERY_FAILURE_CAUSE_PROPERTY,
+                                    ack.getPoisonCause().toString());
+                        }
                         sendToDLQ(context, node);
                         node.getRegionDestination().getDestinationStatistics()
                                 .getInflight().decrement();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java Tue Mar 22 13:46:16 2011
@@ -44,6 +44,7 @@ import org.apache.activemq.util.TypeConv
  */
 public class ActiveMQMessage extends Message implements org.apache.activemq.Message, ScheduledMessage {
     public static final byte DATA_STRUCTURE_TYPE = CommandTypes.ACTIVEMQ_MESSAGE;
+    public static final String DLQ_DELIVERY_FAILURE_CAUSE_PROPERTY = "DLQ_DELIVERY_FAILURE_CAUSE";
     private static final Map<String, PropertySetter> JMS_PROPERTY_SETERS = new HashMap<String, PropertySetter>();
 
     protected transient Callback acknowledgeCallback;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/CommandTypes.java Tue Mar 22 13:46:16 2011
@@ -24,7 +24,7 @@ package org.apache.activemq.command;
 public interface CommandTypes {
 
     // What is the latest version of the openwire protocol
-    byte PROTOCOL_VERSION = 6;
+    byte PROTOCOL_VERSION = 7;
 
     // A marshaling layer can use this type to specify a null object.
     byte NULL = 0;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageAck.java Tue Mar 22 13:46:16 2011
@@ -71,6 +71,7 @@ public class MessageAck extends BaseComm
     protected ActiveMQDestination destination;
     protected TransactionId transactionId;
     protected int messageCount;
+    protected Throwable poisonCause;
 
     protected transient String consumerKey;
 
@@ -210,6 +211,20 @@ public class MessageAck extends BaseComm
         this.messageCount = messageCount;
     }
 
+    /**
+     * The cause of a poison ack, if a message listener
+     * throws an exception it will be recorded here
+     *
+     * @openwire:property version=7
+     */
+    public Throwable getPoisonCause() {
+        return poisonCause;
+    }
+
+    public void setPoisonCause(Throwable poisonCause) {
+        this.poisonCause = poisonCause;
+    }
+
     public Response visit(CommandVisitor visitor) throws Exception {
         return visitor.processMessageAck(this);
     }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java?rev=1084175&r1=1084174&r2=1084175&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/MessageDispatch.java Tue Mar 22 13:46:16 2011
@@ -35,6 +35,7 @@ public class MessageDispatch extends Bas
     protected transient long deliverySequenceId;
     protected transient Object consumer;
     protected transient Runnable transmitCallback;
+    protected transient Throwable rollbackCause;
 
     public byte getDataStructureType() {
         return DATA_STRUCTURE_TYPE;
@@ -116,4 +117,11 @@ public class MessageDispatch extends Bas
         this.transmitCallback = transmitCallback;
     }
 
+    public Throwable getRollbackCause() {
+        return rollbackCause;
+    }
+
+    public void setRollbackCause(Throwable rollbackCause) {
+        this.rollbackCause = rollbackCause;
+    }
 }

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQBlobMessageMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQBlobMessageMarshaller extends ActiveMQMessageMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQBlobMessage.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQBlobMessage();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream t
 o build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

        ActiveMQBlobMessage info = (ActiveMQBlobMessage)o;
        info.setRemoteBlobUrl(tightUnmarshalString(dataIn, bs));
        info.setMimeType(tightUnmarshalString(dataIn, bs));
        info.setDeletedByBroker(bs.readBoolean());

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        ActiveMQBlobMessage info = (ActiveMQBlobMessage)o;

        int rc = super.tightMarshal1(wireFormat, o, bs);
        rc += tightMarshalString1(info.getRemoteBlobUrl(), bs);
        rc += tightMarshalString1(info.getMimeType(), bs);
        bs.writeBoolean(info.isDeletedByBroker());

        return rc + 0;
 
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

        ActiveMQBlobMessage info = (ActiveMQBlobMessage)o;
        tightMarshalString2(info.getRemoteBlobUrl(), dataOut, bs);
        tightMarshalString2(info.getMimeType(), dataOut, bs);
        bs.readBoolean();

    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wi
 reFormat, o, dataIn);

        ActiveMQBlobMessage info = (ActiveMQBlobMessage)o;
        info.setRemoteBlobUrl(looseUnmarshalString(dataIn));
        info.setMimeType(looseUnmarshalString(dataIn));
        info.setDeletedByBroker(dataIn.readBoolean());

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        ActiveMQBlobMessage info = (ActiveMQBlobMessage)o;

        super.looseMarshal(wireFormat, o, dataOut);
        looseMarshalString(info.getRemoteBlobUrl(), dataOut);
        looseMarshalString(info.getMimeType(), dataOut);
        dataOut.writeBoolean(info.isDeletedByBroker());

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBlobMessageMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQBytesMessageMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQBytesMessage.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQBytesMessage();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stre
 am to build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the
  data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQBytesMessageMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQDestinationMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarshaller {

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

        ActiveMQDestination info = (ActiveMQDestination)o;
        info.setPhysicalName(tightUnmarshalString(dataIn, bs));

    }


 
    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        ActiveMQDestination info = (ActiveMQDestination)o;

        int rc = super.tightMarshal1(wireFormat, o, bs);
        rc += tightMarshalString1(info.getPhysicalName(), bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

        ActiveMQDestination info = (ActiveMQDestination)o;
        tightMarshalString2(info.getPhysicalName(), dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the data 
 input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

        ActiveMQDestination info = (ActiveMQDestination)o;
        info.setPhysicalName(looseUnmarshalString(dataIn));

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        ActiveMQDestination info = (ActiveMQDestination)o;

        super.looseMarshal(wireFormat, o, dataOut);
        looseMarshalString(info.getPhysicalName(), dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQDestinationMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQMapMessageMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQMapMessageMarshaller extends ActiveMQMessageMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQMapMessage.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQMapMessage();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to bu
 ild the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the data in
 put stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMapMessageMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQMessageMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQMessageMarshaller extends MessageMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQMessage.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQMessage();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
      * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the data input stream
     *
  
    * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQMessageMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQObjectMessageMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQObjectMessageMarshaller extends ActiveMQMessageMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQObjectMessage.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQObjectMessage();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input 
 stream to build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from
  the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQObjectMessageMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQQueueMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQQueueMarshaller extends ActiveMQDestinationMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQQueue.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQQueue();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object f
 rom
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the data input stream
     
 *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQQueueMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQStreamMessageMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQStreamMessageMarshaller extends ActiveMQMessageMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQStreamMessage.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQStreamMessage();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input 
 stream to build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from
  the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQStreamMessageMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQTempDestinationMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public abstract class ActiveMQTempDestinationMarshaller extends ActiveMQDestinationMarshaller {

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(
 OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the bo
 oleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempDestinationMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQTempQueueMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQTempQueueMarshaller extends ActiveMQTempDestinationMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQTempQueue.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQTempQueue();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream t
 o build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the dat
 a input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempQueueMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java?rev=1084175&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java (added)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java Tue Mar 22 13:46:16 2011
@@ -0,0 +1 @@
+/**
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v7;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activ
 emq.command.*;



/**
 * Marshalling code for Open Wire Format for ActiveMQTempTopicMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * 
 */
public class ActiveMQTempTopicMarshaller extends ActiveMQTempDestinationMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return ActiveMQTempTopic.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new ActiveMQTempTopic();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream t
 o build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        int rc = super.tightMarshal1(wireFormat, o, bs);

        return rc + 0;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the dat
 a input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {

        super.looseMarshal(wireFormat, o, dataOut);

    }
}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v7/ActiveMQTempTopicMarshaller.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message