You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by nm...@apache.org on 2007/03/16 11:48:09 UTC
svn commit: r518934 - in /activemq/activemq-cpp/trunk/activemq-cpp/src:
main/activemq/connector/openwire/commands/ main/activemq/connector/stomp/
main/activemq/connector/stomp/commands/ main/cms/
test/activemq/connector/stomp/ test/activemq/connector/s...
Author: nmittler
Date: Fri Mar 16 03:48:07 2007
New Revision: 518934
URL: http://svn.apache.org/viewvc?view=rev&rev=518934
Log:
AMQCPP-77 - making method names in cms::Message consistent with JMS
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandWriterTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/marshal/MarshalerTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQMessageBase.h Fri Mar 16 03:48:07 2007
@@ -472,7 +472,7 @@
* Get the Correlation Id for this message
* @return string representation of the correlation Id
*/
- virtual std::string getCMSCorrelationId(void) const {
+ virtual std::string getCMSCorrelationID(void) const {
return this->getCorrelationId();
}
@@ -480,7 +480,7 @@
* Sets the Correlation Id used by this message
* @param correlationId - String representing the correlation id.
*/
- virtual void setCMSCorrelationId( const std::string& correlationId ) {
+ virtual void setCMSCorrelationID( const std::string& correlationId ) {
this->setCorrelationId( correlationId );
}
@@ -545,7 +545,7 @@
* Gets the CMS Message Id for this Message
* @return time value
*/
- virtual std::string getCMSMessageId(void) const {
+ virtual std::string getCMSMessageID(void) const {
return marshal::BaseDataStreamMarshaller::toString( this->getMessageId() );
}
@@ -553,7 +553,7 @@
* Sets the CMS Message Id for this message
* @param id - time value
*/
- virtual void setCMSMessageId( const std::string& id AMQCPP_UNUSED) {}
+ virtual void setCMSMessageID( const std::string& id AMQCPP_UNUSED) {}
/**
* Gets the Priority Value for this Message
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp Fri Mar 16 03:48:07 2007
@@ -503,7 +503,7 @@
{
AckCommand cmd;
- if( message->getCMSMessageId() == "" )
+ if( message->getCMSMessageID() == "" )
{
throw StompConnectorException(
__FILE__, __LINE__,
@@ -511,7 +511,7 @@
"Message has no Message Id, cannot ack.");
}
- cmd.setMessageId( message->getCMSMessageId() );
+ cmd.setMessageId( message->getCMSMessageID() );
/*if( session->getAckMode() == cms::Session::SESSION_TRANSACTED )
{
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h Fri Mar 16 03:48:07 2007
@@ -258,7 +258,7 @@
* Get the Correlation Id for this message
* @return string representation of the correlation Id
*/
- virtual std::string getCMSCorrelationId() const {
+ virtual std::string getCMSCorrelationID() const {
std::string correlationId = getPropertyValue(
CommandConstants::toString(
CommandConstants::HEADER_CORRELATIONID ), "null" );
@@ -272,7 +272,7 @@
* Sets the Correlation Id used by this message
* @param correlationId String representing the correlation id.
*/
- virtual void setCMSCorrelationId(const std::string& correlationId) {
+ virtual void setCMSCorrelationID(const std::string& correlationId) {
setPropertyValue(
CommandConstants::toString(
CommandConstants::HEADER_CORRELATIONID ) ,
@@ -374,7 +374,7 @@
* Gets the CMS Message Id for this Message
* @return time value
*/
- virtual std::string getCMSMessageId() const {
+ virtual std::string getCMSMessageID() const {
return getPropertyValue(
CommandConstants::toString(
CommandConstants::HEADER_MESSAGEID ), "" );
@@ -384,7 +384,7 @@
* Sets the CMS Message Id for this message
* @param id time value
*/
- virtual void setCMSMessageId( const std::string& id ) {
+ virtual void setCMSMessageID( const std::string& id ) {
setPropertyValue(
CommandConstants::toString(
CommandConstants::HEADER_MESSAGEID ),
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Message.h Fri Mar 16 03:48:07 2007
@@ -224,13 +224,13 @@
* Get the Correlation Id for this message
* @return string representation of the correlation Id
*/
- virtual std::string getCMSCorrelationId(void) const = 0;
+ virtual std::string getCMSCorrelationID() const = 0;
/**
* Sets the Correlation Id used by this message
* @param correlationId - String representing the correlation id.
*/
- virtual void setCMSCorrelationId( const std::string& correlationId ) = 0;
+ virtual void setCMSCorrelationID( const std::string& correlationId ) = 0;
/**
* Gets the DeliveryMode for this message
@@ -272,13 +272,13 @@
* Gets the CMS Message Id for this Message
* @return time value
*/
- virtual std::string getCMSMessageId() const = 0;
+ virtual std::string getCMSMessageID() const = 0;
/**
* Sets the CMS Message Id for this message
* @param id - time value
*/
- virtual void setCMSMessageId( const std::string& id ) = 0;
+ virtual void setCMSMessageID( const std::string& id ) = 0;
/**
* Gets the Priority Value for this Message
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandWriterTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandWriterTest.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandWriterTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandWriterTest.h Fri Mar 16 03:48:07 2007
@@ -123,7 +123,7 @@
// Sync to expected output
StompTopic topic1("a");
textCommand.setCMSDestination( &topic1 );
- textCommand.setCMSMessageId( "123" );
+ textCommand.setCMSMessageID( "123" );
textCommand.getProperties().setProperty(
"sampleProperty", "testvalue" );
textCommand.setText( "testMessage" );
@@ -131,7 +131,7 @@
// Sync to expected output
StompTopic topic2("a");
bytesCommand.setCMSDestination( &topic2 );
- bytesCommand.setCMSMessageId( "123" );
+ bytesCommand.setCMSMessageID( "123" );
bytesCommand.getProperties().setProperty(
"sampleProperty", "testvalue" );
bytesCommand.setBodyBytes(
@@ -173,9 +173,9 @@
StompTopic topic2("a");
bytesCommand.setCMSDestination( &topic2 );
- bytesCommand.setCMSMessageId( "123" );
+ bytesCommand.setCMSMessageID( "123" );
textCommand.setCMSDestination( &topic2 );
- textCommand.setCMSMessageId( "123" );
+ textCommand.setCMSMessageID( "123" );
textCommand.setText("This is a TextMessage");
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h Fri Mar 16 03:48:07 2007
@@ -113,9 +113,9 @@
CPPUNIT_ASSERT(
std::string( cmd.getProperties().getProperty( "test" ) ) == "value" );
- CPPUNIT_ASSERT( cmd.getCMSCorrelationId() == "" );
- cmd.setCMSCorrelationId( "ID:1234567" );
- CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationId() ) ==
+ CPPUNIT_ASSERT( cmd.getCMSCorrelationID() == "" );
+ cmd.setCMSCorrelationID( "ID:1234567" );
+ CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationID() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
cms::DeliveryMode::PERSISTENT );
@@ -128,9 +128,9 @@
CPPUNIT_ASSERT( cmd.getCMSExpiration() == 0 );
cmd.setCMSExpiration( 123 );
CPPUNIT_ASSERT( cmd.getCMSExpiration() == 123 );
- CPPUNIT_ASSERT( cmd.getCMSMessageId() == "" );
- cmd.setCMSMessageId( "ID:1234567" );
- CPPUNIT_ASSERT( std::string( cmd.getCMSMessageId() ) ==
+ CPPUNIT_ASSERT( cmd.getCMSMessageID() == "" );
+ cmd.setCMSMessageID( "ID:1234567" );
+ CPPUNIT_ASSERT( std::string( cmd.getCMSMessageID() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSPriority() == 0 );
cmd.setCMSPriority( 5 );
@@ -168,10 +168,10 @@
CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == cmd2->getCMSTimeStamp() );
CPPUNIT_ASSERT( cmd.getCMSExpiration() == cmd2->getCMSExpiration() );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() == cmd2->getCMSDeliveryMode() );
- CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationId()) == cmd2->getCMSCorrelationId() );
+ CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationID()) == cmd2->getCMSCorrelationID() );
CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() == cmd2->getCMSReplyTo()->toProviderString() );
CPPUNIT_ASSERT( std::string(cmd.getCMSMessageType()) == cmd2->getCMSMessageType() );
- CPPUNIT_ASSERT( std::string(cmd.getCMSMessageId()) == cmd2->getCMSMessageId() );
+ CPPUNIT_ASSERT( std::string(cmd.getCMSMessageID()) == cmd2->getCMSMessageID() );
core::ActiveMQMessage* message =
dynamic_cast< core::ActiveMQMessage* >( cmd2 );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h Fri Mar 16 03:48:07 2007
@@ -115,9 +115,9 @@
std::string( cmd.getProperties().getProperty( "test" ) ) ==
"value" );
- CPPUNIT_ASSERT( cmd.getCMSCorrelationId() == "" );
- cmd.setCMSCorrelationId( "ID:1234567" );
- CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationId() ) ==
+ CPPUNIT_ASSERT( cmd.getCMSCorrelationID() == "" );
+ cmd.setCMSCorrelationID( "ID:1234567" );
+ CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationID() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
cms::DeliveryMode::PERSISTENT );
@@ -129,9 +129,9 @@
CPPUNIT_ASSERT( cmd.getCMSExpiration() == 0 );
cmd.setCMSExpiration( 123 );
CPPUNIT_ASSERT( cmd.getCMSExpiration() == 123 );
- CPPUNIT_ASSERT( cmd.getCMSMessageId() == "" );
- cmd.setCMSMessageId( "ID:1234567" );
- CPPUNIT_ASSERT( std::string( cmd.getCMSMessageId() ) ==
+ CPPUNIT_ASSERT( cmd.getCMSMessageID() == "" );
+ cmd.setCMSMessageID( "ID:1234567" );
+ CPPUNIT_ASSERT( std::string( cmd.getCMSMessageID() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSPriority() == 0 );
cmd.setCMSPriority( 5 );
@@ -160,10 +160,10 @@
CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == cmd2->getCMSTimeStamp() );
CPPUNIT_ASSERT( cmd.getCMSExpiration() == cmd2->getCMSExpiration() );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() == cmd2->getCMSDeliveryMode() );
- CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationId()) == cmd2->getCMSCorrelationId() );
+ CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationID()) == cmd2->getCMSCorrelationID() );
CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() == cmd2->getCMSReplyTo()->toProviderString() );
CPPUNIT_ASSERT( std::string(cmd.getCMSMessageType()) == cmd2->getCMSMessageType() );
- CPPUNIT_ASSERT( std::string(cmd.getCMSMessageId()) == cmd2->getCMSMessageId() );
+ CPPUNIT_ASSERT( std::string(cmd.getCMSMessageID()) == cmd2->getCMSMessageID() );
core::ActiveMQMessage* message =
dynamic_cast< core::ActiveMQMessage* >( cmd2 );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h Fri Mar 16 03:48:07 2007
@@ -110,9 +110,9 @@
std::string( cmd.getProperties().getProperty( "test" ) ) ==
"value" );
- CPPUNIT_ASSERT( cmd.getCMSCorrelationId() == "" );
- cmd.setCMSCorrelationId( "ID:1234567" );
- CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationId() ) ==
+ CPPUNIT_ASSERT( cmd.getCMSCorrelationID() == "" );
+ cmd.setCMSCorrelationID( "ID:1234567" );
+ CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationID() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
cms::DeliveryMode::PERSISTENT );
@@ -124,9 +124,9 @@
CPPUNIT_ASSERT( cmd.getCMSExpiration() == 0 );
cmd.setCMSExpiration( 123 );
CPPUNIT_ASSERT( cmd.getCMSExpiration() == 123 );
- CPPUNIT_ASSERT( cmd.getCMSMessageId() == "" );
- cmd.setCMSMessageId( "ID:1234567" );
- CPPUNIT_ASSERT( std::string( cmd.getCMSMessageId() ) ==
+ CPPUNIT_ASSERT( cmd.getCMSMessageID() == "" );
+ cmd.setCMSMessageID( "ID:1234567" );
+ CPPUNIT_ASSERT( std::string( cmd.getCMSMessageID() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSPriority() == 0 );
cmd.setCMSPriority( 5 );
@@ -159,10 +159,10 @@
CPPUNIT_ASSERT( cmd.getCMSTimeStamp() == cmd2->getCMSTimeStamp() );
CPPUNIT_ASSERT( cmd.getCMSExpiration() == cmd2->getCMSExpiration() );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() == cmd2->getCMSDeliveryMode() );
- CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationId()) == cmd2->getCMSCorrelationId() );
+ CPPUNIT_ASSERT( std::string(cmd.getCMSCorrelationID()) == cmd2->getCMSCorrelationID() );
CPPUNIT_ASSERT( cmd.getCMSReplyTo()->toProviderString() == cmd2->getCMSReplyTo()->toProviderString() );
CPPUNIT_ASSERT( std::string(cmd.getCMSMessageType()) == cmd2->getCMSMessageType() );
- CPPUNIT_ASSERT( std::string(cmd.getCMSMessageId()) == cmd2->getCMSMessageId() );
+ CPPUNIT_ASSERT( std::string(cmd.getCMSMessageID()) == cmd2->getCMSMessageID() );
core::ActiveMQMessage* message =
dynamic_cast< core::ActiveMQMessage* >( cmd2 );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/marshal/MarshalerTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/marshal/MarshalerTest.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/marshal/MarshalerTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/marshal/MarshalerTest.h Fri Mar 16 03:48:07 2007
@@ -59,14 +59,14 @@
// Sync to expected output
textCommand.setCMSDestination( &myTopic );
- textCommand.setCMSMessageId( "123" );
+ textCommand.setCMSMessageID( "123" );
textCommand.getProperties().setProperty(
"sampleProperty", "testvalue" );
textCommand.setText( "testMessage" );
// Sync to expected output
bytesCommand.setCMSDestination( &myTopic );
- bytesCommand.setCMSMessageId( "123" );
+ bytesCommand.setCMSMessageID( "123" );
bytesCommand.getProperties().setProperty(
"sampleProperty", "testvalue" );
bytesCommand.setBodyBytes(
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h?view=diff&rev=518934&r1=518933&r2=518934
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h Fri Mar 16 03:48:07 2007
@@ -209,7 +209,7 @@
// Init Message
msg->setText( message.c_str() );
msg->setCMSDestination( &destination );
- msg->setCMSMessageId( "Id: 123456" );
+ msg->setCMSMessageID( "Id: 123456" );
long long expiration = 0LL;