activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1460467 [1/15] - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: commands/ wireformat/openwire/marshal/generated/
Date Sun, 24 Mar 2013 21:30:56 GMT
Author: tabish
Date: Sun Mar 24 21:30:52 2013
New Revision: 1460467

URL: http://svn.apache.org/r1460467
Log:
Updated openwire commands and marshalers.  Removes APR references and adds hash code methods.

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerControl.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ControlCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DataResponse.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DestinationInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ExceptionResponse.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/FlushCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/FlushCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/IntegerResponse.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/IntegerResponse.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalQueueAck.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTopicAck.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTrace.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTrace.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/JournalTransaction.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/KeepAliveInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/KeepAliveInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LastPartialCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LastPartialCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/LocalTransactionId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageAck.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatch.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatch.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatchNotification.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageDispatchNotification.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessageId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/MessagePull.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/NetworkBridgeFilter.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/PartialCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerAck.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ProducerInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/RemoveSubscriptionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ReplayCommand.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Response.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SessionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ShutdownInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/SubscriptionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/TransactionInfo.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBlobMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQBytesMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQDestinationMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQMapMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQObjectMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQQueueMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQStreamMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTempDestinationMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTempDestinationMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTempQueueMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTempTopicMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTextMessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ActiveMQTopicMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/BaseCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/BaseCommandMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/BrokerIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/BrokerInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConnectionControlMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConnectionErrorMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConnectionIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConnectionInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerControlMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerControlMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ConsumerInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ControlCommandMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataArrayResponseMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DataResponseMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DestinationInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/DiscoveryEventMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ExceptionResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ExceptionResponseMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/FlushCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/FlushCommandMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/IntegerResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/IntegerResponseMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/JournalQueueAckMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/JournalQueueAckMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/JournalTopicAckMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/JournalTopicAckMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/JournalTraceMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/JournalTraceMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/JournalTransactionMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/JournalTransactionMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/KeepAliveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/KeepAliveInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/LastPartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/LastPartialCommandMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/LocalTransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/LocalTransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MarshallerFactory.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MarshallerFactory.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageAckMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageAckMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageDispatchMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageDispatchMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageDispatchNotificationMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageDispatchNotificationMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessageMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessagePullMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/MessagePullMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/NetworkBridgeFilterMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/PartialCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/PartialCommandMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerAckMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerAckMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ProducerInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/RemoveSubscriptionInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ReplayCommandMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ResponseMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ResponseMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SessionInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/ShutdownInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/SubscriptionInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionIdMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/TransactionInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/WireFormatInfoMarshaller.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshaller.cpp
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/wireformat/openwire/marshal/generated/XATransactionIdMarshaller.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.cpp Sun Mar 24 21:30:52 2013
@@ -18,8 +18,9 @@
 #include <activemq/commands/BrokerId.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <apr_strings.h>
+#include <decaf/internal/util/StringUtils.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/util/HashCode.h>
 
 using namespace std;
 using namespace activemq;
@@ -27,6 +28,7 @@ using namespace activemq::exceptions;
 using namespace activemq::commands;
 using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
