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 [9/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/ProducerInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.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,46 +46,39 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ProducerInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ProducerInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
ProducerInfo* info =
dynamic_cast<ProducerInfo*>( dataStructure );
info->setProducerId( dynamic_cast< ProducerId* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
info->setDestination( dynamic_cast< ActiveMQDestination* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalCachedObject( 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();
}
info->setDispatchAsync( bs->readBoolean() );
}
///////////////////////////////////////////////////////////////////////////////
-int ProducerInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ProducerInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
ProducerInfo* info =
dynamic_cast<ProducerInfo*>( dataStructure );
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getProducerId() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getProducerId(), bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
rc += tightMarshalObjectArray1( wireFormat, info->getBrokerPath(), bs );
bs->writeBoolean( info->isDispatchAsync() );
@@ -93,63 +86,50 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ProducerInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ProducerInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
ProducerInfo* info =
dynamic_cast<ProducerInfo*>( dataStructure );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getProducerId() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getProducerId(), dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
tightMarshalObjectArray2( wireFormat, info->getBrokerPath(), dataOut, bs );
bs->readBoolean();
}
///////////////////////////////////////////////////////////////////////////////
-void ProducerInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ProducerInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
ProducerInfo* info =
dynamic_cast<ProducerInfo*>( dataStructure );
- info->setProducerId( dynamic_cast<ProducerId* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
- info->setDestination( dynamic_cast<ActiveMQDestination* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setProducerId( dynamic_cast< ProducerId* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setDestination( dynamic_cast< ActiveMQDestination* >(
+ looseUnmarshalCachedObject( 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();
}
info->setDispatchAsync( dataIn->readBoolean() );
}
///////////////////////////////////////////////////////////////////////////////
-void ProducerInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ProducerInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
ProducerInfo* info =
dynamic_cast<ProducerInfo*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getProducerId() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
+ looseMarshalCachedObject( wireFormat, info->getProducerId(), dataOut );
+ looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
looseMarshalObjectArray( wireFormat, info->getBrokerPath(), dataOut );
dataOut->write( info->isDispatchAsync() );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ProducerInfoMarshaller.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/RemoveInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.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 RemoveInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void RemoveInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
RemoveInfo* info =
dynamic_cast<RemoveInfo*>( dataStructure );
info->setObjectId( dynamic_cast< DataStructure* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
}
///////////////////////////////////////////////////////////////////////////////
-int RemoveInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int RemoveInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
RemoveInfo* info =
dynamic_cast<RemoveInfo*>( dataStructure );
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getObjectId() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getObjectId(), bs );
return rc + 0;
}
///////////////////////////////////////////////////////////////////////////////
-void RemoveInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void RemoveInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
RemoveInfo* info =
dynamic_cast<RemoveInfo*>( dataStructure );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getObjectId() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getObjectId(), dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void RemoveInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void RemoveInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
RemoveInfo* info =
dynamic_cast<RemoveInfo*>( dataStructure );
- info->setObjectId( dynamic_cast<DataStructure* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setObjectId( dynamic_cast< DataStructure* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
}
///////////////////////////////////////////////////////////////////////////////
-void RemoveInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void RemoveInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
RemoveInfo* info =
dynamic_cast<RemoveInfo*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getObjectId() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
+ looseMarshalCachedObject( wireFormat, info->getObjectId(), dataOut );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveInfoMarshaller.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/RemoveSubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.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,28 +46,25 @@
}
///////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void RemoveSubscriptionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
RemoveSubscriptionInfo* info =
dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
info->setConnectionId( dynamic_cast< ConnectionId* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
- info->setSubcriptionName( TightUnmarshalString( dataIn, bs ) );
- info->setClientId( TightUnmarshalString( dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+ info->setSubcriptionName( tightUnmarshalString( dataIn, bs ) );
+ info->setClientId( tightUnmarshalString( dataIn, bs ) );
}
///////////////////////////////////////////////////////////////////////////////
-int RemoveSubscriptionInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int RemoveSubscriptionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
RemoveSubscriptionInfo* info =
dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConnectionId() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getConnectionId(), bs );
rc += tightMarshalString1( info->getSubcriptionName(), bs );
rc += tightMarshalString1( info->getClientId(), bs );
@@ -75,41 +72,35 @@
}
///////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void RemoveSubscriptionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
RemoveSubscriptionInfo* info =
dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConnectionId() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getConnectionId(), dataOut, bs );
tightMarshalString2( info->getSubcriptionName(), dataOut, bs );
tightMarshalString2( info->getClientId(), dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void RemoveSubscriptionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
RemoveSubscriptionInfo* info =
dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
- info->setConnectionId( dynamic_cast<ConnectionId* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setConnectionId( dynamic_cast< ConnectionId* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
info->setSubcriptionName( looseUnmarshalString( dataIn ) );
info->setClientId( looseUnmarshalString( dataIn ) );
}
///////////////////////////////////////////////////////////////////////////////
-void RemoveSubscriptionInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void RemoveSubscriptionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
RemoveSubscriptionInfo* info =
dynamic_cast<RemoveSubscriptionInfo*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getConnectionId() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
+ looseMarshalCachedObject( wireFormat, info->getConnectionId(), dataOut );
looseMarshalString( info->getSubcriptionName(), dataOut );
looseMarshalString( info->getClientId(), dataOut );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshaller.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/ReplayCommandMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.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 ReplayCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ReplayCommandMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
ReplayCommand* info =
@@ -56,7 +56,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-int ReplayCommandMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ReplayCommandMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
ReplayCommand* info =
dynamic_cast<ReplayCommand*>( dataStructure );
@@ -67,7 +67,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ReplayCommandMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ReplayCommandMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
@@ -78,7 +78,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ReplayCommandMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ReplayCommandMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
ReplayCommand* info =
dynamic_cast<ReplayCommand*>( dataStructure );
@@ -87,7 +87,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ReplayCommandMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ReplayCommandMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
ReplayCommand* info =
dynamic_cast<ReplayCommand*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ReplayCommandMarshaller.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/ResponseMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.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 ResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ResponseMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
Response* info =
@@ -55,7 +55,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-int ResponseMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ResponseMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
Response* info =
dynamic_cast<Response*>( dataStructure );
@@ -66,7 +66,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ResponseMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ResponseMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
@@ -76,7 +76,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ResponseMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ResponseMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
Response* info =
dynamic_cast<Response*>( dataStructure );
@@ -84,7 +84,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ResponseMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ResponseMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
Response* info =
dynamic_cast<Response*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ResponseMarshaller.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/SessionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.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 SessionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void SessionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
SessionId* info =
dynamic_cast<SessionId*>( dataStructure );
- info->setConnectionId( TightUnmarshalString( dataIn, bs ) );
- info->setValue( TightUnmarshalLong( wireFormat, dataIn, bs ) );
+ info->setConnectionId( tightUnmarshalString( dataIn, bs ) );
+ info->setValue( tightUnmarshalLong( wireFormat, dataIn, bs ) );
}
///////////////////////////////////////////////////////////////////////////////
-int SessionIdMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int SessionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
SessionId* info =
dynamic_cast<SessionId*>( dataStructure );
@@ -69,7 +69,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void SessionIdMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void SessionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
@@ -80,7 +80,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void SessionIdMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void SessionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
SessionId* info =
dynamic_cast<SessionId*>( dataStructure );
@@ -89,7 +89,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-void SessionIdMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void SessionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
SessionId* info =
dynamic_cast<SessionId*>( dataStructure );
BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionIdMarshaller.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/SessionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.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 SessionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void SessionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
SessionInfo* info =
dynamic_cast<SessionInfo*>( dataStructure );
info->setSessionId( dynamic_cast< SessionId* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
}
///////////////////////////////////////////////////////////////////////////////
-int SessionInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int SessionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
SessionInfo* info =
dynamic_cast<SessionInfo*>( dataStructure );
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getSessionId() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getSessionId(), bs );
return rc + 0;
}
///////////////////////////////////////////////////////////////////////////////
-void SessionInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void SessionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
SessionInfo* info =
dynamic_cast<SessionInfo*>( dataStructure );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getSessionId() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getSessionId(), dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void SessionInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void SessionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
SessionInfo* info =
dynamic_cast<SessionInfo*>( dataStructure );
- info->setSessionId( dynamic_cast<SessionId* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setSessionId( dynamic_cast< SessionId* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
}
///////////////////////////////////////////////////////////////////////////////
-void SessionInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void SessionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
SessionInfo* info =
dynamic_cast<SessionInfo*>( dataStructure );
BaseCommandMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getSessionId() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
+ looseMarshalCachedObject( wireFormat, info->getSessionId(), dataOut );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SessionInfoMarshaller.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/ShutdownInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshaller.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 ShutdownInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void ShutdownInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
}
///////////////////////////////////////////////////////////////////////////////
-int ShutdownInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int ShutdownInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
int rc = BaseCommandMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
@@ -60,19 +60,19 @@
}
///////////////////////////////////////////////////////////////////////////////
-void ShutdownInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void ShutdownInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseCommandMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void ShutdownInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void ShutdownInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseCommandMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
}
///////////////////////////////////////////////////////////////////////////////
-void ShutdownInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void ShutdownInfoMarshaller::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/ShutdownInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshaller.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/SubscriptionInfoMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.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,30 +46,27 @@
}
///////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void SubscriptionInfoMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
SubscriptionInfo* info =
dynamic_cast<SubscriptionInfo*>( dataStructure );
- info->setClientId( TightUnmarshalString( dataIn, bs ) );
+ info->setClientId( tightUnmarshalString( dataIn, bs ) );
info->setDestination( dynamic_cast< ActiveMQDestination* >(
- tightUnmarsalCachedObject( wireFormat, dataIn, bs ) );
- info->setSelector( TightUnmarshalString( dataIn, bs ) );
- info->setSubcriptionName( TightUnmarshalString( dataIn, bs ) );
+ tightUnmarshalCachedObject( wireFormat, dataIn, bs ) ) );
+ info->setSelector( tightUnmarshalString( dataIn, bs ) );
+ info->setSubcriptionName( tightUnmarshalString( dataIn, bs ) );
}
///////////////////////////////////////////////////////////////////////////////
-int SubscriptionInfoMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int SubscriptionInfoMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
SubscriptionInfo* info =
dynamic_cast<SubscriptionInfo*>( dataStructure );
int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
rc += tightMarshalString1( info->getClientId(), bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- rc += tightMarshalCachedObject1( wireFormat, data, bs );
+ rc += tightMarshalCachedObject1( wireFormat, info->getDestination(), bs );
rc += tightMarshalString1( info->getSelector(), bs );
rc += tightMarshalString1( info->getSubcriptionName(), bs );
@@ -77,44 +74,38 @@
}
///////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfoMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void SubscriptionInfoMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
SubscriptionInfo* info =
dynamic_cast<SubscriptionInfo*>( dataStructure );
tightMarshalString2( info->getClientId(), dataOut, bs );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- tightMarshalCachedObject2( wireFormat, data, dataOut, bs );
+ tightMarshalCachedObject2( wireFormat, info->getDestination(), dataOut, bs );
tightMarshalString2( info->getSelector(), dataOut, bs );
tightMarshalString2( info->getSubcriptionName(), dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfoMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void SubscriptionInfoMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
SubscriptionInfo* info =
dynamic_cast<SubscriptionInfo*>( dataStructure );
info->setClientId( looseUnmarshalString( dataIn ) );
- info->setDestination( dynamic_cast<ActiveMQDestination* >(
- looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
+ info->setDestination( dynamic_cast< ActiveMQDestination* >(
+ looseUnmarshalCachedObject( wireFormat, dataIn ) ) );
info->setSelector( looseUnmarshalString( dataIn ) );
info->setSubcriptionName( looseUnmarshalString( dataIn ) );
}
///////////////////////////////////////////////////////////////////////////////
-void SubscriptionInfoMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void SubscriptionInfoMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
SubscriptionInfo* info =
dynamic_cast<SubscriptionInfo*>( dataStructure );
BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
looseMarshalString( info->getClientId(), dataOut );
- DataStructure* data =
- dynamic_cast< DataStructure* >( info->getDestination() );
-
- looseMarshalCachedObject( wireFormat, data, dataOut );
+ looseMarshalCachedObject( wireFormat, info->getDestination(), dataOut );
looseMarshalString( info->getSelector(), dataOut );
looseMarshalString( info->getSubcriptionName(), dataOut );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshaller.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/TransactionIdMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.cpp Sun Nov 12 16:46:23 2006
@@ -32,17 +32,17 @@
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;
///////////////////////////////////////////////////////////////////////////////
-void TransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) {
+void TransactionIdMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( io::IOException ){
BaseDataStreamMarshaller::tightUnmarshal( wireFormat, dataStructure, dataIn, bs );
}
///////////////////////////////////////////////////////////////////////////////
-int TransactionIdMarshaller::tightMarshal1( OpenWireFormat& wireFormat, DataStructure* dataStructure, BooleanStream& bs ) {
+int TransactionIdMarshaller::tightMarshal1( OpenWireFormat* wireFormat, DataStructure* dataStructure, BooleanStream* bs ) throw( io::IOException ){
int rc = BaseDataStreamMarshaller::tightMarshal1( wireFormat, dataStructure, bs );
@@ -50,19 +50,19 @@
}
///////////////////////////////////////////////////////////////////////////////
-void TransactionIdMarshaller::tightMarshal2( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut, BooleanStream& bs ) {
+void TransactionIdMarshaller::tightMarshal2( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut, BooleanStream* bs ) throw( io::IOException ){
BaseDataStreamMarshaller::tightMarshal2( wireFormat, dataStructure, dataOut, bs );
}
///////////////////////////////////////////////////////////////////////////////
-void TransactionIdMarshaller::looseUnmarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataInputStream& dataIn ) {
+void TransactionIdMarshaller::looseUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn ) throw( io::IOException ){
BaseDataStreamMarshaller::looseUnmarshal( wireFormat, dataStructure, dataIn );
}
///////////////////////////////////////////////////////////////////////////////
-void TransactionIdMarshaller::looseMarshal( OpenWireFormat& wireFormat, DataStructure* dataStructure, DataOutputStream& dataOut ) {
+void TransactionIdMarshaller::looseMarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataOutputStream* dataOut ) throw( io::IOException ){
BaseDataStreamMarshaller::looseMarshal( wireFormat, dataStructure, dataOut );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h?view=diff&rev=474108&r1=474107&r2=474108
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/v2/TransactionIdMarshaller.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 );
};