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 [2/7] - in
/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire:
commands/ marshal/v2/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.cpp Fri Nov 9 06:29:53 2007
@@ -27,16 +27,17 @@
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;
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQDestinationMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQDestinationMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -46,13 +47,13 @@
dynamic_cast<ActiveMQDestination*>( dataStructure );
info->setPhysicalName( 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 ActiveMQDestinationMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQDestinationMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -64,13 +65,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 ActiveMQDestinationMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQDestinationMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -80,13 +81,13 @@
dynamic_cast<ActiveMQDestination*>( dataStructure );
tightMarshalString2( info->getPhysicalName(), 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 ActiveMQDestinationMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQDestinationMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -95,13 +96,13 @@
dynamic_cast<ActiveMQDestination*>( dataStructure );
info->setPhysicalName( 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 ActiveMQDestinationMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQDestinationMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
@@ -111,8 +112,8 @@
looseMarshalString( info->getPhysicalName(), 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/v2/ActiveMQDestinationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.h Fri Nov 9 06:29:53 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>
@@ -61,7 +61,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -84,7 +84,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -95,7 +95,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -105,7 +105,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.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* ActiveMQMapMessageMarshaller::createObject() const {
@@ -46,7 +47,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQMapMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQMapMessageMarshaller::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 ActiveMQMapMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQMapMessageMarshaller::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 ActiveMQMapMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQMapMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -93,13 +94,13 @@
dynamic_cast<ActiveMQMapMessage*>( 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 ActiveMQMapMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQMapMessageMarshaller::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 ActiveMQMapMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQMapMessageMarshaller::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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.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* ActiveMQMessageMarshaller::createObject() const {
@@ -46,7 +47,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQMessageMarshaller::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 ActiveMQMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQMessageMarshaller::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 ActiveMQMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -93,13 +94,13 @@
dynamic_cast<ActiveMQMessage*>( 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 ActiveMQMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQMessageMarshaller::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 ActiveMQMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQMessageMarshaller::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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.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* ActiveMQObjectMessageMarshaller::createObject() const {
@@ -46,7 +47,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQObjectMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQObjectMessageMarshaller::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 ActiveMQObjectMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQObjectMessageMarshaller::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 ActiveMQObjectMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQObjectMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -93,13 +94,13 @@
dynamic_cast<ActiveMQObjectMessage*>( 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 ActiveMQObjectMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQObjectMessageMarshaller::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 ActiveMQObjectMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQObjectMessageMarshaller::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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.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* ActiveMQQueueMarshaller::createObject() const {
@@ -46,20 +47,20 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQQueueMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQQueueMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
ActiveMQDestinationMarshaller::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 ActiveMQQueueMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQQueueMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -67,46 +68,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::decaf::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQQueueMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQQueueMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
ActiveMQDestinationMarshaller::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 ActiveMQQueueMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQQueueMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
ActiveMQDestinationMarshaller::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 ActiveMQQueueMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQQueueMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
ActiveMQDestinationMarshaller::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/v2/ActiveMQQueueMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.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* ActiveMQStreamMessageMarshaller::createObject() const {
@@ -46,7 +47,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQStreamMessageMarshaller::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 ActiveMQStreamMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQStreamMessageMarshaller::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 ActiveMQStreamMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQStreamMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -93,13 +94,13 @@
dynamic_cast<ActiveMQStreamMessage*>( 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 ActiveMQStreamMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQStreamMessageMarshaller::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 ActiveMQStreamMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQStreamMessageMarshaller::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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.cpp Fri Nov 9 06:29:53 2007
@@ -27,29 +27,30 @@
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;
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQTempDestinationMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQTempDestinationMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
ActiveMQDestinationMarshaller::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 ActiveMQTempDestinationMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQTempDestinationMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -57,46 +58,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::decaf::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQTempDestinationMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQTempDestinationMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
ActiveMQDestinationMarshaller::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 ActiveMQTempDestinationMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQTempDestinationMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
ActiveMQDestinationMarshaller::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 ActiveMQTempDestinationMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQTempDestinationMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
ActiveMQDestinationMarshaller::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/v2/ActiveMQTempDestinationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/ActiveMQDestinationMarshaller.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>
@@ -61,7 +61,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -84,7 +84,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -95,7 +95,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -105,7 +105,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throw( io::IOException );
+ decaf::io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.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* ActiveMQTempQueueMarshaller::createObject() const {
@@ -46,20 +47,20 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQTempQueueMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQTempQueueMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
ActiveMQTempDestinationMarshaller::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 ActiveMQTempQueueMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQTempQueueMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -67,46 +68,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::decaf::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQTempQueueMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQTempQueueMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
ActiveMQTempDestinationMarshaller::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 ActiveMQTempQueueMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQTempQueueMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
ActiveMQTempDestinationMarshaller::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 ActiveMQTempQueueMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQTempQueueMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
ActiveMQTempDestinationMarshaller::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/v2/ActiveMQTempQueueMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.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* ActiveMQTempTopicMarshaller::createObject() const {
@@ -46,20 +47,20 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQTempTopicMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQTempTopicMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
ActiveMQTempDestinationMarshaller::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 ActiveMQTempTopicMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQTempTopicMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -67,46 +68,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::decaf::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQTempTopicMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQTempTopicMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
ActiveMQTempDestinationMarshaller::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 ActiveMQTempTopicMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQTempTopicMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
ActiveMQTempDestinationMarshaller::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 ActiveMQTempTopicMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQTempTopicMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
ActiveMQTempDestinationMarshaller::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/v2/ActiveMQTempTopicMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/ActiveMQTempDestinationMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.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* ActiveMQTextMessageMarshaller::createObject() const {
@@ -46,7 +47,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ActiveMQTextMessageMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQTextMessageMarshaller::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 ActiveMQTextMessageMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ActiveMQTextMessageMarshaller::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 ActiveMQTextMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ActiveMQTextMessageMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -93,13 +94,13 @@
dynamic_cast<ActiveMQTextMessage*>( 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 ActiveMQTextMessageMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ActiveMQTextMessageMarshaller::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 ActiveMQTextMessageMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ActiveMQTextMessageMarshaller::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 )
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h?rev=593536&r1=593535&r2=593536&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshaller.h Fri Nov 9 06:29:53 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v2/MessageMarshaller.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,7 +73,7 @@
*/
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn,
+ decaf::io::DataInputStream* dataIn,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -96,7 +96,7 @@
*/
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut,
+ decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs ) throw( io::IOException );
/**
@@ -107,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throw( io::IOException );
+ decaf::io::DataInputStream* dataIn ) throw( 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( io::IOException );
};