+using namespace decaf::internal::util;
 
 /*
  *
@@ -39,16 +41,16 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-BrokerId::BrokerId() 
-    : BaseDataStructure(), value("") {
+BrokerId::BrokerId() :
+    BaseDataStructure(), value("") {
 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-BrokerId::BrokerId( const BrokerId& other )
-    : BaseDataStructure(), value("") {
+BrokerId::BrokerId(const BrokerId& other) :
+    BaseDataStructure(), value("") {
 
-    this->copyDataStructure( &other );
+    this->copyDataStructure(&other);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -57,34 +59,34 @@ BrokerId::~BrokerId() {
 
 ////////////////////////////////////////////////////////////////////////////////
 BrokerId* BrokerId::cloneDataStructure() const {
-    std::auto_ptr<BrokerId> brokerId( new BrokerId() );
+    std::auto_ptr<BrokerId> brokerId(new BrokerId());
 
     // Copy the data from the base class or classes
-    brokerId->copyDataStructure( this );
+    brokerId->copyDataStructure(this);
 
     return brokerId.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerId::copyDataStructure( const DataStructure* src ) {
+void BrokerId::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const BrokerId* srcPtr = dynamic_cast<const BrokerId*>( src );
+    const BrokerId* srcPtr = dynamic_cast<const BrokerId*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "BrokerId::copyDataStructure - src is NULL or invalid" );
+            "BrokerId::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseDataStructure::copyDataStructure( src );
+    BaseDataStructure::copyDataStructure(src);
 
-    this->setValue( srcPtr->getValue() );
+    this->setValue(srcPtr->getValue());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -99,22 +101,22 @@ std::string BrokerId::toString() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool BrokerId::equals( const DataStructure* value ) const {
+bool BrokerId::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const BrokerId* valuePtr = dynamic_cast<const BrokerId*>( value );
+    const BrokerId* valuePtr = dynamic_cast<const BrokerId*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getValue() != valuePtr->getValue() ) {
+    if (this->getValue() != valuePtr->getValue()) {
         return false;
     }
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
@@ -131,19 +133,19 @@ std::string& BrokerId::getValue() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerId::setValue( const std::string& value ) {
+void BrokerId::setValue(const std::string& value) {
     this->value = value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int BrokerId::compareTo( const BrokerId& value ) const {
+int BrokerId::compareTo(const BrokerId& value) const {
 
-    if( this == &value ) {
+    if (this == &value) {
         return 0;
     }
 
-    int valueComp = apr_strnatcasecmp( this->value.c_str(), value.value.c_str() );
-    if( valueComp != 0 ) {
+    int valueComp = StringUtils::compareIgnoreCase(this->value.c_str(), value.value.c_str());
+    if (valueComp != 0) {
         return valueComp;
     }
 
@@ -151,23 +153,28 @@ int BrokerId::compareTo( const BrokerId&
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool BrokerId::equals( const BrokerId& value ) const {
-    return this->equals( (const DataStructure*)&value );
+bool BrokerId::equals(const BrokerId& value) const {
+    return this->equals((const DataStructure*)&value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool BrokerId::operator==( const BrokerId& value ) const {
-    return this->compareTo( value ) == 0;
+bool BrokerId::operator==(const BrokerId& value) const {
+    return this->compareTo(value) == 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool BrokerId::operator<( const BrokerId& value ) const {
-    return this->compareTo( value ) < 0;
+bool BrokerId::operator<(const BrokerId& value) const {
+    return this->compareTo(value) < 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-BrokerId& BrokerId::operator= ( const BrokerId& other ) {
-    this->copyDataStructure( &other );
+BrokerId& BrokerId::operator= (const BrokerId& other) {
+    this->copyDataStructure(&other);
     return *this;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int BrokerId::getHashCode() const {
+    return decaf::util::HashCode<std::string>()(this->toString());
+}
+

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerId.h Sun Mar 24 21:30:52 2013
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -59,7 +59,7 @@ namespace commands{
 
         BrokerId();
 
-        BrokerId( const BrokerId& other );
+        BrokerId(const BrokerId& other);
 
         virtual ~BrokerId();
 
@@ -67,25 +67,27 @@ namespace commands{
 
         virtual BrokerId* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const std::string& getValue() const;
         virtual std::string& getValue();
         virtual void setValue( const std::string& value );
 
-        virtual int compareTo( const BrokerId& value ) const;
+        virtual int compareTo(const BrokerId& value) const;
 
-        virtual bool equals( const BrokerId& value ) const;
+        virtual bool equals(const BrokerId& value) const;
 
-        virtual bool operator==( const BrokerId& value ) const;
+        virtual bool operator==(const BrokerId& value) const;
 
-        virtual bool operator<( const BrokerId& value ) const;
+        virtual bool operator<(const BrokerId& value) const;
 
-        BrokerId& operator= ( const BrokerId& other );
+        BrokerId& operator= (const BrokerId& other);
+
+        int getHashCode() const;
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-BrokerInfo::BrokerInfo() 
-    : BaseCommand(), brokerId(NULL), brokerURL(""), peerBrokerInfos(), brokerName(""), slaveBroker(false), masterBroker(false), 
+BrokerInfo::BrokerInfo() :
+    BaseCommand(), brokerId(NULL), brokerURL(""), peerBrokerInfos(), brokerName(""), slaveBroker(false), masterBroker(false), 
       faultTolerantConfiguration(false), duplexConnection(false), networkConnection(false), connectionId(0), brokerUploadUrl(""), 
       networkProperties("") {
 
@@ -51,45 +51,45 @@ BrokerInfo::~BrokerInfo() {
 
 ////////////////////////////////////////////////////////////////////////////////
 BrokerInfo* BrokerInfo::cloneDataStructure() const {
-    std::auto_ptr<BrokerInfo> brokerInfo( new BrokerInfo() );
+    std::auto_ptr<BrokerInfo> brokerInfo(new BrokerInfo());
 
     // Copy the data from the base class or classes
-    brokerInfo->copyDataStructure( this );
+    brokerInfo->copyDataStructure(this);
 
     return brokerInfo.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::copyDataStructure( const DataStructure* src ) {
+void BrokerInfo::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const BrokerInfo* srcPtr = dynamic_cast<const BrokerInfo*>( src );
+    const BrokerInfo* srcPtr = dynamic_cast<const BrokerInfo*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "BrokerInfo::copyDataStructure - src is NULL or invalid" );
+            "BrokerInfo::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setBrokerId( srcPtr->getBrokerId() );
-    this->setBrokerURL( srcPtr->getBrokerURL() );
-    this->setPeerBrokerInfos( srcPtr->getPeerBrokerInfos() );
-    this->setBrokerName( srcPtr->getBrokerName() );
-    this->setSlaveBroker( srcPtr->isSlaveBroker() );
-    this->setMasterBroker( srcPtr->isMasterBroker() );
-    this->setFaultTolerantConfiguration( srcPtr->isFaultTolerantConfiguration() );
-    this->setDuplexConnection( srcPtr->isDuplexConnection() );
-    this->setNetworkConnection( srcPtr->isNetworkConnection() );
-    this->setConnectionId( srcPtr->getConnectionId() );
-    this->setBrokerUploadUrl( srcPtr->getBrokerUploadUrl() );
-    this->setNetworkProperties( srcPtr->getNetworkProperties() );
+    this->setBrokerId(srcPtr->getBrokerId());
+    this->setBrokerURL(srcPtr->getBrokerURL());
+    this->setPeerBrokerInfos(srcPtr->getPeerBrokerInfos());
+    this->setBrokerName(srcPtr->getBrokerName());
+    this->setSlaveBroker(srcPtr->isSlaveBroker());
+    this->setMasterBroker(srcPtr->isMasterBroker());
+    this->setFaultTolerantConfiguration(srcPtr->isFaultTolerantConfiguration());
+    this->setDuplexConnection(srcPtr->isDuplexConnection());
+    this->setNetworkConnection(srcPtr->isNetworkConnection());
+    this->setConnectionId(srcPtr->getConnectionId());
+    this->setBrokerUploadUrl(srcPtr->getBrokerUploadUrl());
+    this->setNetworkProperties(srcPtr->getNetworkProperties());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -107,7 +107,7 @@ std::string BrokerInfo::toString() const
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "BrokerId = ";
-    if( this->getBrokerId() != NULL ) {
+    if (this->getBrokerId() != NULL) {
         stream << this->getBrokerId()->toString();
     } else {
         stream << "NULL";
@@ -116,10 +116,10 @@ std::string BrokerInfo::toString() const
     stream << "BrokerURL = " << this->getBrokerURL();
     stream << ", ";
     stream << "PeerBrokerInfos = ";
-    if( this->getPeerBrokerInfos().size() > 0 ) {
+    if (this->getPeerBrokerInfos().size() > 0) {
         stream << "[";
-        for( size_t ipeerBrokerInfos = 0; ipeerBrokerInfos < this->getPeerBrokerInfos().size(); ++ipeerBrokerInfos ) {
-            if( this->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL ) {
+        for (size_t ipeerBrokerInfos = 0; ipeerBrokerInfos < this->getPeerBrokerInfos().size(); ++ipeerBrokerInfos) {
+            if (this->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL) {
                 stream << this->getPeerBrokerInfos()[ipeerBrokerInfos]->toString() << ", ";
             } else {
                 stream << "NULL" << ", ";
@@ -153,65 +153,65 @@ std::string BrokerInfo::toString() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool BrokerInfo::equals( const DataStructure* value ) const {
+bool BrokerInfo::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const BrokerInfo* valuePtr = dynamic_cast<const BrokerInfo*>( value );
+    const BrokerInfo* valuePtr = dynamic_cast<const BrokerInfo*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getBrokerId() != NULL ) {
-        if( !this->getBrokerId()->equals( valuePtr->getBrokerId().get() ) ) {
+    if (this->getBrokerId() != NULL) {
+        if (!this->getBrokerId()->equals( valuePtr->getBrokerId().get())) {
             return false;
         }
-    } else if( valuePtr->getBrokerId() != NULL ) {
+    } else if (valuePtr->getBrokerId() != NULL) {
         return false;
     }
-    if( this->getBrokerURL() != valuePtr->getBrokerURL() ) {
+    if (this->getBrokerURL() != valuePtr->getBrokerURL()) {
         return false;
     }
-    for( size_t ipeerBrokerInfos = 0; ipeerBrokerInfos < this->getPeerBrokerInfos().size(); ++ipeerBrokerInfos ) {
-        if( this->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL ) {
-            if( !this->getPeerBrokerInfos()[ipeerBrokerInfos]->equals( valuePtr->getPeerBrokerInfos()[ipeerBrokerInfos].get() ) ) {
+    for (size_t ipeerBrokerInfos = 0; ipeerBrokerInfos < this->getPeerBrokerInfos().size(); ++ipeerBrokerInfos) {
+        if (this->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL ) {
+            if (!this->getPeerBrokerInfos()[ipeerBrokerInfos]->equals( valuePtr->getPeerBrokerInfos()[ipeerBrokerInfos].get())) {
                 return false;
             }
-        } else if( valuePtr->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL ) {
+        } else if (valuePtr->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL) {
             return false;
         }
     }
-    if( this->getBrokerName() != valuePtr->getBrokerName() ) {
+    if (this->getBrokerName() != valuePtr->getBrokerName()) {
         return false;
     }
-    if( this->isSlaveBroker() != valuePtr->isSlaveBroker() ) {
+    if (this->isSlaveBroker() != valuePtr->isSlaveBroker()) {
         return false;
     }
-    if( this->isMasterBroker() != valuePtr->isMasterBroker() ) {
+    if (this->isMasterBroker() != valuePtr->isMasterBroker()) {
         return false;
     }
-    if( this->isFaultTolerantConfiguration() != valuePtr->isFaultTolerantConfiguration() ) {
+    if (this->isFaultTolerantConfiguration() != valuePtr->isFaultTolerantConfiguration()) {
         return false;
     }
-    if( this->isDuplexConnection() != valuePtr->isDuplexConnection() ) {
+    if (this->isDuplexConnection() != valuePtr->isDuplexConnection()) {
         return false;
     }
-    if( this->isNetworkConnection() != valuePtr->isNetworkConnection() ) {
+    if (this->isNetworkConnection() != valuePtr->isNetworkConnection()) {
         return false;
     }
-    if( this->getConnectionId() != valuePtr->getConnectionId() ) {
+    if (this->getConnectionId() != valuePtr->getConnectionId()) {
         return false;
     }
-    if( this->getBrokerUploadUrl() != valuePtr->getBrokerUploadUrl() ) {
+    if (this->getBrokerUploadUrl() != valuePtr->getBrokerUploadUrl()) {
         return false;
     }
-    if( this->getNetworkProperties() != valuePtr->getNetworkProperties() ) {
+    if (this->getNetworkProperties() != valuePtr->getNetworkProperties()) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -228,7 +228,7 @@ decaf::lang::Pointer<BrokerId>& BrokerIn
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setBrokerId( const decaf::lang::Pointer<BrokerId>& brokerId ) {
+void BrokerInfo::setBrokerId(const decaf::lang::Pointer<BrokerId>& brokerId) {
     this->brokerId = brokerId;
 }
 
@@ -243,7 +243,7 @@ std::string& BrokerInfo::getBrokerURL() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setBrokerURL( const std::string& brokerURL ) {
+void BrokerInfo::setBrokerURL(const std::string& brokerURL) {
     this->brokerURL = brokerURL;
 }
 
@@ -258,7 +258,7 @@ std::vector< decaf::lang::Pointer<Broker
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setPeerBrokerInfos( const std::vector< decaf::lang::Pointer<BrokerInfo> >& peerBrokerInfos ) {
+void BrokerInfo::setPeerBrokerInfos(const std::vector< decaf::lang::Pointer<BrokerInfo> >& peerBrokerInfos) {
     this->peerBrokerInfos = peerBrokerInfos;
 }
 
@@ -273,7 +273,7 @@ std::string& BrokerInfo::getBrokerName()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setBrokerName( const std::string& brokerName ) {
+void BrokerInfo::setBrokerName(const std::string& brokerName) {
     this->brokerName = brokerName;
 }
 
@@ -283,7 +283,7 @@ bool BrokerInfo::isSlaveBroker() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setSlaveBroker( bool slaveBroker ) {
+void BrokerInfo::setSlaveBroker(bool slaveBroker) {
     this->slaveBroker = slaveBroker;
 }
 
@@ -293,7 +293,7 @@ bool BrokerInfo::isMasterBroker() const 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setMasterBroker( bool masterBroker ) {
+void BrokerInfo::setMasterBroker(bool masterBroker) {
     this->masterBroker = masterBroker;
 }
 
@@ -303,7 +303,7 @@ bool BrokerInfo::isFaultTolerantConfigur
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setFaultTolerantConfiguration( bool faultTolerantConfiguration ) {
+void BrokerInfo::setFaultTolerantConfiguration(bool faultTolerantConfiguration) {
     this->faultTolerantConfiguration = faultTolerantConfiguration;
 }
 
@@ -313,7 +313,7 @@ bool BrokerInfo::isDuplexConnection() co
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setDuplexConnection( bool duplexConnection ) {
+void BrokerInfo::setDuplexConnection(bool duplexConnection) {
     this->duplexConnection = duplexConnection;
 }
 
@@ -323,7 +323,7 @@ bool BrokerInfo::isNetworkConnection() c
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setNetworkConnection( bool networkConnection ) {
+void BrokerInfo::setNetworkConnection(bool networkConnection) {
     this->networkConnection = networkConnection;
 }
 
@@ -333,7 +333,7 @@ long long BrokerInfo::getConnectionId() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setConnectionId( long long connectionId ) {
+void BrokerInfo::setConnectionId(long long connectionId) {
     this->connectionId = connectionId;
 }
 
@@ -348,7 +348,7 @@ std::string& BrokerInfo::getBrokerUpload
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setBrokerUploadUrl( const std::string& brokerUploadUrl ) {
+void BrokerInfo::setBrokerUploadUrl(const std::string& brokerUploadUrl) {
     this->brokerUploadUrl = brokerUploadUrl;
 }
 
@@ -363,12 +363,11 @@ std::string& BrokerInfo::getNetworkPrope
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void BrokerInfo::setNetworkProperties( const std::string& networkProperties ) {
+void BrokerInfo::setNetworkProperties(const std::string& networkProperties) {
     this->networkProperties = networkProperties;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> BrokerInfo::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processBrokerInfo( this );
+decaf::lang::Pointer<commands::Command> BrokerInfo::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processBrokerInfo(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/BrokerInfo.h Sun Mar 24 21:30:52 2013
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -67,8 +67,8 @@ namespace commands{
 
     private:
 
-        BrokerInfo( const BrokerInfo& );
-        BrokerInfo& operator= ( const BrokerInfo& );
+        BrokerInfo(const BrokerInfo&);
+        BrokerInfo& operator= (const BrokerInfo&);
 
     public:
 
@@ -80,11 +80,11 @@ namespace commands{
 
         virtual BrokerInfo* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const Pointer<BrokerId>& getBrokerId() const;
         virtual Pointer<BrokerId>& getBrokerId();
@@ -135,7 +135,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionControl::ConnectionControl() 
-    : BaseCommand(), close(false), exit(false), faultTolerant(false), resume(false), suspend(false), connectedBrokers(""), reconnectTo(""), 
+ConnectionControl::ConnectionControl() :
+    BaseCommand(), close(false), exit(false), faultTolerant(false), resume(false), suspend(false), connectedBrokers(""), reconnectTo(""), 
       rebalanceConnection(false), token() {
 
 }
@@ -50,42 +50,42 @@ ConnectionControl::~ConnectionControl() 
 
 ////////////////////////////////////////////////////////////////////////////////
 ConnectionControl* ConnectionControl::cloneDataStructure() const {
-    std::auto_ptr<ConnectionControl> connectionControl( new ConnectionControl() );
+    std::auto_ptr<ConnectionControl> connectionControl(new ConnectionControl());
 
     // Copy the data from the base class or classes
-    connectionControl->copyDataStructure( this );
+    connectionControl->copyDataStructure(this);
 
     return connectionControl.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::copyDataStructure( const DataStructure* src ) {
+void ConnectionControl::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ConnectionControl* srcPtr = dynamic_cast<const ConnectionControl*>( src );
+    const ConnectionControl* srcPtr = dynamic_cast<const ConnectionControl*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ConnectionControl::copyDataStructure - src is NULL or invalid" );
+            "ConnectionControl::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setClose( srcPtr->isClose() );
-    this->setExit( srcPtr->isExit() );
-    this->setFaultTolerant( srcPtr->isFaultTolerant() );
-    this->setResume( srcPtr->isResume() );
-    this->setSuspend( srcPtr->isSuspend() );
-    this->setConnectedBrokers( srcPtr->getConnectedBrokers() );
-    this->setReconnectTo( srcPtr->getReconnectTo() );
-    this->setRebalanceConnection( srcPtr->isRebalanceConnection() );
-    this->setToken( srcPtr->getToken() );
+    this->setClose(srcPtr->isClose());
+    this->setExit(srcPtr->isExit());
+    this->setFaultTolerant(srcPtr->isFaultTolerant());
+    this->setResume(srcPtr->isResume());
+    this->setSuspend(srcPtr->isSuspend());
+    this->setConnectedBrokers(srcPtr->getConnectedBrokers());
+    this->setReconnectTo(srcPtr->getReconnectTo());
+    this->setRebalanceConnection(srcPtr->isRebalanceConnection());
+    this->setToken(srcPtr->getToken());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -119,9 +119,9 @@ std::string ConnectionControl::toString(
     stream << "RebalanceConnection = " << this->isRebalanceConnection();
     stream << ", ";
     stream << "Token = ";
-    if( this->getToken().size() > 0 ) {
+    if (this->getToken().size() > 0) {
         stream << "[";
-        for( size_t itoken = 0; itoken < this->getToken().size(); ++itoken ) {
+        for (size_t itoken = 0; itoken < this->getToken().size(); ++itoken) {
             stream << this->getToken()[itoken] << ",";
         }
         stream << "]";
@@ -134,48 +134,48 @@ std::string ConnectionControl::toString(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConnectionControl::equals( const DataStructure* value ) const {
+bool ConnectionControl::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ConnectionControl* valuePtr = dynamic_cast<const ConnectionControl*>( value );
+    const ConnectionControl* valuePtr = dynamic_cast<const ConnectionControl*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->isClose() != valuePtr->isClose() ) {
+    if (this->isClose() != valuePtr->isClose()) {
         return false;
     }
-    if( this->isExit() != valuePtr->isExit() ) {
+    if (this->isExit() != valuePtr->isExit()) {
         return false;
     }
-    if( this->isFaultTolerant() != valuePtr->isFaultTolerant() ) {
+    if (this->isFaultTolerant() != valuePtr->isFaultTolerant()) {
         return false;
     }
-    if( this->isResume() != valuePtr->isResume() ) {
+    if (this->isResume() != valuePtr->isResume()) {
         return false;
     }
-    if( this->isSuspend() != valuePtr->isSuspend() ) {
+    if (this->isSuspend() != valuePtr->isSuspend()) {
         return false;
     }
-    if( this->getConnectedBrokers() != valuePtr->getConnectedBrokers() ) {
+    if (this->getConnectedBrokers() != valuePtr->getConnectedBrokers()) {
         return false;
     }
-    if( this->getReconnectTo() != valuePtr->getReconnectTo() ) {
+    if (this->getReconnectTo() != valuePtr->getReconnectTo()) {
         return false;
     }
-    if( this->isRebalanceConnection() != valuePtr->isRebalanceConnection() ) {
+    if (this->isRebalanceConnection() != valuePtr->isRebalanceConnection()) {
         return false;
     }
-    for( size_t itoken = 0; itoken < this->getToken().size(); ++itoken ) {
-        if( this->getToken()[itoken] != valuePtr->getToken()[itoken] ) {
+    for (size_t itoken = 0; itoken < this->getToken().size(); ++itoken) {
+        if (this->getToken()[itoken] != valuePtr->getToken()[itoken]) {
             return false;
         }
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -187,7 +187,7 @@ bool ConnectionControl::isClose() const 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setClose( bool close ) {
+void ConnectionControl::setClose(bool close) {
     this->close = close;
 }
 
@@ -197,7 +197,7 @@ bool ConnectionControl::isExit() const {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setExit( bool exit ) {
+void ConnectionControl::setExit(bool exit) {
     this->exit = exit;
 }
 
@@ -207,7 +207,7 @@ bool ConnectionControl::isFaultTolerant(
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setFaultTolerant( bool faultTolerant ) {
+void ConnectionControl::setFaultTolerant(bool faultTolerant) {
     this->faultTolerant = faultTolerant;
 }
 
@@ -217,7 +217,7 @@ bool ConnectionControl::isResume() const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setResume( bool resume ) {
+void ConnectionControl::setResume(bool resume) {
     this->resume = resume;
 }
 
@@ -227,7 +227,7 @@ bool ConnectionControl::isSuspend() cons
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setSuspend( bool suspend ) {
+void ConnectionControl::setSuspend(bool suspend) {
     this->suspend = suspend;
 }
 
@@ -242,7 +242,7 @@ std::string& ConnectionControl::getConne
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setConnectedBrokers( const std::string& connectedBrokers ) {
+void ConnectionControl::setConnectedBrokers(const std::string& connectedBrokers) {
     this->connectedBrokers = connectedBrokers;
 }
 
@@ -257,7 +257,7 @@ std::string& ConnectionControl::getRecon
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setReconnectTo( const std::string& reconnectTo ) {
+void ConnectionControl::setReconnectTo(const std::string& reconnectTo) {
     this->reconnectTo = reconnectTo;
 }
 
@@ -267,7 +267,7 @@ bool ConnectionControl::isRebalanceConne
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setRebalanceConnection( bool rebalanceConnection ) {
+void ConnectionControl::setRebalanceConnection(bool rebalanceConnection) {
     this->rebalanceConnection = rebalanceConnection;
 }
 
@@ -282,12 +282,11 @@ std::vector<unsigned char>& ConnectionCo
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionControl::setToken( const std::vector<unsigned char>& token ) {
+void ConnectionControl::setToken(const std::vector<unsigned char>& token) {
     this->token = token;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ConnectionControl::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processConnectionControl( this );
+decaf::lang::Pointer<commands::Command> ConnectionControl::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processConnectionControl(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionControl.h Sun Mar 24 21:30:52 2013
@@ -29,8 +29,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -62,8 +62,8 @@ namespace commands{
 
     private:
 
-        ConnectionControl( const ConnectionControl& );
-        ConnectionControl& operator= ( const ConnectionControl& );
+        ConnectionControl(const ConnectionControl&);
+        ConnectionControl& operator= (const ConnectionControl&);
 
     public:
 
@@ -75,11 +75,11 @@ namespace commands{
 
         virtual ConnectionControl* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual bool isClose() const;
         virtual void setClose( bool close );
@@ -118,7 +118,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp Sun Mar 24 21:30:52 2013
@@ -38,8 +38,8 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionError::ConnectionError() 
-    : BaseCommand(), exception(NULL), connectionId(NULL) {
+ConnectionError::ConnectionError() :
+    BaseCommand(), exception(NULL), connectionId(NULL) {
 
 }
 
@@ -49,35 +49,35 @@ ConnectionError::~ConnectionError() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ConnectionError* ConnectionError::cloneDataStructure() const {
-    std::auto_ptr<ConnectionError> connectionError( new ConnectionError() );
+    std::auto_ptr<ConnectionError> connectionError(new ConnectionError());
 
     // Copy the data from the base class or classes
-    connectionError->copyDataStructure( this );
+    connectionError->copyDataStructure(this);
 
     return connectionError.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionError::copyDataStructure( const DataStructure* src ) {
+void ConnectionError::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ConnectionError* srcPtr = dynamic_cast<const ConnectionError*>( src );
+    const ConnectionError* srcPtr = dynamic_cast<const ConnectionError*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ConnectionError::copyDataStructure - src is NULL or invalid" );
+            "ConnectionError::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseCommand::copyDataStructure( src );
+    BaseCommand::copyDataStructure(src);
 
-    this->setException( srcPtr->getException() );
-    this->setConnectionId( srcPtr->getConnectionId() );
+    this->setException(srcPtr->getException());
+    this->setConnectionId(srcPtr->getConnectionId());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -95,14 +95,14 @@ std::string ConnectionError::toString() 
            << "responseRequired = " << boolalpha << this->isResponseRequired();
     stream << ", ";
     stream << "Exception = ";
-    if( this->getException() != NULL ) {
+    if (this->getException() != NULL) {
         stream << this->getException()->toString();
     } else {
         stream << "NULL";
     }
     stream << ", ";
     stream << "ConnectionId = ";
-    if( this->getConnectionId() != NULL ) {
+    if (this->getConnectionId() != NULL) {
         stream << this->getConnectionId()->toString();
     } else {
         stream << "NULL";
@@ -113,33 +113,33 @@ std::string ConnectionError::toString() 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConnectionError::equals( const DataStructure* value ) const {
+bool ConnectionError::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ConnectionError* valuePtr = dynamic_cast<const ConnectionError*>( value );
+    const ConnectionError* valuePtr = dynamic_cast<const ConnectionError*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getException() != NULL ) {
-        if( !this->getException()->equals( valuePtr->getException().get() ) ) {
+    if (this->getException() != NULL) {
+        if (!this->getException()->equals( valuePtr->getException().get())) {
             return false;
         }
-    } else if( valuePtr->getException() != NULL ) {
+    } else if (valuePtr->getException() != NULL) {
         return false;
     }
-    if( this->getConnectionId() != NULL ) {
-        if( !this->getConnectionId()->equals( valuePtr->getConnectionId().get() ) ) {
+    if (this->getConnectionId() != NULL) {
+        if (!this->getConnectionId()->equals( valuePtr->getConnectionId().get())) {
             return false;
         }
-    } else if( valuePtr->getConnectionId() != NULL ) {
+    } else if (valuePtr->getConnectionId() != NULL) {
         return false;
     }
-    if( !BaseCommand::equals( value ) ) {
+    if (!BaseCommand::equals(value)) {
         return false;
     }
     return true;
@@ -156,7 +156,7 @@ decaf::lang::Pointer<BrokerError>& Conne
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionError::setException( const decaf::lang::Pointer<BrokerError>& exception ) {
+void ConnectionError::setException(const decaf::lang::Pointer<BrokerError>& exception) {
     this->exception = exception;
 }
 
@@ -171,12 +171,11 @@ decaf::lang::Pointer<ConnectionId>& Conn
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionError::setConnectionId( const decaf::lang::Pointer<ConnectionId>& connectionId ) {
+void ConnectionError::setConnectionId(const decaf::lang::Pointer<ConnectionId>& connectionId) {
     this->connectionId = connectionId;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Pointer<commands::Command> ConnectionError::visit( activemq::state::CommandVisitor* visitor ) {
-
-    return visitor->processConnectionError( this );
+decaf::lang::Pointer<commands::Command> ConnectionError::visit(activemq::state::CommandVisitor* visitor) {
+    return visitor->processConnectionError(this);
 }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionError.h Sun Mar 24 21:30:52 2013
@@ -31,8 +31,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     using decaf::lang::Pointer;
 
@@ -57,8 +57,8 @@ namespace commands{
 
     private:
 
-        ConnectionError( const ConnectionError& );
-        ConnectionError& operator= ( const ConnectionError& );
+        ConnectionError(const ConnectionError&);
+        ConnectionError& operator= (const ConnectionError&);
 
     public:
 
@@ -70,11 +70,11 @@ namespace commands{
 
         virtual ConnectionError* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const Pointer<BrokerError>& getException() const;
         virtual Pointer<BrokerError>& getException();
@@ -91,7 +91,7 @@ namespace commands{
             return true;
         }
 
-        virtual Pointer<Command> visit( activemq::state::CommandVisitor* visitor );
+        virtual Pointer<Command> visit(activemq::state::CommandVisitor* visitor);
 
     };
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.cpp Sun Mar 24 21:30:52 2013
@@ -21,8 +21,9 @@
 #include <activemq/commands/SessionId.h>
 #include <activemq/exceptions/ActiveMQException.h>
 #include <activemq/state/CommandVisitor.h>
-#include <apr_strings.h>
+#include <decaf/internal/util/StringUtils.h>
 #include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/util/HashCode.h>
 
 using namespace std;
 using namespace activemq;
@@ -30,6 +31,7 @@ using namespace activemq::exceptions;
 using namespace activemq::commands;
 using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
+using namespace decaf::internal::util;
 
 /*
  *
@@ -42,34 +44,34 @@ using namespace decaf::lang::exceptions;
  */
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionId::ConnectionId() 
-    : BaseDataStructure(), value("") {
+ConnectionId::ConnectionId() :
+    BaseDataStructure(), value("") {
 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionId::ConnectionId( const ConnectionId& other )
-    : BaseDataStructure(), value("") {
+ConnectionId::ConnectionId(const ConnectionId& other) :
+    BaseDataStructure(), value("") {
 
-    this->copyDataStructure( &other );
+    this->copyDataStructure(&other);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionId::ConnectionId( const SessionId* sessionId )
+ConnectionId::ConnectionId(const SessionId* sessionId)
     : BaseDataStructure(), value("") {
 
     this->value = sessionId->getConnectionId();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionId::ConnectionId( const ProducerId* producerId )
+ConnectionId::ConnectionId(const ProducerId* producerId)
     : BaseDataStructure(), value("") {
 
     this->value = producerId->getConnectionId();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionId::ConnectionId( const ConsumerId* consumerId )
+ConnectionId::ConnectionId(const ConsumerId* consumerId)
     : BaseDataStructure(), value("") {
 
     this->value = consumerId->getConnectionId();
@@ -81,34 +83,34 @@ ConnectionId::~ConnectionId() {
 
 ////////////////////////////////////////////////////////////////////////////////
 ConnectionId* ConnectionId::cloneDataStructure() const {
-    std::auto_ptr<ConnectionId> connectionId( new ConnectionId() );
+    std::auto_ptr<ConnectionId> connectionId(new ConnectionId());
 
     // Copy the data from the base class or classes
-    connectionId->copyDataStructure( this );
+    connectionId->copyDataStructure(this);
 
     return connectionId.release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionId::copyDataStructure( const DataStructure* src ) {
+void ConnectionId::copyDataStructure(const DataStructure* src) {
 
     // Protect against invalid self assignment.
-    if( this == src ) {
+    if (this == src) {
         return;
     }
 
-    const ConnectionId* srcPtr = dynamic_cast<const ConnectionId*>( src );
+    const ConnectionId* srcPtr = dynamic_cast<const ConnectionId*>(src);
 
-    if( srcPtr == NULL || src == NULL ) {
+    if (srcPtr == NULL || src == NULL) {
         throw decaf::lang::exceptions::NullPointerException(
             __FILE__, __LINE__,
-            "ConnectionId::copyDataStructure - src is NULL or invalid" );
+            "ConnectionId::copyDataStructure - src is NULL or invalid");
     }
 
     // Copy the data of the base class or classes
-    BaseDataStructure::copyDataStructure( src );
+    BaseDataStructure::copyDataStructure(src);
 
-    this->setValue( srcPtr->getValue() );
+    this->setValue(srcPtr->getValue());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -123,22 +125,22 @@ std::string ConnectionId::toString() con
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConnectionId::equals( const DataStructure* value ) const {
+bool ConnectionId::equals(const DataStructure* value) const {
 
-    if( this == value ) {
+    if (this == value) {
         return true;
     }
 
-    const ConnectionId* valuePtr = dynamic_cast<const ConnectionId*>( value );
+    const ConnectionId* valuePtr = dynamic_cast<const ConnectionId*>(value);
 
-    if( valuePtr == NULL || value == NULL ) {
+    if (valuePtr == NULL || value == NULL) {
         return false;
     }
 
-    if( this->getValue() != valuePtr->getValue() ) {
+    if (this->getValue() != valuePtr->getValue()) {
         return false;
     }
-    if( !BaseDataStructure::equals( value ) ) {
+    if (!BaseDataStructure::equals(value)) {
         return false;
     }
     return true;
@@ -155,19 +157,19 @@ std::string& ConnectionId::getValue() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-void ConnectionId::setValue( const std::string& value ) {
+void ConnectionId::setValue(const std::string& value) {
     this->value = value;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-int ConnectionId::compareTo( const ConnectionId& value ) const {
+int ConnectionId::compareTo(const ConnectionId& value) const {
 
-    if( this == &value ) {
+    if (this == &value) {
         return 0;
     }
 
-    int valueComp = apr_strnatcasecmp( this->value.c_str(), value.value.c_str() );
-    if( valueComp != 0 ) {
+    int valueComp = StringUtils::compareIgnoreCase(this->value.c_str(), value.value.c_str());
+    if (valueComp != 0) {
         return valueComp;
     }
 
@@ -175,23 +177,28 @@ int ConnectionId::compareTo( const Conne
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConnectionId::equals( const ConnectionId& value ) const {
-    return this->equals( (const DataStructure*)&value );
+bool ConnectionId::equals(const ConnectionId& value) const {
+    return this->equals((const DataStructure*)&value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConnectionId::operator==( const ConnectionId& value ) const {
-    return this->compareTo( value ) == 0;
+bool ConnectionId::operator==(const ConnectionId& value) const {
+    return this->compareTo(value) == 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool ConnectionId::operator<( const ConnectionId& value ) const {
-    return this->compareTo( value ) < 0;
+bool ConnectionId::operator<(const ConnectionId& value) const {
+    return this->compareTo(value) < 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-ConnectionId& ConnectionId::operator= ( const ConnectionId& other ) {
-    this->copyDataStructure( &other );
+ConnectionId& ConnectionId::operator= (const ConnectionId& other) {
+    this->copyDataStructure(&other);
     return *this;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+int ConnectionId::getHashCode() const {
+    return decaf::util::HashCode<std::string>()(this->toString());
+}
+

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.h?rev=1460467&r1=1460466&r2=1460467&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ConnectionId.h Sun Mar 24 21:30:52 2013
@@ -30,8 +30,8 @@
 #include <string>
 #include <vector>
 
-namespace activemq{
-namespace commands{
+namespace activemq {
+namespace commands {
 
     class SessionId;
     class ProducerId;
@@ -63,13 +63,13 @@ namespace commands{
 
         ConnectionId();
 
-        ConnectionId( const ConnectionId& other );
+        ConnectionId(const ConnectionId& other);
 
-        ConnectionId( const SessionId* sessionId );
+        ConnectionId(const SessionId* sessionId);
 
-        ConnectionId( const ProducerId* producerId );
+        ConnectionId(const ProducerId* producerId);
 
-        ConnectionId( const ConsumerId* consumerId );
+        ConnectionId(const ConsumerId* consumerId);
 
         virtual ~ConnectionId();
 
@@ -77,25 +77,27 @@ namespace commands{
 
         virtual ConnectionId* cloneDataStructure() const;
 
-        virtual void copyDataStructure( const DataStructure* src );
+        virtual void copyDataStructure(const DataStructure* src);
 
         virtual std::string toString() const;
 
-        virtual bool equals( const DataStructure* value ) const;
+        virtual bool equals(const DataStructure* value) const;
 
         virtual const std::string& getValue() const;
         virtual std::string& getValue();
         virtual void setValue( const std::string& value );
 
-        virtual int compareTo( const ConnectionId& value ) const;
+        virtual int compareTo(const ConnectionId& value) const;
 
-        virtual bool equals( const ConnectionId& value ) const;
+        virtual bool equals(const ConnectionId& value) const;
 
-        virtual bool operator==( const ConnectionId& value ) const;
+        virtual bool operator==(const ConnectionId& value) const;
 
-        virtual bool operator<( const ConnectionId& value ) const;
+        virtual bool operator<(const ConnectionId& value) const;
 
-        ConnectionId& operator= ( const ConnectionId& other );
+        ConnectionId& operator= (const ConnectionId& other);
+
+        int getHashCode() const;
 
     };
 



Mime
View raw message