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 2006/11/13 01:46:30 UTC
svn commit: r474108 [6/10] - in
/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main: ./
activemq/connector/openwire/commands/ activemq/connector/openwire/marshal/
activemq/connector/openwire/marshal/v2/
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,21 +46,21 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ConsumerInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ConsumerInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
ConsumerInfo* info =
dynamic_cast<ConsumerInfo*>( dataStructure );
info->setConsumerId( dynamic_cast< ConsumerId* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
info->setBrowser( bs->readBoolean() );
info->setDestination( dynamic_cast< ActiveMQDestination* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
info->setPrefetchSize( dataIn->readInt() );
info->setMaximumPendingMessageLimit( dataIn->readInt() );
info->setDispatchAsync( bs->readBoolean() );
- info->setSelector( TightUnmarshalString( dataIn, bs ) );
- info->setSubscriptionName( TightUnmarshalString( dataIn, bs ) );
+ info->setSelector( tightUnmarshalString( dataIn, bs ) );
+ info->setSubscriptionName( tightUnmarshalString( dataIn, bs ) );
info->setNoLocal( bs->readBoolean() );
info->setExclusive( bs->readBoolean() );
info->setRetroactive( bs->readBoolean() );
@@ -68,39 +68,32 @@
if( bs->readBoolean() ) {
short size = dataIn->readShort();
- BrokerId* value = new BrokerId[size];
+ info->getBrokerPath().reserve( size );
for( int i = 0; i < size; i++ ) {
- value[i] = dynamic_cast< BrokerId* >(
- tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+ info->getBrokerPath().push_back( dynamic_cast< BrokerId* >(
+ tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
}
- info->setBrokerPath( value );
}
else {
- info->setBrokerPath( NULL );
+ info->getBrokerPath().clear();
}
info->setAdditionalPredicate( dynamic_cast< BooleanExpression* >(
- tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
info->setNetworkSubscription( bs->readBoolean() );
info->setOptimizedAcknowledge( bs->readBoolean() );
info->setNoRangeAcks( bs->readBoolean() );
}
///////////////////////////////////////////////////////////////////////////////
-int ConsumerInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ConsumerInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
ConsumerInfo* info =
dynamic_cast<ConsumerInfo*>( dataStructure );
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConsumerId() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getConsumerId(), bs );
bs->writeBoolean( info->isBrowser() );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
bs->writeBoolean( info->isDispatchAsync() );
rc += tightMarshalString1( info->getSelector(), bs );
rc += tightMarshalString1( info->getSubscriptionName(), bs );
@@ -108,10 +101,7 @@
bs->writeBoolean( info->isExclusive() );
bs->writeBoolean( info->isRetroactive() );
rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getAdditionalPredicate() );
-
- rc += tightMarshalNestedObject1( wireFormat, data, bs );
+ rc += tightMarshalNestedObject1( wireFormat, info->getAdditionalPredicate(), bs );
bs->writeBoolean( info->isNetworkSubscription() );
bs->writeBoolean( info->isOptimizedAcknowledge() );
bs->writeBoolean( info->isNoRangeAcks() );
@@ -120,21 +110,15 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ConsumerInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ConsumerInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
ConsumerInfo* info =
dynamic_cast<ConsumerInfo*>( dataStructure );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConsumerId() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getConsumerId(), dataOut, bs );
bs->readBoolean();
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
dataOut->write( info->getPrefetchSize() );
dataOut->write( info->getMaximumPendingMessageLimit() );
bs->readBoolean();
@@ -145,25 +129,22 @@
bs->readBoolean();
dataOut->write( info->getPriority() );
tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getAdditionalPredicate() );
-
- tightMarshalNestedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalNestedObject2( wireFormat, info->getAdditionalPredicate(), dataOut, bs );
bs->readBoolean();
bs->readBoolean();
bs->readBoolean();
}
///////////////////////////////////////////////////////////////////////////////
-void ConsumerInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ConsumerInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
ConsumerInfo* info =
dynamic_cast<ConsumerInfo*>( dataStructure );
- info->setConsumerId( dynamic_cast<ConsumerId* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setConsumerId( dynamic_cast< ConsumerId* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
info->setBrowser( dataIn->readBoolean() );
- info->setDestination( dynamic_cast<ActiveMQDestination* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setDestination( dynamic_cast< ActiveMQDestination* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
info->setPrefetchSize( dataIn->readInt() );
info->setMaximumPendingMessageLimit( dataIn->readInt() );
info->setDispatchAsync( dataIn->readBoolean() );
@@ -176,38 +157,31 @@
if( dataIn->readBoolean() ) {
short size = dataIn->readShort();
- BrokerId* value = new BrokerId[size];
+ info->getBrokerPath().reserve( size );
for( int i = 0; i < size; i++ ) {
- value[i] = dynamic_cast<BrokerId* >(
- looseUnmarshalNestedObject( wireFormat,dataIn ) );
+ info->getBrokerPath().push_back( dynamic_cast<BrokerId* >(
+ looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
}
- info->setBrokerPath( value );
}
else {
- info->setBrokerPath( NULL );
+ info->getBrokerPath().clear();
}
- info->setAdditionalPredicate( dynamic_cast<BooleanExpression* >(
- looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+ info->setAdditionalPredicate( dynamic_cast< BooleanExpression* >(
+ looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
info->setNetworkSubscription( dataIn->readBoolean() );
info->setOptimizedAcknowledge( dataIn->readBoolean() );
info->setNoRangeAcks( dataIn->readBoolean() );
}
///////////////////////////////////////////////////////////////////////////////
-void ConsumerInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ConsumerInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
ConsumerInfo* info =
dynamic_cast<ConsumerInfo*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConsumerId() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
+ looseMarshalCachedObject( wireFormat, info->getConsumerId(), dataOut );
dataOut->write( info->isBrowser() );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
+ looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
dataOut->write( info->getPrefetchSize() );
dataOut->write( info->getMaximumPendingMessageLimit() );
dataOut->write( info->isDispatchAsync() );
@@ -218,10 +192,7 @@
dataOut->write( info->isRetroactive() );
dataOut->write( info->getPriority() );
looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getAdditionalPredicate() );
-
- looseMarshalNestedObject( wireFormat, data, dataOut );
+ looseMarshalNestedObject( wireFormat, info->getAdditionalPredicate(), dataOut );
dataOut->write( info->isNetworkSubscription() );
dataOut->write( info->isOptimizedAcknowledge() );
dataOut->write( info->isNoRangeAcks() );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,16 +46,16 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ControlCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ControlCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
ControlCommand* info =
dynamic_cast<ControlCommand*>( dataStructure );
- info->setCommand( TightUnmarshalString( dataIn, bs ) );
+ info->setCommand( tightUnmarshalString( dataIn, bs ) );
}
///////////////////////////////////////////////////////////////////////////////
-int ControlCommandMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ControlCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
ControlCommand* info =
dynamic_cast<ControlCommand*>( dataStructure );
@@ -67,7 +67,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ControlCommandMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ControlCommandMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
@@ -77,7 +77,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ControlCommandMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ControlCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
ControlCommand* info =
dynamic_cast<ControlCommand*>( dataStructure );
@@ -85,7 +85,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ControlCommandMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ControlCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
ControlCommand* info =
dynamic_cast<ControlCommand*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ControlCommandMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DataArrayResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void DataArrayResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
ResponseMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
DataArrayResponse* info =
@@ -54,20 +54,19 @@
if( bs->readBoolean() ) {
short size = dataIn->readShort();
- DataStructure* value = new DataStructure[size];
+ info->getData().reserve( size );
for( int i = 0; i < size; i++ ) {
- value[i] = dynamic_cast< DataStructure* >(
- tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+ info->getData().push_back( dynamic_cast< DataStructure* >(
+ tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
}
- info->setData( value );
}
else {
- info->setData( NULL );
+ info->getData().clear();
}
}
///////////////////////////////////////////////////////////////////////////////
-int DataArrayResponseMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int DataArrayResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
DataArrayResponse* info =
dynamic_cast<DataArrayResponse*>( dataStructure );
@@ -79,7 +78,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DataArrayResponseMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void DataArrayResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
ResponseMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
@@ -89,27 +88,26 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DataArrayResponseMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void DataArrayResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
DataArrayResponse* info =
dynamic_cast<DataArrayResponse*>( dataStructure );
if( dataIn->readBoolean() ) {
short size = dataIn->readShort();
- DataStructure* value = new DataStructure[size];
+ info->getData().reserve( size );
for( int i = 0; i < size; i++ ) {
- value[i] = dynamic_cast<DataStructure* >(
- looseUnmarshalNestedObject( wireFormat,dataIn ) );
+ info->getData().push_back( dynamic_cast<DataStructure* >(
+ looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
}
- info->setData( value );
}
else {
- info->setData( NULL );
+ info->getData().clear();
}
}
///////////////////////////////////////////////////////////////////////////////
-void DataArrayResponseMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void DataArrayResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
DataArrayResponse* info =
dynamic_cast<DataArrayResponse*>( dataStructure );
ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/ResponseMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/ResponseMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,61 +46,52 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void DataResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
ResponseMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
DataResponse* info =
dynamic_cast<DataResponse*>( dataStructure );
info->setData( dynamic_cast< DataStructure* >(
- tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
}
///////////////////////////////////////////////////////////////////////////////
-int DataResponseMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int DataResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
DataResponse* info =
dynamic_cast<DataResponse*>( dataStructure );
int rc = ResponseMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getData() );
-
- rc += tightMarshalNestedObject1( wireFormat, data, bs );
+ rc += tightMarshalNestedObject1( wireFormat, info->getData(), bs );
return rc + 0;
}
///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void DataResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
ResponseMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
DataResponse* info =
dynamic_cast<DataResponse*>( dataStructure );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getData() );
-
- tightMarshalNestedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalNestedObject2( wireFormat, info->getData(), dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void DataResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
DataResponse* info =
dynamic_cast<DataResponse*>( dataStructure );
- info->setData( dynamic_cast<DataStructure* >(
- looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
+ info->setData( dynamic_cast< DataStructure* >(
+ looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
}
///////////////////////////////////////////////////////////////////////////////
-void DataResponseMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void DataResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
DataResponse* info =
dynamic_cast<DataResponse*>( dataStructure );
ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getData() );
-
- looseMarshalNestedObject( wireFormat, data, dataOut );
+ looseMarshalNestedObject( wireFormat, info->getData(), dataOut );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DataResponseMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/ResponseMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/ResponseMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,47 +46,40 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void DestinationInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
DestinationInfo* info =
dynamic_cast<DestinationInfo*>( dataStructure );
info->setConnectionId( dynamic_cast< ConnectionId* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
info->setDestination( dynamic_cast< ActiveMQDestination* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
info->setOperationType( dataIn->readByte() );
- info->setTimeout( TightUnmarshalLong( wireFormat, dataIn, bs ) );
+ info->setTimeout( tightUnmarshalLong( wireFormat, dataIn, bs ) );
if( bs->readBoolean() ) {
short size = dataIn->readShort();
- BrokerId* value = new BrokerId[size];
+ info->getBrokerPath().reserve( size );
for( int i = 0; i < size; i++ ) {
- value[i] = dynamic_cast< BrokerId* >(
- tightUnmarsalNestedObject( wireFormat, dataIn, bs ) );
+ info->getBrokerPath().push_back( dynamic_cast< BrokerId* >(
+ tightUnmarshalNestedObject( wireFormat, dataIn, bs ) ) );
}
- info->setBrokerPath( value );
}
else {
- info->setBrokerPath( NULL );
+ info->getBrokerPath().clear();
}
}
///////////////////////////////////////////////////////////////////////////////
-int DestinationInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int DestinationInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
DestinationInfo* info =
dynamic_cast<DestinationInfo*>( dataStructure );
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConnectionId() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId(), bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
rc += tightMarshalLong1( wireFormat, info->getTimeout(), bs );
rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
@@ -94,65 +87,52 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void DestinationInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
DestinationInfo* info =
dynamic_cast<DestinationInfo*>( dataStructure );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConnectionId() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
dataOut->write( info->getOperationType() );
tightMarshalLong2( wireFormat, info->getTimeout(), dataOut, bs );
tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void DestinationInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
DestinationInfo* info =
dynamic_cast<DestinationInfo*>( dataStructure );
- info->setConnectionId( dynamic_cast<ConnectionId* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
- info->setDestination( dynamic_cast<ActiveMQDestination* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setConnectionId( dynamic_cast< ConnectionId* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setDestination( dynamic_cast< ActiveMQDestination* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
info->setOperationType( dataIn->readByte() );
info->setTimeout( looseUnmarshalLong( wireFormat, dataIn ) );
if( dataIn->readBoolean() ) {
short size = dataIn->readShort();
- BrokerId* value = new BrokerId[size];
+ info->getBrokerPath().reserve( size );
for( int i = 0; i < size; i++ ) {
- value[i] = dynamic_cast<BrokerId* >(
- looseUnmarshalNestedObject( wireFormat,dataIn ) );
+ info->getBrokerPath().push_back( dynamic_cast<BrokerId* >(
+ looseUnmarshalNestedObject( wireFormat, dataIn ) ) );
}
- info->setBrokerPath( value );
}
else {
- info->setBrokerPath( NULL );
+ info->getBrokerPath().clear();
}
}
///////////////////////////////////////////////////////////////////////////////
-void DestinationInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void DestinationInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
DestinationInfo* info =
dynamic_cast<DestinationInfo*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConnectionId() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
+ looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
+ looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
dataOut->write( info->getOperationType() );
looseMarshalLong( wireFormat, info->getTimeout(), dataOut );
looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DestinationInfoMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,17 +46,17 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void DiscoveryEventMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
DiscoveryEvent* info =
dynamic_cast<DiscoveryEvent*>( dataStructure );
- info->setServiceName( TightUnmarshalString( dataIn, bs ) );
- info->setBrokerName( TightUnmarshalString( dataIn, bs ) );
+ info->setServiceName( tightUnmarshalString( dataIn, bs ) );
+ info->setBrokerName( tightUnmarshalString( dataIn, bs ) );
}
///////////////////////////////////////////////////////////////////////////////
-int DiscoveryEventMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int DiscoveryEventMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
DiscoveryEvent* info =
dynamic_cast<DiscoveryEvent*>( dataStructure );
@@ -69,7 +69,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void DiscoveryEventMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
@@ -80,7 +80,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void DiscoveryEventMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
DiscoveryEvent* info =
dynamic_cast<DiscoveryEvent*>( dataStructure );
@@ -89,7 +89,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void DiscoveryEventMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void DiscoveryEventMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
DiscoveryEvent* info =
dynamic_cast<DiscoveryEvent*>( dataStructure );
BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/BaseDataStreamMarshaller.h>
+#include <activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,17 +46,17 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ExceptionResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ExceptionResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
ResponseMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
ExceptionResponse* info =
dynamic_cast<ExceptionResponse*>( dataStructure );
- info->setException( dynamic_cast< Throwable* >(
- tightUnmarsalThrowable( wireFormat, dataIn, bs ) );
+ info->setException( dynamic_cast< BrokerError* >(
+ tightUnmarshalBrokerError( wireFormat, dataIn, bs ) ) );
}
///////////////////////////////////////////////////////////////////////////////
-int ExceptionResponseMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ExceptionResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
ExceptionResponse* info =
dynamic_cast<ExceptionResponse*>( dataStructure );
@@ -68,7 +68,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ExceptionResponseMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ExceptionResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
ResponseMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
@@ -78,15 +78,16 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ExceptionResponseMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ExceptionResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
ExceptionResponse* info =
dynamic_cast<ExceptionResponse*>( dataStructure );
- info->setException( looseUnmarshalBrokerError( wireFormat, dataIn ) );
+ info->setException( dynamic_cast< BrokerError* >(
+ looseUnmarshalBrokerError( wireFormat, dataIn ) ) );
}
///////////////////////////////////////////////////////////////////////////////
-void ExceptionResponseMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ExceptionResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
ExceptionResponse* info =
dynamic_cast<ExceptionResponse*>( dataStructure );
ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/ResponseMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/ResponseMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,13 +46,13 @@
}
///////////////////////////////////////////////////////////////////////////////
-void FlushCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void FlushCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
}
///////////////////////////////////////////////////////////////////////////////
-int FlushCommandMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int FlushCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
@@ -60,19 +60,19 @@
}
///////////////////////////////////////////////////////////////////////////////
-void FlushCommandMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void FlushCommandMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void FlushCommandMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void FlushCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
}
///////////////////////////////////////////////////////////////////////////////
-void FlushCommandMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void FlushCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/FlushCommandMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/BaseCommandMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/BaseCommandMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,7 +32,7 @@
using namespace activemq::connector::openwire;
using namespace activemq::connector::openwire::commands;
using namespace activemq::connector::openwire::marshal;
-using namespace activemq::connector::openwire::util;
+using namespace activemq::connector::openwire::utils;
using namespace activemq::connector::openwire::marshal::v2;
///////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void IntegerResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void IntegerResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
ResponseMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
IntegerResponse* info =
@@ -55,7 +55,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-int IntegerResponseMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int IntegerResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
IntegerResponse* info =
dynamic_cast<IntegerResponse*>( dataStructure );
@@ -66,7 +66,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void IntegerResponseMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void IntegerResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
ResponseMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
@@ -76,7 +76,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void IntegerResponseMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void IntegerResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
ResponseMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
IntegerResponse* info =
dynamic_cast<IntegerResponse*>( dataStructure );
@@ -84,7 +84,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void IntegerResponseMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void IntegerResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
IntegerResponse* info =
dynamic_cast<IntegerResponse*>( dataStructure );
ResponseMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/IntegerResponseMarshaller.h Sun Nov 12 16:46:23 2006
@@ -23,13 +23,14 @@
#pragma warning( disable : 4290 )
#endif
-#include <activemq/connector/openwire/marshal/V2/ResponseMarshaller.h>
+#include <activemq/connector/openwire/marshal/v2/ResponseMarshaller.h>
#include <activemq/io/DataInputStream.h>
#include <activemq/io/DataOutputStream.h>
#include <activemq/io/IOException.h>
+#include <activemq/connector/openwire/OpenWireFormat.h>
#include <activemq/connector/openwire/commands/DataStructure.h>
-#include <activemq/connector/openwire/util/BooleanStream.h>
+#include <activemq/connector/openwire/utils/BooleanStream.h>
namespace activemq{
namespace connector{
@@ -55,7 +56,7 @@
* Creates a new instance of this marshalable type.
* @return new DataStructure object pointer caller owns it.
*/
- virtual DataStructure* createObject() const;
+ virtual commands::DataStructure* createObject() const;
/**
* Get the Data Structure Type that identifies this Marshaller
@@ -73,7 +74,7 @@
virtual void tightUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataInputStream* dataIn,
- util::BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write the booleans that this object uses to a BooleanStream
@@ -84,7 +85,7 @@
*/
virtual int tightMarshal1( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -96,7 +97,7 @@
virtual void tightMarshal2( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
io::DataOutputStream* dataOut,
- BooleanStream* bs ) throws( io::IOException );
+ utils::BooleanStream* bs ) throw( io::IOException );
/**
* Un-marshal an object instance from the data input stream
@@ -106,7 +107,7 @@
*/
virtual void looseUnmarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataInputStream* dataIn ) throws( io::IOException );
+ io::DataInputStream* dataIn ) throw( io::IOException );
/**
* Write a object instance to data output stream
@@ -116,7 +117,7 @@
*/
virtual void looseMarshal( OpenWireFormat* wireFormat,
commands::DataStructure* dataStructure,
- io::DataOutputStream* dataOut ) throws( io::IOException );
+ io::DataOutputStream* dataOut ) throw( io::IOException );
};