You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2007/11/09 15:30:01 UTC
svn commit: r593536 [1/7] - in /activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire: commands/ marshal/v2/

Author: tabish
Date: Fri Nov  9 06:29:53 2007
New Revision: 593536

URL: http://svn.apache.org/viewvc?rev=593536&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Modified:
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionError.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ControlCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataResponse.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DiscoveryEvent.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ExceptionResponse.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/FlushCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalQueueAck.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTrace.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LastPartialCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Message.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageAck.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessagePull.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/BrokerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionControlMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerControlMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTraceMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/JournalTransactionMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageAckMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessageMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/MessagePullMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/PartialCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ProducerIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/TransactionInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/XATransactionIdMarshaller.h

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ActiveMQTextMessage.cpp Fri Nov  9 06:29:53 2007
@@ -70,11 +70,11 @@
     try{
         std::vector<unsigned char>& content = getContent();
         content.clear();
-        io::ByteArrayOutputStream bos( content );
-        io::DataOutputStream dos( &bos );
+        decaf::io::ByteArrayOutputStream bos( content );
+        decaf::io::DataOutputStream dos( &bos );
 
         dos.writeInt( (int)msg.length() );
-        dos.write( (const unsigned char*)msg.c_str(), msg.length() );
+        dos.write( (const unsigned char*)msg.c_str(), 0, msg.length() );
     }
     AMQ_CATCH_RETHROW( exceptions::ActiveMQException )
     AMQ_CATCHALL_THROW( exceptions::ActiveMQException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/BrokerId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -65,7 +67,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "BrokerId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/BrokerInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/BrokerInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -77,7 +79,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "BrokerInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionControl.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ConnectionControl.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -69,7 +71,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ConnectionControl::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionError.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionError.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionError.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionError.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ConnectionError.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -68,7 +70,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ConnectionError::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ConnectionId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -65,7 +67,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ConnectionId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConnectionInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ConnectionInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -75,7 +77,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ConnectionInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerControl.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ConsumerControl.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -71,7 +73,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ConsumerControl::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ConsumerId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -67,7 +69,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ConsumerId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ConsumerInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ConsumerInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -86,7 +88,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ConsumerInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ControlCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ControlCommand.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ControlCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ControlCommand.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ControlCommand.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -65,7 +67,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ControlCommand::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataArrayResponse.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/DataArrayResponse.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -67,7 +69,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "DataArrayResponse::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataResponse.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DataResponse.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/DataResponse.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -66,7 +68,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "DataResponse::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DestinationInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/DestinationInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -73,7 +75,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "DestinationInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DiscoveryEvent.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DiscoveryEvent.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DiscoveryEvent.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/DiscoveryEvent.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/DiscoveryEvent.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -66,7 +68,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "DiscoveryEvent::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ExceptionResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ExceptionResponse.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ExceptionResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ExceptionResponse.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ExceptionResponse.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -66,7 +68,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ExceptionResponse::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/FlushCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/FlushCommand.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/FlushCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/FlushCommand.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/FlushCommand.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -64,7 +66,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "FlushCommand::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/IntegerResponse.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/IntegerResponse.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -65,7 +67,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "IntegerResponse::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalQueueAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalQueueAck.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalQueueAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalQueueAck.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/JournalQueueAck.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -68,7 +70,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "JournalQueueAck::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTopicAck.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/JournalTopicAck.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -73,7 +75,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "JournalTopicAck::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTrace.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTrace.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTrace.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTrace.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/JournalTrace.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -65,7 +67,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "JournalTrace::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/JournalTransaction.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/JournalTransaction.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -68,7 +70,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "JournalTransaction::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/KeepAliveInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/KeepAliveInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -64,7 +66,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "KeepAliveInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LastPartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LastPartialCommand.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LastPartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LastPartialCommand.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/LastPartialCommand.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -64,7 +66,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "LastPartialCommand::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/LocalTransactionId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/LocalTransactionId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -67,7 +69,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "LocalTransactionId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Message.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Message.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Message.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Message.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/Message.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -99,7 +101,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "Message::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageAck.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageAck.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageAck.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageAck.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/MessageAck.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -76,7 +78,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessageAck::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatch.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/MessageDispatch.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -71,7 +73,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessageDispatch::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageDispatchNotification.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/MessageDispatchNotification.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -71,7 +73,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessageDispatchNotification::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessageId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/MessageId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -68,7 +70,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessageId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessagePull.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessagePull.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessagePull.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/MessagePull.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/MessagePull.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -69,7 +71,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "MessagePull::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/NetworkBridgeFilter.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/NetworkBridgeFilter.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -67,7 +69,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "NetworkBridgeFilter::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/PartialCommand.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/PartialCommand.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -65,7 +67,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "PartialCommand::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ProducerId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -67,7 +69,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ProducerId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ProducerInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ProducerInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -72,7 +74,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ProducerInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/RemoveInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -66,7 +68,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "RemoveInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/RemoveSubscriptionInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/RemoveSubscriptionInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -68,7 +70,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "RemoveSubscriptionInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ReplayCommand.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ReplayCommand.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -66,7 +68,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ReplayCommand::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/Response.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/Response.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -65,7 +67,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "Response::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/SessionId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -66,7 +68,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "SessionId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SessionInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/SessionInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -66,7 +68,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "SessionInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/ShutdownInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/ShutdownInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -64,7 +66,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "ShutdownInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/SubscriptionInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/SubscriptionInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -69,7 +71,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "SubscriptionInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/TransactionId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -64,7 +66,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "TransactionId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/TransactionInfo.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/TransactionInfo.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -69,7 +71,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "TransactionInfo::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/commands/XATransactionId.cpp Fri Nov  9 06:29:53 2007
@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 #include <activemq/connector/openwire/commands/XATransactionId.h>
-#include <activemq/exceptions/NullPointerException.h>
+#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 
 using namespace std;
 using namespace activemq;
@@ -23,6 +24,7 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang::exceptions;
 
 /*
  *
@@ -65,7 +67,7 @@
 
     if( srcPtr == NULL || src == NULL ) {
     
-        throw exceptions::NullPointerException(
+        throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
             "XATransactionId::copyDataStructure - src is NULL or invalid" );
     }

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.cpp Fri Nov  9 06:29:53 2007
@@ -27,13 +27,14 @@
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::io;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
 using namespace activemq::connector::openwire::marshal::v2;
+using namespace decaf;
+using namespace decaf::io;
 
 ///////////////////////////////////////////////////////////////////////////////
 DataStructure* ActiveMQBytesMessageMarshaller::createObject() const {
@@ -46,7 +47,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQBytesMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -59,13 +60,13 @@
 
         info->afterUnmarshal( wireFormat );
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-int ActiveMQBytesMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQBytesMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -77,13 +78,13 @@
 
         return rc + 0;
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQBytesMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -93,13 +94,13 @@
             dynamic_cast<ActiveMQBytesMessage*>( dataStructure );
         info->afterMarshal( wireFormat );
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQBytesMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -109,13 +110,13 @@
         info->beforeUnmarshal( wireFormat );
         info->afterUnmarshal( wireFormat );
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQBytesMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
 
     try {
 
@@ -126,8 +127,8 @@
 
         info->afterMarshal( wireFormat );
     }
-    AMQ_CATCH_RETHROW( io::IOException )
-    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, io::IOException )
-    AMQ_CATCHALL_THROW( io::IOException )
+    AMQ_CATCH_RETHROW( decaf::io::IOException )
+    AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+    AMQ_CATCHALL_THROW( decaf::io::IOException )
 }