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 16:25:57 UTC
svn commit: r593561 [5/11] - in
/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal:
v1/ v2/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.h>
#include <activemq/connector/openwire/commands/JournalTrace.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* JournalTraceMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void JournalTraceMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void JournalTraceMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -56,13 +59,13 @@
dynamic_cast<JournalTrace*>( dataStructure );
info->setMessage( tightUnmarshalString( dataIn, bs ) );
}
- 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 JournalTraceMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int JournalTraceMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -74,13 +77,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::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void JournalTraceMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void JournalTraceMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -90,13 +93,13 @@
dynamic_cast<JournalTrace*>( dataStructure );
tightMarshalString2( info->getMessage(), dataOut, bs );
}
- 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 JournalTraceMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void JournalTraceMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -105,24 +108,24 @@
dynamic_cast<JournalTrace*>( dataStructure );
info->setMessage( looseUnmarshalString( dataIn ) );
}
- 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 JournalTraceMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void JournalTraceMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
JournalTrace* info =
dynamic_cast<JournalTrace*>( dataStructure );
- BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalString( info->getMessage(), dataOut );
}
- 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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTraceMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
#include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- utils::BooleanStream* bs ) throw( io::IOException );
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -96,8 +96,8 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -117,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.h>
#include <activemq/connector/openwire/commands/JournalTransaction.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* JournalTransactionMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void JournalTransactionMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void JournalTransactionMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -59,13 +62,13 @@
info->setType( dataIn->readByte() );
info->setWasPrepared( bs->readBoolean() );
}
- 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 JournalTransactionMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int JournalTransactionMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -78,13 +81,13 @@
return rc + 1;
}
- 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 JournalTransactionMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void JournalTransactionMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -96,13 +99,13 @@
dataOut->write( info->getType() );
bs->readBoolean();
}
- 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 JournalTransactionMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void JournalTransactionMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -114,26 +117,26 @@
info->setType( dataIn->readByte() );
info->setWasPrepared( dataIn->readBoolean() );
}
- 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 JournalTransactionMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void JournalTransactionMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
JournalTransaction* info =
dynamic_cast<JournalTransaction*>( dataStructure );
- BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalNestedObject( wireFormat, info->getTransactionId(), dataOut );
dataOut->write( info->getType() );
dataOut->writeBoolean( info->getWasPrepared() );
}
- 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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTransactionMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
#include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- utils::BooleanStream* bs ) throw( io::IOException );
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -96,8 +96,8 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -117,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.h>
#include <activemq/connector/openwire/commands/KeepAliveInfo.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* KeepAliveInfoMarshaller::createObject() const {
@@ -46,20 +49,20 @@
}
///////////////////////////////////////////////////////////////////////////////
-void KeepAliveInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void KeepAliveInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
}
- 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 KeepAliveInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int KeepAliveInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -67,46 +70,46 @@
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::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void KeepAliveInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void KeepAliveInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
}
- 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 KeepAliveInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void KeepAliveInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
}
- 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 KeepAliveInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void KeepAliveInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
- BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
}
- 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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/BaseCommandMarshaller.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
#include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- utils::BooleanStream* bs ) throw( io::IOException );
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -96,8 +96,8 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -117,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.h>
#include <activemq/connector/openwire/commands/LastPartialCommand.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* LastPartialCommandMarshaller::createObject() const {
@@ -46,20 +49,20 @@
}
///////////////////////////////////////////////////////////////////////////////
-void LastPartialCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void LastPartialCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
PartialCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
}
- 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 LastPartialCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int LastPartialCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -67,46 +70,46 @@
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::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void LastPartialCommandMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void LastPartialCommandMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
PartialCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
}
- 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 LastPartialCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void LastPartialCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
PartialCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
}
- 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 LastPartialCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void LastPartialCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
- PartialCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ PartialCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
}
- 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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/PartialCommandMarshaller.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
#include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- utils::BooleanStream* bs ) throw( io::IOException );
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -96,8 +96,8 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -117,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.h>
#include <activemq/connector/openwire/commands/LocalTransactionId.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* LocalTransactionIdMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void LocalTransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void LocalTransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -58,13 +61,13 @@
info->setConnectionId( dynamic_cast< ConnectionId* >(
tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
}
- 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 LocalTransactionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int LocalTransactionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -77,13 +80,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::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void LocalTransactionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void LocalTransactionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -94,13 +97,13 @@
tightMarshalLong2( wireFormat, info->getValue(), dataOut, bs );
tightMarshalCachedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
}
- 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 LocalTransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void LocalTransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -111,25 +114,25 @@
info->setConnectionId( dynamic_cast< ConnectionId* >(
looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
}
- 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 LocalTransactionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void LocalTransactionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
LocalTransactionId* info =
dynamic_cast<LocalTransactionId*>( dataStructure );
- TransactionIdMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ TransactionIdMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalLong( wireFormat, info->getValue(), dataOut );
looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
}
- 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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/TransactionIdMarshaller.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
#include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- utils::BooleanStream* bs ) throw( io::IOException );
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -96,8 +96,8 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -117,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageAckMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageAckMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/MessageAckMarshaller.h>
#include <activemq/connector/openwire/commands/MessageAck.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* MessageAckMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void MessageAckMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void MessageAckMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -67,13 +70,13 @@
tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
info->setMessageCount( dataIn->readInt() );
}
- 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 MessageAckMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int MessageAckMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -89,13 +92,13 @@
return rc + 5;
}
- 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 MessageAckMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void MessageAckMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -111,13 +114,13 @@
tightMarshalNestedObject2( wireFormat, info->getLastMessageId(), dataOut, bs );
dataOut->writeInt( info->getMessageCount() );
}
- 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 MessageAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void MessageAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -137,19 +140,19 @@
looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
info->setMessageCount( dataIn->readInt() );
}
- 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 MessageAckMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void MessageAckMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
MessageAck* info =
dynamic_cast<MessageAck*>( dataStructure );
- BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
looseMarshalCachedObject( wireFormat, info->getTransactionId(), dataOut );
@@ -159,8 +162,8 @@
looseMarshalNestedObject( wireFormat, info->getLastMessageId(), dataOut );
dataOut->writeInt( info->getMessageCount() );
}
- 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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageAckMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageAckMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/BaseCommandMarshaller.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
#include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- utils::BooleanStream* bs ) throw( io::IOException );
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -96,8 +96,8 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -117,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.h>
#include <activemq/connector/openwire/commands/MessageDispatch.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* MessageDispatchMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void MessageDispatchMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void MessageDispatchMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -62,13 +65,13 @@
tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
info->setRedeliveryCounter( dataIn->readInt() );
}
- 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 MessageDispatchMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int MessageDispatchMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -82,13 +85,13 @@
return rc + 4;
}
- 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 MessageDispatchMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void MessageDispatchMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -101,13 +104,13 @@
tightMarshalNestedObject2( wireFormat, info->getMessage(), dataOut, bs );
dataOut->writeInt( info->getRedeliveryCounter() );
}
- 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 MessageDispatchMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void MessageDispatchMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -122,27 +125,27 @@
looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
info->setRedeliveryCounter( dataIn->readInt() );
}
- 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 MessageDispatchMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void MessageDispatchMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
MessageDispatch* info =
dynamic_cast<MessageDispatch*>( dataStructure );
- BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
looseMarshalNestedObject( wireFormat, info->getMessage(), dataOut );
dataOut->writeInt( info->getRedeliveryCounter() );
}
- 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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/BaseCommandMarshaller.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
#include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- utils::BooleanStream* bs ) throw( io::IOException );
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -96,8 +96,8 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -117,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.h>
#include <activemq/connector/openwire/commands/MessageDispatchNotification.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* MessageDispatchNotificationMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void MessageDispatchNotificationMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void MessageDispatchNotificationMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -62,13 +65,13 @@
info->setMessageId( dynamic_cast< MessageId* >(
tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
}
- 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 MessageDispatchNotificationMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int MessageDispatchNotificationMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -83,13 +86,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::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void MessageDispatchNotificationMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void MessageDispatchNotificationMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -102,13 +105,13 @@
tightMarshalLong2( wireFormat, info->getDeliverySequenceId(), dataOut, bs );
tightMarshalNestedObject2( wireFormat, info->getMessageId(), dataOut, bs );
}
- 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 MessageDispatchNotificationMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void MessageDispatchNotificationMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -123,27 +126,27 @@
info->setMessageId( dynamic_cast< MessageId* >(
looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
}
- 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 MessageDispatchNotificationMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void MessageDispatchNotificationMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
MessageDispatchNotification* info =
dynamic_cast<MessageDispatchNotification*>( dataStructure );
- BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
looseMarshalLong( wireFormat, info->getDeliverySequenceId(), dataOut );
looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );
}
- 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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/BaseCommandMarshaller.h>
-#include <activemq/io/DataInputStream.h>
-#include <activemq/io/DataOutputStream.h>
-#include <activemq/io/IOException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/IOException.h>
#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
#include <activemq/connector/openwire/utils/BooleanStream.h>
@@ -73,8 +73,8 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -85,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- utils::BooleanStream* bs ) throw( io::IOException );
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -96,8 +96,8 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
- utils::BooleanStream* bs ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut,
+ utils::BooleanStream* bs ) throw( decaf::io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( decaf::io::IOException );
/**
* Write a object instance to data output stream
@@ -117,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( decaf::io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageIdMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageIdMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/MessageIdMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/MessageIdMarshaller.h>
#include <activemq/connector/openwire/commands/MessageId.h>
+#include <activemq/exceptions/ActiveMQException.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -27,13 +28,15 @@
using namespace std;
using namespace activemq;
-using namespace activemq::io;
+using namespace activemq::exceptions;
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::v1;
+using namespace decaf;
+using namespace decaf::io;
///////////////////////////////////////////////////////////////////////////////
DataStructure* MessageIdMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void MessageIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void MessageIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -59,13 +62,13 @@
info->setProducerSequenceId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
info->setBrokerSequenceId( tightUnmarshalLong( wireFormat, dataIn, bs ) );
}
- 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 MessageIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int MessageIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -79,13 +82,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::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void MessageIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void MessageIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -97,13 +100,13 @@
tightMarshalLong2( wireFormat, info->getProducerSequenceId(), dataOut, bs );
tightMarshalLong2( wireFormat, info->getBrokerSequenceId(), dataOut, bs );
}
- 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 MessageIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void MessageIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -115,26 +118,26 @@
info->setProducerSequenceId( looseUnmarshalLong( wireFormat, dataIn ) );
info->setBrokerSequenceId( looseUnmarshalLong( wireFormat, dataIn ) );
}
- 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 MessageIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void MessageIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
MessageId* info =
dynamic_cast<MessageId*>( dataStructure );
- BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalCachedObject( wireFormat, info->getProducerId(), dataOut );
looseMarshalLong( wireFormat, info->getProducerSequenceId(), dataOut );
looseMarshalLong( wireFormat, info->getBrokerSequenceId(), dataOut );
}
- 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 )
}