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/01/26 22:17:22 UTC
svn commit: r500350 - in
/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src:
main/activemq/connector/stomp/commands/ main/activemq/core/ main/cms/
test-integration/integration/expiration/
test/activemq/connector/stomp/commands/
Author: nmittler
Date: Fri Jan 26 13:17:21 2007
New Revision: 500350
URL: http://svn.apache.org/viewvc?view=rev&rev=500350
Log:
[AMQCPP-57] - changing PERSISTANT to PERSISTENT
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.cpp
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/DeliveryMode.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.cpp?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.cpp Fri Jan 26 13:17:21 2007
@@ -61,7 +61,7 @@
stompHeaders[HEADER_REQUESTID] = "request-id";
stompHeaders[HEADER_RESPONSEID] = "response-id";
stompHeaders[HEADER_EXPIRES] = "expires";
- stompHeaders[HEADER_PERSISTANT] = "persistent";
+ stompHeaders[HEADER_PERSISTENT] = "persistent";
stompHeaders[HEADER_JMSPRIORITY] = "priority";
stompHeaders[HEADER_CONSUMERPRIORITY] = "activemq.priority";
stompHeaders[HEADER_REPLYTO] = "reply-to";
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.h?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.h Fri Jan 26 13:17:21 2007
@@ -65,7 +65,7 @@
HEADER_REQUESTID,
HEADER_RESPONSEID,
HEADER_EXPIRES,
- HEADER_PERSISTANT,
+ HEADER_PERSISTENT,
HEADER_REPLYTO,
HEADER_TYPE,
HEADER_AMQMSGTYPE,
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h Fri Jan 26 13:17:21 2007
@@ -297,17 +297,17 @@
virtual int getCMSDeliveryMode() const {
if(!getFrame().getProperties().hasProperty(
CommandConstants::toString(
- CommandConstants::HEADER_PERSISTANT ) ) ) {
- return cms::DeliveryMode::PERSISTANT;
+ CommandConstants::HEADER_PERSISTENT ) ) ) {
+ return cms::DeliveryMode::PERSISTENT;
}
if( util::Boolean::parseBoolean( getPropertyValue(
CommandConstants::toString(
- CommandConstants::HEADER_PERSISTANT ) ) ) == true ) {
- return (int)cms::DeliveryMode::PERSISTANT;
+ CommandConstants::HEADER_PERSISTENT ) ) ) == true ) {
+ return (int)cms::DeliveryMode::PERSISTENT;
}
- return cms::DeliveryMode::NON_PERSISTANT;
+ return cms::DeliveryMode::NON_PERSISTENT;
}
/**
@@ -317,13 +317,13 @@
virtual void setCMSDeliveryMode( int mode ) {
std::string persistant = "true";
- if( mode == (int)cms::DeliveryMode::NON_PERSISTANT ) {
+ if( mode == (int)cms::DeliveryMode::NON_PERSISTENT ) {
persistant = "false";
}
setPropertyValue(
CommandConstants::toString(
- CommandConstants::HEADER_PERSISTANT ) ,
+ CommandConstants::HEADER_PERSISTENT ) ,
persistant );
}
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp Fri Jan 26 13:17:21 2007
@@ -45,7 +45,7 @@
this->closed = false;
// Default the Delivery options
- this->defaultDeliveryMode = cms::DeliveryMode::PERSISTANT;
+ this->defaultDeliveryMode = cms::DeliveryMode::PERSISTENT;
this->disableMsgId = false;
this->disableTimestamps = false;
this->defaultPriority = 4;
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/DeliveryMode.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/DeliveryMode.h?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/DeliveryMode.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/DeliveryMode.h Fri Jan 26 13:17:21 2007
@@ -34,8 +34,8 @@
/**
* Enumeration values for Message Delivery Mode
*/
- static const int PERSISTANT = 0;
- static const int NON_PERSISTANT = 1;
+ static const int PERSISTENT = 0;
+ static const int NON_PERSISTENT = 1;
};
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/expiration/ExpirationTest.cpp Fri Jan 26 13:17:21 2007
@@ -134,7 +134,7 @@
destination = session->createTopic( "expirationTopic" );
producer = session->createProducer( destination );
- producer->setDeliveryMode( DeliveryMode::PERSISTANT );
+ producer->setDeliveryMode( DeliveryMode::PERSISTENT );
producer->setDisableMessageTimeStamp( disableTimeStamps );
//unsigned long ttt=getcurt();
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h Fri Jan 26 13:17:21 2007
@@ -118,10 +118,10 @@
CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationId() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
- cms::DeliveryMode::PERSISTANT );
- cmd.setCMSDeliveryMode( cms::DeliveryMode::NON_PERSISTANT );
+ cms::DeliveryMode::PERSISTENT );
+ cmd.setCMSDeliveryMode( cms::DeliveryMode::NON_PERSISTENT );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
- cms::DeliveryMode::NON_PERSISTANT );
+ cms::DeliveryMode::NON_PERSISTENT );
cmd.setCMSDestination( &topic );
CPPUNIT_ASSERT( cmd.getCMSDestination()->toString() ==
"testTopic" );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h Fri Jan 26 13:17:21 2007
@@ -120,10 +120,10 @@
CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationId() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
- cms::DeliveryMode::PERSISTANT );
- cmd.setCMSDeliveryMode( cms::DeliveryMode::NON_PERSISTANT );
+ cms::DeliveryMode::PERSISTENT );
+ cmd.setCMSDeliveryMode( cms::DeliveryMode::NON_PERSISTENT );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
- cms::DeliveryMode::NON_PERSISTANT );
+ cms::DeliveryMode::NON_PERSISTENT );
CPPUNIT_ASSERT( cmd.getCMSDestination()->toString() ==
"testTopic" );
CPPUNIT_ASSERT( cmd.getCMSExpiration() == 0 );
Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h?view=diff&rev=500350&r1=500349&r2=500350
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h Fri Jan 26 13:17:21 2007
@@ -115,10 +115,10 @@
CPPUNIT_ASSERT( std::string( cmd.getCMSCorrelationId() ) ==
"ID:1234567" );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
- cms::DeliveryMode::PERSISTANT );
- cmd.setCMSDeliveryMode( cms::DeliveryMode::NON_PERSISTANT );
+ cms::DeliveryMode::PERSISTENT );
+ cmd.setCMSDeliveryMode( cms::DeliveryMode::NON_PERSISTENT );
CPPUNIT_ASSERT( cmd.getCMSDeliveryMode() ==
- cms::DeliveryMode::NON_PERSISTANT );
+ cms::DeliveryMode::NON_PERSISTENT );
CPPUNIT_ASSERT( cmd.getCMSDestination()->toString() ==
"testTopic" );
CPPUNIT_ASSERT( cmd.getCMSExpiration() == 0 );