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 2009/02/07 00:11:39 UTC
svn commit: r741774 [6/17] - in /activemq/activemq-cpp/trunk/src: main/
main/activemq/commands/ main/activemq/core/ main/activemq/exceptions/
main/activemq/state/ main/activemq/wireformat/openwire/marshal/
main/activemq/wireformat/openwire/marshal/v1/ ...
Modified: activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.cpp Fri Feb 6 23:11:28 2009
@@ -17,7 +17,6 @@
#include "ActiveMQSessionExecutor.h"
#include "ActiveMQSession.h"
-#include "ActiveMQMessage.h"
#include "ActiveMQConsumer.h"
#include <activemq/commands/ConsumerInfo.h>
@@ -89,25 +88,20 @@
}
////////////////////////////////////////////////////////////////////////////////
-vector<ActiveMQMessage*> ActiveMQSessionExecutor::purgeConsumerMessages(
- ActiveMQConsumer* consumer )
+void ActiveMQSessionExecutor::purgeConsumerMessages(
+ const decaf::lang::Pointer<commands::ConsumerId>& consumerId )
{
- vector<ActiveMQMessage*> retVal;
-
synchronized( &mutex ) {
list<DispatchData>::iterator iter = messageQueue.begin();
while( iter != messageQueue.end() ) {
list<DispatchData>::iterator currentIter = iter;
DispatchData& dispatchData = *iter++;
- if( consumer->getConsumerId() == dispatchData.getConsumerId() ) {
- retVal.push_back( dispatchData.getMessage() );
+ if( consumerId->equals( *( dispatchData.getConsumerId() ) ) ) {
messageQueue.erase( currentIter );
}
}
}
-
- return retVal;
}
////////////////////////////////////////////////////////////////////////////////
@@ -152,12 +146,7 @@
void ActiveMQSessionExecutor::clear() {
synchronized( &mutex ) {
-
- list<DispatchData>::iterator iter = messageQueue.begin();
- while( iter != messageQueue.end() ) {
- DispatchData data = *iter++;
- delete data.getMessage();
- }
+ this->messageQueue.clear();
}
}
@@ -166,18 +155,11 @@
try {
- ActiveMQConsumer* consumer = NULL;
- Map< commands::ConsumerId, ActiveMQConsumer*>& consumers = session->getConsumers();
-
- synchronized( &consumers ) {
- consumer = consumers.getValue( data.getConsumerId() );
- }
+ ActiveMQConsumer* consumer = session->getConsumer( data.getConsumerId() );
// If the consumer is not available, just delete the message.
// Otherwise, dispatch the message to the consumer.
- if( consumer == NULL ) {
- delete data.getMessage();
- } else {
+ if( consumer != NULL ) {
consumer->dispatch( data );
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.h Fri Feb 6 23:11:28 2009
@@ -20,6 +20,7 @@
#include <activemq/util/Config.h>
#include <activemq/core/Dispatcher.h>
+#include <activemq/commands/ConsumerId.h>
#include <decaf/lang/Thread.h>
#include <decaf/lang/Runnable.h>
#include <decaf/util/concurrent/Mutex.h>
@@ -77,12 +78,11 @@
virtual void executeFirst( DispatchData& data );
/**
- * Removes all messages for the given consumer from the queue and
- * returns them.
- * @param consumer the subject consmer
- * @return all messages that were queued for the consumer.
+ * Removes all messages for the given consumer from the.
+ * @param consumerId - the subject consumer
*/
- virtual std::vector<ActiveMQMessage*> purgeConsumerMessages( ActiveMQConsumer* consumer );
+ virtual void purgeConsumerMessages(
+ const decaf::lang::Pointer<commands::ConsumerId>& consumerId );
/**
* Starts the dispatching.
@@ -108,7 +108,7 @@
}
/**
- * Removes all queued messgaes and destroys them.
+ * Removes all queued messages and destroys them.
*/
virtual void clear();
Modified: activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.cpp Fri Feb 6 23:11:28 2009
@@ -207,9 +207,14 @@
this->transactionInfo.reset( new commands::TransactionInfo() );
- this->transactionInfo->setConnectionId(
- this->connection->getConnectionId().cloneDataStructure() );
- this->transactionInfo->setTransactionId( createLocalTransactionId() );
+ // Create the Id
+ decaf::lang::Pointer<commands::LocalTransactionId> id( new commands::LocalTransactionId() );
+ id->setConnectionId( this->connection->getConnectionInfo().getConnectionId() );
+ id->setValue( this->connection->getNextTransactionId() );
+
+ // Populate the Info Command.
+ this->transactionInfo->setConnectionId( id->getConnectionId() );
+ this->transactionInfo->setTransactionId( id );
this->transactionInfo->setType( ActiveMQConstants::TRANSACTION_STATE_BEGIN );
this->connection->oneway( this->transactionInfo.get() );
@@ -220,24 +225,6 @@
}
////////////////////////////////////////////////////////////////////////////////
-commands::TransactionId* ActiveMQTransactionContext::createLocalTransactionId()
- throw( exceptions::ActiveMQException ) {
-
- try{
-
- std::auto_ptr<commands::LocalTransactionId> id( new commands::LocalTransactionId() );
-
- id->setConnectionId( this->connection->getConnectionId().cloneDataStructure() );
- id->setValue( this->connection->getNextTransactionId() );
-
- return id.release();
- }
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCH_EXCEPTION_CONVERT( Exception, ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
-}
-
-////////////////////////////////////////////////////////////////////////////////
void ActiveMQTransactionContext::clearSynchronizations()
throw( exceptions::ActiveMQException ) {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransactionContext.h Fri Feb 6 23:11:28 2009
@@ -124,9 +124,10 @@
* Transaction, returns NULL if no transaction is running
* @return TransactionInfo
*/
- virtual const commands::TransactionId* getTransactionId() const {
+ virtual const decaf::lang::Pointer<commands::TransactionId>& getTransactionId() const {
if( this->transactionInfo.get() == NULL ) {
- return NULL;
+ throw decaf::lang::exceptions::InvalidStateException(
+ __FILE__, __LINE__, "Transaction Not Started." );
}
return transactionInfo->getTransactionId();
@@ -141,9 +142,6 @@
// Starts a new Transaction.
void startTransaction() throw( exceptions::ActiveMQException );
- // Creates a new Local Transaction Id.
- commands::TransactionId* createLocalTransactionId() throw( exceptions::ActiveMQException );
-
};
}}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/core/DispatchData.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/core/DispatchData.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/core/DispatchData.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/core/DispatchData.h Fri Feb 6 23:11:28 2009
@@ -22,6 +22,8 @@
#include <memory>
#include <activemq/util/Config.h>
#include <activemq/commands/ConsumerId.h>
+#include <activemq/commands/Message.h>
+#include <decaf/lang/Pointer.h>
namespace activemq {
namespace core {
@@ -29,40 +31,30 @@
class ActiveMQMessage;
/**
- * Contains information about dispatching to a particular consumer.
+ * Simple POCO that contains the information necessary to route a message
+ * to a specified consumer.
*/
class AMQCPP_API DispatchData {
private:
- commands::ConsumerId consumerId;
- ActiveMQMessage* message;
+ decaf::lang::Pointer<commands::ConsumerId> consumerId;
+ decaf::lang::Pointer<commands::Message> message;
public:
- DispatchData(){
- message = NULL;
- }
+ DispatchData() {}
- DispatchData( const commands::ConsumerId& consumer, ActiveMQMessage* message ) {
+ DispatchData( const decaf::lang::Pointer<commands::ConsumerId>& consumer,
+ const decaf::lang::Pointer<commands::Message>& message ) {
this->consumerId = consumer;
this->message = message;
}
- DispatchData( const DispatchData& d ) {
- (*this) = d;
- }
-
- DispatchData& operator =( const DispatchData& d ) {
- this->consumerId = d.consumerId;
- this->message = d.message;
- return *this;
- }
-
- const commands::ConsumerId& getConsumerId() {
+ const decaf::lang::Pointer<commands::ConsumerId>& getConsumerId() {
return consumerId;
}
- ActiveMQMessage* getMessage() {
+ const decaf::lang::Pointer<commands::Message>& getMessage() {
return message;
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/exceptions/BrokerException.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/exceptions/BrokerException.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/exceptions/BrokerException.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/exceptions/BrokerException.h Fri Feb 6 23:11:28 2009
@@ -60,14 +60,15 @@
std::ostringstream ostream;
ostream << "*** BEGIN SERVER-SIDE STACK TRACE ***" << std::endl;
ostream << "Message: " << error->getMessage() << std::endl;
- ostream << "Cause: " << error->getCause() << std::endl;
+ ostream << "Cause: " << error->getCause()->toString() << std::endl;
ostream << "Exception Class " << error->getExceptionClass() << std::endl;
- const std::vector<commands::BrokerError::StackTraceElement*>& trace = error->getStackTraceElements();
- for( std::size_t ix=0; ix<trace.size(); ++ix ){
- commands::BrokerError::StackTraceElement* element = trace[ix];
- ostream << "\t[FILE: " << element->FileName << ", LINE: " << element->LineNumber
- << "] occurred in: " << element->ClassName << "." << element->MethodName << std::endl;
+ for( std::size_t ix = 0; ix< error->getStackTraceElements().size(); ++ix ){
+ ostream << "\t[FILE: " << error->getStackTraceElements()[ix]->FileName
+ << ", LINE: " << error->getStackTraceElements()[ix]->LineNumber
+ << "] occurred in: " << error->getStackTraceElements()[ix]->ClassName
+ << "." << error->getStackTraceElements()[ix]->MethodName
+ << std::endl;
}
ostream << "*** END SERVER-SIDE STACK TRACE ***";
Modified: activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitor.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitor.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitor.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitor.h Fri Feb 6 23:11:28 2009
@@ -20,6 +20,7 @@
#include <activemq/util/Config.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
namespace activemq {
namespace commands {
@@ -70,121 +71,121 @@
virtual ~CommandVisitor() {}
- virtual commands::Command* processTransactionInfo(
+ virtual decaf::lang::Pointer<commands::Command> processTransactionInfo(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRemoveInfo(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveInfo(
commands::RemoveInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processConnectionInfo(
+ virtual decaf::lang::Pointer<commands::Command> processConnectionInfo(
commands::ConnectionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processSessionInfo(
+ virtual decaf::lang::Pointer<commands::Command> processSessionInfo(
commands::SessionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processProducerInfo(
+ virtual decaf::lang::Pointer<commands::Command> processProducerInfo(
commands::ProducerInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processConsumerInfo(
+ virtual decaf::lang::Pointer<commands::Command> processConsumerInfo(
commands::ConsumerInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRemoveConnection(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveConnection(
commands::ConnectionId* id ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRemoveSession(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveSession(
commands::SessionId* id ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRemoveProducer(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveProducer(
commands::ProducerId* id ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRemoveConsumer(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveConsumer(
commands::ConsumerId* id ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processDestinationInfo(
+ virtual decaf::lang::Pointer<commands::Command> processDestinationInfo(
commands::DestinationInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRemoveDestination(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveDestination(
commands::DestinationInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRemoveSubscriptionInfo(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveSubscriptionInfo(
commands::RemoveSubscriptionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processMessage(
+ virtual decaf::lang::Pointer<commands::Command> processMessage(
commands::Message* send ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processMessageAck(
+ virtual decaf::lang::Pointer<commands::Command> processMessageAck(
commands::MessageAck* ack ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processMessagePull(
+ virtual decaf::lang::Pointer<commands::Command> processMessagePull(
commands::MessagePull* pull ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processBeginTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processBeginTransaction(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processPrepareTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processPrepareTransaction(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processCommitTransactionOnePhase(
+ virtual decaf::lang::Pointer<commands::Command> processCommitTransactionOnePhase(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processCommitTransactionTwoPhase(
+ virtual decaf::lang::Pointer<commands::Command> processCommitTransactionTwoPhase(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRollbackTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processRollbackTransaction(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processWireFormat(
+ virtual decaf::lang::Pointer<commands::Command> processWireFormat(
commands::WireFormatInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processKeepAliveInfo(
+ virtual decaf::lang::Pointer<commands::Command> processKeepAliveInfo(
commands::KeepAliveInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processShutdownInfo(
+ virtual decaf::lang::Pointer<commands::Command> processShutdownInfo(
commands::ShutdownInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processFlushCommand(
+ virtual decaf::lang::Pointer<commands::Command> processFlushCommand(
commands::FlushCommand* command ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processBrokerInfo(
+ virtual decaf::lang::Pointer<commands::Command> processBrokerInfo(
commands::BrokerInfo* info) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processRecoverTransactions(
+ virtual decaf::lang::Pointer<commands::Command> processRecoverTransactions(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processForgetTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processForgetTransaction(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processEndTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processEndTransaction(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processMessageDispatchNotification(
+ virtual decaf::lang::Pointer<commands::Command> processMessageDispatchNotification(
commands::MessageDispatchNotification* notification ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processProducerAck(
+ virtual decaf::lang::Pointer<commands::Command> processProducerAck(
commands::ProducerAck* ack ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processMessageDispatch(
+ virtual decaf::lang::Pointer<commands::Command> processMessageDispatch(
commands::MessageDispatch* dispatch ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processControlCommand(
+ virtual decaf::lang::Pointer<commands::Command> processControlCommand(
commands::ControlCommand* command ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processConnectionError(
+ virtual decaf::lang::Pointer<commands::Command> processConnectionError(
commands::ConnectionError* error ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processConnectionControl(
+ virtual decaf::lang::Pointer<commands::Command> processConnectionControl(
commands::ConnectionControl* control ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processConsumerControl(
+ virtual decaf::lang::Pointer<commands::Command> processConsumerControl(
commands::ConsumerControl* control ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processBrokerError(
+ virtual decaf::lang::Pointer<commands::Command> processBrokerError(
commands::BrokerError* error ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processReplayCommand(
+ virtual decaf::lang::Pointer<commands::Command> processReplayCommand(
commands::ReplayCommand* replay ) throw ( exceptions::ActiveMQException ) = 0;
- virtual commands::Command* processResponse(
+ virtual decaf::lang::Pointer<commands::Command> processResponse(
commands::Response* response ) throw ( exceptions::ActiveMQException ) = 0;
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitorAdapter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitorAdapter.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitorAdapter.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/state/CommandVisitorAdapter.h Fri Feb 6 23:11:28 2009
@@ -68,232 +68,232 @@
virtual ~CommandVisitorAdapter() {}
- virtual commands::Command* processRemoveConnection(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveConnection(
commands::ConnectionId* id AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processRemoveSession(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveSession(
commands::SessionId* id AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processRemoveProducer(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveProducer(
commands::ProducerId* id AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processRemoveConsumer(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveConsumer(
commands::ConsumerId* id AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processDestinationInfo(
+ virtual decaf::lang::Pointer<commands::Command> processDestinationInfo(
commands::DestinationInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processRemoveDestination(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveDestination(
commands::DestinationInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processRemoveSubscriptionInfo(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveSubscriptionInfo(
commands::RemoveSubscriptionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processMessage(
+ virtual decaf::lang::Pointer<commands::Command> processMessage(
commands::Message* send AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processMessageAck(
+ virtual decaf::lang::Pointer<commands::Command> processMessageAck(
commands::MessageAck* ack AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processMessagePull(
+ virtual decaf::lang::Pointer<commands::Command> processMessagePull(
commands::MessagePull* pull AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processBeginTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processBeginTransaction(
commands::TransactionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processPrepareTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processPrepareTransaction(
commands::TransactionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processCommitTransactionOnePhase(
+ virtual decaf::lang::Pointer<commands::Command> processCommitTransactionOnePhase(
commands::TransactionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processCommitTransactionTwoPhase(
+ virtual decaf::lang::Pointer<commands::Command> processCommitTransactionTwoPhase(
commands::TransactionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processRollbackTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processRollbackTransaction(
commands::TransactionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processWireFormat(
+ virtual decaf::lang::Pointer<commands::Command> processWireFormat(
commands::WireFormatInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processKeepAliveInfo(
+ virtual decaf::lang::Pointer<commands::Command> processKeepAliveInfo(
commands::KeepAliveInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processShutdownInfo(
+ virtual decaf::lang::Pointer<commands::Command> processShutdownInfo(
commands::ShutdownInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processFlushCommand(
+ virtual decaf::lang::Pointer<commands::Command> processFlushCommand(
commands::FlushCommand* command AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processBrokerInfo(
+ virtual decaf::lang::Pointer<commands::Command> processBrokerInfo(
commands::BrokerInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processRecoverTransactions(
+ virtual decaf::lang::Pointer<commands::Command> processRecoverTransactions(
commands::TransactionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processForgetTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processForgetTransaction(
commands::TransactionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processEndTransaction(
+ virtual decaf::lang::Pointer<commands::Command> processEndTransaction(
commands::TransactionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processMessageDispatchNotification(
+ virtual decaf::lang::Pointer<commands::Command> processMessageDispatchNotification(
commands::MessageDispatchNotification* notification AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processProducerAck(
+ virtual decaf::lang::Pointer<commands::Command> processProducerAck(
commands::ProducerAck* ack AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processMessageDispatch(
+ virtual decaf::lang::Pointer<commands::Command> processMessageDispatch(
commands::MessageDispatch* dispatch AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processControlCommand(
+ virtual decaf::lang::Pointer<commands::Command> processControlCommand(
commands::ControlCommand* command AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processConnectionError(
+ virtual decaf::lang::Pointer<commands::Command> processConnectionError(
commands::ConnectionError* error AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processConnectionControl(
+ virtual decaf::lang::Pointer<commands::Command> processConnectionControl(
commands::ConnectionControl* control AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processConsumerControl(
+ virtual decaf::lang::Pointer<commands::Command> processConsumerControl(
commands::ConsumerControl* control AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processBrokerError(
+ virtual decaf::lang::Pointer<commands::Command> processBrokerError(
commands::BrokerError* error AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processReplayCommand(
+ virtual decaf::lang::Pointer<commands::Command> processReplayCommand(
commands::ReplayCommand* replay AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processResponse(
+ virtual decaf::lang::Pointer<commands::Command> processResponse(
commands::Response* response AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processConnectionInfo(
+ virtual decaf::lang::Pointer<commands::Command> processConnectionInfo(
commands::ConnectionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processSessionInfo(
+ virtual decaf::lang::Pointer<commands::Command> processSessionInfo(
commands::SessionInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processProducerInfo(
+ virtual decaf::lang::Pointer<commands::Command> processProducerInfo(
commands::ProducerInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processConsumerInfo(
+ virtual decaf::lang::Pointer<commands::Command> processConsumerInfo(
commands::ConsumerInfo* info AMQCPP_UNUSED ) throw ( exceptions::ActiveMQException ) {
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processTransactionInfo(
+ virtual decaf::lang::Pointer<commands::Command> processTransactionInfo(
commands::TransactionInfo* info ) throw ( exceptions::ActiveMQException ) {
- if( info != NULL ) {
+ if( info != decaf::lang::Pointer<commands::Command>() ) {
switch( info->getType() ) {
case core::ActiveMQConstants::TRANSACTION_STATE_BEGIN:
return this->processBeginTransaction( info );
@@ -316,32 +316,32 @@
__FILE__, __LINE__, "Unknown Transaction Info Type.");
}
}
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
- virtual commands::Command* processRemoveInfo(
+ virtual decaf::lang::Pointer<commands::Command> processRemoveInfo(
commands::RemoveInfo* info ) throw ( exceptions::ActiveMQException ) {
- if( info != NULL ) {
+ if( info != decaf::lang::Pointer<commands::Command>() ) {
switch( info->getObjectId()->getDataStructureType() ) {
case commands::ConnectionId::ID_CONNECTIONID:
return this->processRemoveConnection(
- dynamic_cast<commands::ConnectionId*>( info->getObjectId() ) );
+ dynamic_cast<commands::ConnectionId*>( info->getObjectId().get() ) );
case commands::SessionId::ID_SESSIONID:
return this->processRemoveSession(
- dynamic_cast<commands::SessionId*>( info->getObjectId() ) );
+ dynamic_cast<commands::SessionId*>( info->getObjectId().get() ) );
case commands::ConsumerId::ID_CONSUMERID:
return this->processRemoveConsumer(
- dynamic_cast<commands::ConsumerId*>( info->getObjectId() ) );
+ dynamic_cast<commands::ConsumerId*>( info->getObjectId().get() ) );
case commands::ProducerId::ID_PRODUCERID:
return this->processRemoveProducer(
- dynamic_cast<commands::ProducerId*>( info->getObjectId() ) );
+ dynamic_cast<commands::ProducerId*>( info->getObjectId().get() ) );
default:
throw exceptions::ActiveMQException(
__FILE__, __LINE__, "Unknown Remove Info Type.");
}
}
- return NULL;
+ return decaf::lang::Pointer<commands::Command>();
}
};
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -26,6 +26,7 @@
#include <activemq/exceptions/ActiveMQException.h>
#include <decaf/lang/Long.h>
#include <decaf/lang/Integer.h>
+#include <decaf/lang/Pointer.h>
#include <activemq/util/Config.h>
using namespace std;
@@ -467,12 +468,12 @@
if( wireFormat->isStackTraceEnabled() ) {
short length = dataIn->readShort();
- std::vector< BrokerError::StackTraceElement* > stackTrace;
+ std::vector< Pointer<BrokerError::StackTraceElement> > stackTrace;
for( int i = 0; i < length; ++i ) {
- BrokerError::StackTraceElement* element =
- new BrokerError::StackTraceElement;
+ Pointer<BrokerError::StackTraceElement> element(
+ new BrokerError::StackTraceElement );
element->ClassName = tightUnmarshalString( dataIn, bs );
element->MethodName = tightUnmarshalString( dataIn, bs );
@@ -482,8 +483,8 @@
}
answer->setStackTraceElements( stackTrace );
- answer->setCause( dynamic_cast<BrokerError*>(
- tightUnmarshalBrokerError( wireFormat, dataIn, bs ) ) );
+ answer->setCause( Pointer<BrokerError>( dynamic_cast<BrokerError*>(
+ tightUnmarshalBrokerError( wireFormat, dataIn, bs ) ) ) );
}
return answer;
@@ -526,14 +527,14 @@
for( unsigned int i = 0; i < error->getStackTraceElements().size(); ++i ) {
- const BrokerError::StackTraceElement* element =
+ const Pointer<BrokerError::StackTraceElement> element =
error->getStackTraceElements()[i];
rc += tightMarshalString1( element->ClassName, bs );
rc += tightMarshalString1( element->MethodName, bs );
rc += tightMarshalString1( element->FileName, bs );
rc += 4;
}
- rc += tightMarshalBrokerError1( wireFormat, error->getCause(), bs );
+ rc += tightMarshalBrokerError1( wireFormat, error->getCause().get(), bs );
}
return rc;
@@ -568,7 +569,7 @@
for( int i = 0; i < length; ++i ) {
- BrokerError::StackTraceElement* element =
+ Pointer<BrokerError::StackTraceElement> element =
error->getStackTraceElements()[i];
tightMarshalString2( element->ClassName, dataOut, bs );
@@ -578,7 +579,7 @@
}
tightMarshalBrokerError2(
- wireFormat, error->getCause(), dataOut, bs );
+ wireFormat, error->getCause().get(), dataOut, bs );
}
}
}
@@ -605,12 +606,12 @@
if( wireFormat->isStackTraceEnabled() ) {
short length = dataIn->readShort();
- std::vector< BrokerError::StackTraceElement* > stackTrace;
+ std::vector< Pointer<BrokerError::StackTraceElement> > stackTrace;
for( int i = 0; i < length; ++i ) {
- BrokerError::StackTraceElement* element =
- new BrokerError::StackTraceElement;
+ Pointer<BrokerError::StackTraceElement> element(
+ new BrokerError::StackTraceElement );
element->ClassName = looseUnmarshalString( dataIn );
element->MethodName = looseUnmarshalString( dataIn );
@@ -620,8 +621,8 @@
stackTrace.push_back( element );
}
answer->setStackTraceElements( stackTrace );
- answer->setCause( dynamic_cast<BrokerError*>(
- looseUnmarshalBrokerError( wireFormat, dataIn ) ) );
+ answer->setCause( Pointer<BrokerError>( dynamic_cast<BrokerError*>(
+ looseUnmarshalBrokerError( wireFormat, dataIn ) ) ) );
}
return answer;
@@ -661,8 +662,8 @@
for( size_t i = 0; i < length; ++i ) {
- BrokerError::StackTraceElement* element =
- error->getStackTraceElements()[i];
+ Pointer<BrokerError::StackTraceElement> element(
+ error->getStackTraceElements()[i] );
looseMarshalString( element->ClassName, dataOut );
looseMarshalString( element->MethodName, dataOut );
@@ -671,7 +672,7 @@
dataOut->writeInt( element->LineNumber );
}
- looseMarshalBrokerError( wireFormat, error->getCause(), dataOut );
+ looseMarshalBrokerError( wireFormat, error->getCause().get(), dataOut );
}
}
}
@@ -764,7 +765,7 @@
std::string BaseDataStreamMarshaller::toString( const commands::MessageId* id ) {
if( id == NULL ) return "";
- return toString( id->getProducerId() ) + ":" +
+ return toString( id->getProducerId().get() ) + ":" +
Long::toString( id->getProducerSequenceId() );
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h Fri Feb 6 23:11:28 2009
@@ -513,7 +513,7 @@
*/
template<typename T>
int tightMarshalObjectArray1( OpenWireFormat* wireFormat,
- std::vector<T*> objects,
+ std::vector<T> objects,
utils::BooleanStream* bs )
throw ( decaf::io::IOException )
{
@@ -525,7 +525,7 @@
rc += 2;
for( std::size_t i = 0; i < objects.size(); ++i ) {
rc += tightMarshalNestedObject1(
- wireFormat, objects[i], bs );
+ wireFormat, objects[i].get(), bs );
}
return rc;
@@ -551,7 +551,7 @@
*/
template<typename T>
void tightMarshalObjectArray2( OpenWireFormat* wireFormat,
- std::vector<T*> objects,
+ std::vector<T> objects,
decaf::io::DataOutputStream* dataOut,
utils::BooleanStream* bs )
throw ( decaf::io::IOException ) {
@@ -563,7 +563,7 @@
dataOut->writeShort( (short)objects.size() );
for( std::size_t i = 0; i < objects.size(); ++i ) {
tightMarshalNestedObject2(
- wireFormat, objects[i], dataOut, bs );
+ wireFormat, objects[i].get(), dataOut, bs );
}
}
}
@@ -583,7 +583,7 @@
*/
template<typename T>
void looseMarshalObjectArray( OpenWireFormat* wireFormat,
- std::vector<T*> objects,
+ std::vector<T> objects,
decaf::io::DataOutputStream* dataOut )
throw ( decaf::io::IOException ) {
@@ -595,7 +595,7 @@
dataOut->writeShort( (short)objects.size() );
for( std::size_t i = 0; i < objects.size(); ++i ) {
looseMarshalNestedObject(
- wireFormat, objects[i], dataOut );
+ wireFormat, objects[i].get(), dataOut );
}
}
}
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQBlobMessage.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
DataStructure* ActiveMQBlobMessageMarshaller::createObject() const {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBlobMessageMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQBlobMessageMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQBlobMessageMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -59,14 +59,14 @@
virtual commands::DataStructure* createObject() const;
/**
- * Get the Data Structure Type that identifies this Marshaller
+ * Get the Data Structure Type that identifies this Marshaler
* @return byte holding the data structure type value
*/
virtual unsigned char getDataStructureType() const;
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -78,7 +78,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -89,7 +89,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -101,7 +101,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQBytesMessage.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
DataStructure* ActiveMQBytesMessageMarshaller::createObject() const {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQBytesMessageMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQBytesMessageMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQBytesMessageMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -59,14 +59,14 @@
virtual commands::DataStructure* createObject() const;
/**
- * Get the Data Structure Type that identifies this Marshaller
+ * Get the Data Structure Type that identifies this Marshaler
* @return byte holding the data structure type value
*/
virtual unsigned char getDataStructureType() const;
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -78,7 +78,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -89,7 +89,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -101,7 +101,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQDestination.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
void ActiveMQDestinationMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQDestinationMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQDestinationMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQDestinationMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -54,7 +54,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -66,7 +66,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -77,7 +77,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -89,7 +89,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQMapMessage.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
DataStructure* ActiveMQMapMessageMarshaller::createObject() const {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMapMessageMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQMapMessageMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQMapMessageMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -59,14 +59,14 @@
virtual commands::DataStructure* createObject() const;
/**
- * Get the Data Structure Type that identifies this Marshaller
+ * Get the Data Structure Type that identifies this Marshaler
* @return byte holding the data structure type value
*/
virtual unsigned char getDataStructureType() const;
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -78,7 +78,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -89,7 +89,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -101,7 +101,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQMessage.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
DataStructure* ActiveMQMessageMarshaller::createObject() const {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQMessageMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQMessageMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQMessageMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -59,14 +59,14 @@
virtual commands::DataStructure* createObject() const;
/**
- * Get the Data Structure Type that identifies this Marshaller
+ * Get the Data Structure Type that identifies this Marshaler
* @return byte holding the data structure type value
*/
virtual unsigned char getDataStructureType() const;
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -78,7 +78,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -89,7 +89,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -101,7 +101,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQObjectMessage.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
DataStructure* ActiveMQObjectMessageMarshaller::createObject() const {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQObjectMessageMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQObjectMessageMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQObjectMessageMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -59,14 +59,14 @@
virtual commands::DataStructure* createObject() const;
/**
- * Get the Data Structure Type that identifies this Marshaller
+ * Get the Data Structure Type that identifies this Marshaler
* @return byte holding the data structure type value
*/
virtual unsigned char getDataStructureType() const;
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -78,7 +78,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -89,7 +89,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -101,7 +101,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQQueue.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
DataStructure* ActiveMQQueueMarshaller::createObject() const {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQQueueMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQQueueMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQQueueMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -59,14 +59,14 @@
virtual commands::DataStructure* createObject() const;
/**
- * Get the Data Structure Type that identifies this Marshaller
+ * Get the Data Structure Type that identifies this Marshaler
* @return byte holding the data structure type value
*/
virtual unsigned char getDataStructureType() const;
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -78,7 +78,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -89,7 +89,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -101,7 +101,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQStreamMessage.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
DataStructure* ActiveMQStreamMessageMarshaller::createObject() const {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQStreamMessageMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQStreamMessageMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -59,14 +59,14 @@
virtual commands::DataStructure* createObject() const;
/**
- * Get the Data Structure Type that identifies this Marshaller
+ * Get the Data Structure Type that identifies this Marshaler
* @return byte holding the data structure type value
*/
virtual unsigned char getDataStructureType() const;
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -78,7 +78,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -89,7 +89,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -101,7 +101,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQTempDestination.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
void ActiveMQTempDestinationMarshaller::tightUnmarshal( OpenWireFormat* wireFormat, DataStructure* dataStructure, DataInputStream* dataIn, BooleanStream* bs ) throw( decaf::io::IOException ) {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempDestinationMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQTempDestinationMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQTempDestinationMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -54,7 +54,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -66,7 +66,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -77,7 +77,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -89,7 +89,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.cpp?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.cpp Fri Feb 6 23:11:28 2009
@@ -19,6 +19,7 @@
#include <activemq/commands/ActiveMQTempQueue.h>
#include <activemq/exceptions/ActiveMQException.h>
+#include <decaf/lang/Pointer.h>
//
// NOTE!: This file is autogenerated - do not modify!
@@ -37,6 +38,7 @@
using namespace activemq::wireformat::openwire::marshal::v1;
using namespace decaf;
using namespace decaf::io;
+using namespace decaf::lang;
///////////////////////////////////////////////////////////////////////////////
DataStructure* ActiveMQTempQueueMarshaller::createObject() const {
Modified: activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.h?rev=741774&r1=741773&r2=741774&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshaller.h Fri Feb 6 23:11:28 2009
@@ -40,9 +40,9 @@
namespace v1{
/**
- * Marshalling code for Open Wire Format for ActiveMQTempQueueMarshaller
+ * Marshaling code for Open Wire Format for ActiveMQTempQueueMarshaller
*
- * NOTE!: This file is autogenerated - do not modify!
+ * NOTE!: This file is auto generated - do not modify!
* if you need to make a change, please see the Java Classes
* in the activemq-openwire-generator module
*/
@@ -59,14 +59,14 @@
virtual commands::DataStructure* createObject() const;
/**
- * Get the Data Structure Type that identifies this Marshaller
+ * Get the Data Structure Type that identifies this Marshaler
* @return byte holding the data structure type value
*/
virtual unsigned char getDataStructureType() const;
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be un-marshaled
* @param dataIn - BinaryReader that provides that data
* @param bs - BooleanStream
@@ -78,7 +78,7 @@
/**
* Write the booleans that this object uses to a BooleanStream
- * @param wireFormat - describis the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param bs - BooleanStream
* @returns int
@@ -89,7 +89,7 @@
/**
* Write a object instance to data output stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataOut - BinaryReader that provides that data sink
* @param bs - BooleanStream
@@ -101,7 +101,7 @@
/**
* Un-marshal an object instance from the data input stream
- * @param wireFormat - describs the wire format of the broker
+ * @param wireFormat - describes the wire format of the broker
* @param o - Object to be marshaled
* @param dataIn - BinaryReader that provides that data source
*/