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 [4/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/DataArrayResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/ResponseMarshaller.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/DataResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataResponseMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataResponseMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/DataResponseMarshaller.h>
#include <activemq/connector/openwire/commands/DataResponse.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* DataResponseMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void DataResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -57,13 +60,13 @@
info->setData( dynamic_cast< DataStructure* >(
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 DataResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int DataResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -75,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::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void DataResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -91,13 +94,13 @@
dynamic_cast<DataResponse*>( dataStructure );
tightMarshalNestedObject2( wireFormat, info->getData(), 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 DataResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void DataResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -107,24 +110,24 @@
info->setData( dynamic_cast< DataStructure* >(
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 DataResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void DataResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
DataResponse* info =
dynamic_cast<DataResponse*>( dataStructure );
- ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalNestedObject( wireFormat, info->getData(), 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/DataResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataResponseMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DataResponseMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/ResponseMarshaller.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/DestinationInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DestinationInfoMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DestinationInfoMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DestinationInfoMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/DestinationInfoMarshaller.h>
#include <activemq/connector/openwire/commands/DestinationInfo.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* DestinationInfoMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void DestinationInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -73,13 +76,13 @@
info->getBrokerPath().clear();
}
}
- 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 DestinationInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int DestinationInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -94,13 +97,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 DestinationInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void DestinationInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -114,13 +117,13 @@
tightMarshalLong2( wireFormat, info->getTimeout(), dataOut, bs );
tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), 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 DestinationInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void DestinationInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -146,19 +149,19 @@
info->getBrokerPath().clear();
}
}
- 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 DestinationInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void DestinationInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
DestinationInfo* info =
dynamic_cast<DestinationInfo*>( dataStructure );
- BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
@@ -166,8 +169,8 @@
looseMarshalLong( wireFormat, info->getTimeout(), dataOut );
looseMarshalObjectArray( wireFormat, info->getBrokerPath(), 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/DestinationInfoMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DestinationInfoMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DestinationInfoMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DestinationInfoMarshaller.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/DiscoveryEventMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/DiscoveryEventMarshaller.h>
#include <activemq/connector/openwire/commands/DiscoveryEvent.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* DiscoveryEventMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void DiscoveryEventMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -57,13 +60,13 @@
info->setServiceName( tightUnmarshalString( dataIn, bs ) );
info->setBrokerName( 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 DiscoveryEventMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int DiscoveryEventMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -76,13 +79,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 DiscoveryEventMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void DiscoveryEventMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -93,13 +96,13 @@
tightMarshalString2( info->getServiceName(), dataOut, bs );
tightMarshalString2( info->getBrokerName(), 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 DiscoveryEventMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void DiscoveryEventMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -109,25 +112,25 @@
info->setServiceName( looseUnmarshalString( dataIn ) );
info->setBrokerName( 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 DiscoveryEventMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void DiscoveryEventMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
DiscoveryEvent* info =
dynamic_cast<DiscoveryEvent*>( dataStructure );
- BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalString( info->getServiceName(), dataOut );
looseMarshalString( info->getBrokerName(), 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/DiscoveryEventMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshaller.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/ExceptionResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/ExceptionResponseMarshaller.h>
#include <activemq/connector/openwire/commands/ExceptionResponse.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* ExceptionResponseMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ExceptionResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void ExceptionResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -57,13 +60,13 @@
info->setException( dynamic_cast< BrokerError* >(
tightUnmarshalBrokerError( 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 ExceptionResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int ExceptionResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -75,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::io::IOException )
+ AMQ_CATCH_EXCEPTION_CONVERT( exceptions::ActiveMQException, decaf::io::IOException )
+ AMQ_CATCHALL_THROW( decaf::io::IOException )
}
///////////////////////////////////////////////////////////////////////////////
-void ExceptionResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void ExceptionResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -91,13 +94,13 @@
dynamic_cast<ExceptionResponse*>( dataStructure );
tightMarshalBrokerError2( wireFormat, info->getException(), 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 ExceptionResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void ExceptionResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -107,24 +110,24 @@
info->setException( dynamic_cast< BrokerError* >(
looseUnmarshalBrokerError( 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 ExceptionResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void ExceptionResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
ExceptionResponse* info =
dynamic_cast<ExceptionResponse*>( dataStructure );
- ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalBrokerError( wireFormat, info->getException(), 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/ExceptionResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/ResponseMarshaller.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/FlushCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/FlushCommandMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/FlushCommandMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/FlushCommandMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/FlushCommandMarshaller.h>
#include <activemq/connector/openwire/commands/FlushCommand.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* FlushCommandMarshaller::createObject() const {
@@ -46,20 +49,20 @@
}
///////////////////////////////////////////////////////////////////////////////
-void FlushCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void FlushCommandMarshaller::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 FlushCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int FlushCommandMarshaller::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 FlushCommandMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void FlushCommandMarshaller::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 FlushCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void FlushCommandMarshaller::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 FlushCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void FlushCommandMarshaller::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/FlushCommandMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/FlushCommandMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/FlushCommandMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/FlushCommandMarshaller.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/IntegerResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/IntegerResponseMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/IntegerResponseMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/IntegerResponseMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/IntegerResponseMarshaller.h>
#include <activemq/connector/openwire/commands/IntegerResponse.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* IntegerResponseMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void IntegerResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void IntegerResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -56,13 +59,13 @@
dynamic_cast<IntegerResponse*>( dataStructure );
info->setResult( 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 IntegerResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int IntegerResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -70,13 +73,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 IntegerResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void IntegerResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -86,13 +89,13 @@
dynamic_cast<IntegerResponse*>( dataStructure );
dataOut->writeInt( info->getResult() );
}
- 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 IntegerResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void IntegerResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -101,24 +104,24 @@
dynamic_cast<IntegerResponse*>( dataStructure );
info->setResult( 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 IntegerResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void IntegerResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
IntegerResponse* info =
dynamic_cast<IntegerResponse*>( dataStructure );
- ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
dataOut->writeInt( info->getResult() );
}
- 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/IntegerResponseMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/IntegerResponseMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/IntegerResponseMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/IntegerResponseMarshaller.h Fri Nov 9 07:25:45 2007
@@ -25,9 +25,9 @@
#include <activemq/connector/openwire/marshal/v1/ResponseMarshaller.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/JournalQueueAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/JournalQueueAckMarshaller.h>
#include <activemq/connector/openwire/commands/JournalQueueAck.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* JournalQueueAckMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void JournalQueueAckMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void JournalQueueAckMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -59,13 +62,13 @@
info->setMessageAck( dynamic_cast< MessageAck* >(
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 JournalQueueAckMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int JournalQueueAckMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -78,13 +81,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 JournalQueueAckMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void JournalQueueAckMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -95,13 +98,13 @@
tightMarshalNestedObject2( wireFormat, info->getDestination(), dataOut, bs );
tightMarshalNestedObject2( wireFormat, info->getMessageAck(), 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 JournalQueueAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void JournalQueueAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -113,25 +116,25 @@
info->setMessageAck( dynamic_cast< MessageAck* >(
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 JournalQueueAckMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void JournalQueueAckMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
JournalQueueAck* info =
dynamic_cast<JournalQueueAck*>( dataStructure );
- BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalNestedObject( wireFormat, info->getDestination(), dataOut );
looseMarshalNestedObject( wireFormat, info->getMessageAck(), 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/JournalQueueAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshaller.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/JournalTopicAckMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshaller.cpp?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshaller.cpp Fri Nov 9 07:25:45 2007
@@ -18,6 +18,7 @@
#include <activemq/connector/openwire/marshal/v1/JournalTopicAckMarshaller.h>
#include <activemq/connector/openwire/commands/JournalTopicAck.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* JournalTopicAckMarshaller::createObject() const {
@@ -46,7 +49,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void JournalTopicAckMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ) {
+void JournalTopicAckMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -64,13 +67,13 @@
info->setTransactionId( dynamic_cast< TransactionId* >(
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 JournalTopicAckMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ) {
+int JournalTopicAckMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -87,13 +90,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 JournalTopicAckMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ) {
+void JournalTopicAckMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( decaf::io::IOException ) {
try {
@@ -108,13 +111,13 @@
tightMarshalString2( info->getClientId(), dataOut, bs );
tightMarshalNestedObject2( wireFormat, info->getTransactionId(), 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 JournalTopicAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ) {
+void JournalTopicAckMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( decaf::io::IOException ) {
try {
@@ -131,19 +134,19 @@
info->setTransactionId( dynamic_cast< TransactionId* >(
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 JournalTopicAckMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ) {
+void JournalTopicAckMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( decaf::io::IOException ) {
try {
JournalTopicAck* info =
dynamic_cast<JournalTopicAck*>( dataStructure );
- BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
+ BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalNestedObject( wireFormat, info->getDestination(), dataOut );
looseMarshalNestedObject( wireFormat, info->getMessageId(), dataOut );
@@ -152,8 +155,8 @@
looseMarshalString( info->getClientId(), dataOut );
looseMarshalNestedObject( wireFormat, info->getTransactionId(), 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/JournalTopicAckMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshaller.h?rev=593561&r1=593560&r2=593561&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshaller.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 );
};