From commits-return-9517-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Mon Nov 10 22:15:10 2008 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 78413 invoked from network); 10 Nov 2008 22:15:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Nov 2008 22:15:10 -0000 Received: (qmail 97429 invoked by uid 500); 10 Nov 2008 22:15:17 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 97408 invoked by uid 500); 10 Nov 2008 22:15:17 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 97399 invoked by uid 99); 10 Nov 2008 22:15:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Nov 2008 14:15:17 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Nov 2008 22:14:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7A500238898F; Mon, 10 Nov 2008 14:14:49 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r712854 - /activemq/activemq-cpp/trunk/src/main/activemq/cmsutil/CmsTemplate.h Date: Mon, 10 Nov 2008 22:14:49 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081110221449.7A500238898F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Mon Nov 10 14:14:49 2008 New Revision: 712854 URL: http://svn.apache.org/viewvc?rev=712854&view=rev Log: Cleanup Modified: activemq/activemq-cpp/trunk/src/main/activemq/cmsutil/CmsTemplate.h Modified: activemq/activemq-cpp/trunk/src/main/activemq/cmsutil/CmsTemplate.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/cmsutil/CmsTemplate.h?rev=712854&r1=712853&r2=712854&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/src/main/activemq/cmsutil/CmsTemplate.h (original) +++ activemq/activemq-cpp/trunk/src/main/activemq/cmsutil/CmsTemplate.h Mon Nov 10 14:14:49 2008 @@ -42,7 +42,7 @@ * CMS resources internally. *

* Before using CmsTemplate the user must first set - * the destination (either by name or by setting the destiation + * the destination (either by name or by setting the destination * object directly) and then call init to initialize * the object for use. *

@@ -98,8 +98,10 @@ public: - ProducerExecutor(ProducerCallback* action, - CmsTemplate* parent, cms::Destination* destination){ + ProducerExecutor( ProducerCallback* action, + CmsTemplate* parent, + cms::Destination* destination ){ + this->action = action; this->parent = parent; this->destination = destination; @@ -107,10 +109,10 @@ virtual ~ProducerExecutor() {} - virtual void doInCms(cms::Session* session) throw (cms::CMSException); + virtual void doInCms( cms::Session* session ) throw ( cms::CMSException ); - virtual cms::Destination* getDestination(cms::Session* session AMQCPP_UNUSED) - throw (cms::CMSException) { + virtual cms::Destination* getDestination( cms::Session* session AMQCPP_UNUSED ) + throw ( cms::CMSException ) { return destination; } }; @@ -127,18 +129,19 @@ public: - ResolveProducerExecutor(ProducerCallback* action, - CmsTemplate* parent, const std::string& destinationName) + ResolveProducerExecutor( ProducerCallback* action, + CmsTemplate* parent, + const std::string& destinationName ) : - ProducerExecutor(action, parent, NULL) { + ProducerExecutor( action, parent, NULL ) { this->destinationName = destinationName; } virtual ~ResolveProducerExecutor() {} - virtual cms::Destination* getDestination(cms::Session* session) - throw (cms::CMSException) ; + virtual cms::Destination* getDestination( cms::Session* session ) + throw ( cms::CMSException ); }; /** @@ -155,16 +158,16 @@ public: SendExecutor( MessageCreator* messageCreator, - CmsTemplate* parent) { + CmsTemplate* parent ) { this->messageCreator = messageCreator; this->parent = parent; } virtual ~SendExecutor() {} - virtual void doInCms(cms::Session* session, - cms::MessageProducer* producer) throw (cms::CMSException) { - parent->doSend(session, producer, messageCreator); + virtual void doInCms( cms::Session* session, + cms::MessageProducer* producer ) throw ( cms::CMSException ) { + parent->doSend( session, producer, messageCreator ); } }; @@ -183,10 +186,11 @@ CmsTemplate* parent; public: + ReceiveExecutor( CmsTemplate* parent, - cms::Destination* destination, - const std::string& selector, - bool noLocal) { + cms::Destination* destination, + const std::string& selector, + bool noLocal ) { this->parent = parent; this->destination = destination; this->selector = selector; @@ -196,11 +200,11 @@ virtual ~ReceiveExecutor() {} - virtual void doInCms(cms::Session* session) + virtual void doInCms( cms::Session* session ) throw (cms::CMSException); - virtual cms::Destination* getDestination(cms::Session* session AMQCPP_UNUSED) - throw (cms::CMSException) { + virtual cms::Destination* getDestination( cms::Session* session AMQCPP_UNUSED ) + throw ( cms::CMSException ) { return destination; } @@ -221,10 +225,10 @@ public: - ResolveReceiveExecutor(CmsTemplate* parent, - const std::string& selector, - bool noLocal, - const std::string& destinationName) + ResolveReceiveExecutor( CmsTemplate* parent, + const std::string& selector, + bool noLocal, + const std::string& destinationName ) : ReceiveExecutor( parent, NULL, selector, noLocal) { @@ -233,8 +237,8 @@ virtual ~ResolveReceiveExecutor() {} - virtual cms::Destination* getDestination(cms::Session* session) - throw (cms::CMSException); + virtual cms::Destination* getDestination( cms::Session* session ) + throw ( cms::CMSException ); }; private: @@ -283,7 +287,7 @@ * @param defaultDestination * the default destination */ - virtual void setDefaultDestination(cms::Destination* defaultDestination) { + virtual void setDefaultDestination( cms::Destination* defaultDestination ) { this->defaultDestination = defaultDestination; } @@ -312,7 +316,7 @@ * @param defaultDestinationName * the name of the destination for send/receive to by default. */ - virtual void setDefaultDestinationName(const std::string& defaultDestinationName) { + virtual void setDefaultDestinationName( const std::string& defaultDestinationName ) { if( defaultDestinationName != this->defaultDestinationName ) { this->defaultDestination = NULL; this->defaultDestinationName = defaultDestinationName; @@ -340,11 +344,11 @@ virtual void setPubSubDomain( bool pubSubDomain ) { if( pubSubDomain != isPubSubDomain() ) { this->defaultDestination = NULL; - CmsDestinationAccessor::setPubSubDomain(pubSubDomain); + CmsDestinationAccessor::setPubSubDomain( pubSubDomain ); } } - virtual void setMessageIdEnabled(bool messageIdEnabled) { + virtual void setMessageIdEnabled( bool messageIdEnabled ) { this->messageIdEnabled = messageIdEnabled; } @@ -352,7 +356,7 @@ return this->messageIdEnabled; } - virtual void setMessageTimestampEnabled(bool messageTimestampEnabled) { + virtual void setMessageTimestampEnabled( bool messageTimestampEnabled ) { this->messageTimestampEnabled = messageTimestampEnabled; } @@ -360,7 +364,7 @@ return this->messageTimestampEnabled; } - virtual void setNoLocal(bool noLocal) { + virtual void setNoLocal( bool noLocal ) { this->noLocal = noLocal; } @@ -368,7 +372,7 @@ return this->noLocal; } - virtual void setReceiveTimeout(long long receiveTimeout) { + virtual void setReceiveTimeout( long long receiveTimeout ) { this->receiveTimeout = receiveTimeout; } @@ -384,7 +388,7 @@ * @see #setPriority * @see #setTimeToLive */ - virtual void setExplicitQosEnabled(bool explicitQosEnabled) { + virtual void setExplicitQosEnabled( bool explicitQosEnabled ) { this->explicitQosEnabled = explicitQosEnabled; } @@ -412,7 +416,7 @@ * * @see #setDeliveryMode(int) */ - virtual void setDeliveryPersistent(bool deliveryPersistent) { + virtual void setDeliveryPersistent( bool deliveryPersistent ) { this->deliveryMode = (deliveryPersistent ? 0 : 1 ); } @@ -424,7 +428,7 @@ * @param deliveryMode the delivery mode to use * @see #isExplicitQosEnabled */ - virtual void setDeliveryMode(int deliveryMode) { + virtual void setDeliveryMode( int deliveryMode ) { this->deliveryMode = deliveryMode; } @@ -442,7 +446,7 @@ * * @see #isExplicitQosEnabled */ - virtual void setPriority(int priority) { + virtual void setPriority( int priority ) { this->priority = priority; } @@ -461,7 +465,7 @@ * * @see #isExplicitQosEnabled */ - virtual void setTimeToLive(long long timeToLive) { + virtual void setTimeToLive( long long timeToLive ) { this->timeToLive = timeToLive; } @@ -478,7 +482,7 @@ * the action to perform within a CMS Session * @throws cms::CMSException thrown if an error occurs. */ - virtual void execute(SessionCallback* action) throw (cms::CMSException); + virtual void execute( SessionCallback* action ) throw ( cms::CMSException ); /** * Executes the given action and provides it with a CMS Session and @@ -488,7 +492,7 @@ * the action to perform * @throws cms::CMSException thrown if an error occurs. */ - virtual void execute(ProducerCallback* action) throw (cms::CMSException); + virtual void execute( ProducerCallback* action ) throw ( cms::CMSException ); /** * Executes the given action and provides it with a CMS Session and @@ -500,8 +504,8 @@ * the action to perform * @throws cms::CMSException thrown if an error occurs. */ - virtual void execute(cms::Destination* dest, - ProducerCallback* action) throw (cms::CMSException); + virtual void execute( cms::Destination* dest, ProducerCallback* action ) + throw (cms::CMSException); /** * Executes the given action and provides it with a CMS Session and @@ -514,8 +518,9 @@ * the action to perform * @throws cms::CMSException thrown if an error occurs. */ - virtual void execute(const std::string& destinationName, - ProducerCallback* action) throw (cms::CMSException); + virtual void execute( const std::string& destinationName, + ProducerCallback* action ) + throw ( cms::CMSException ); /** * Convenience method for sending a message to the default destination. @@ -525,7 +530,7 @@ * @throws cms::CMSException thrown if an error occurs. */ virtual void send(MessageCreator* messageCreator) - throw (cms::CMSException); + throw ( cms::CMSException ); /** * Convenience method for sending a message to the specified destination. @@ -536,9 +541,9 @@ * Responsible for creating the message to be sent * @throws cms::CMSException thrown if an error occurs. */ - virtual void send(cms::Destination* dest, - MessageCreator* messageCreator) - throw (cms::CMSException); + virtual void send( cms::Destination* dest, + MessageCreator* messageCreator ) + throw ( cms::CMSException ); /** * Convenience method for sending a message to the specified destination. @@ -549,9 +554,9 @@ * Responsible for creating the message to be sent * @throws cms::CMSException thrown if an error occurs. */ - virtual void send(const std::string& destinationName, - MessageCreator* messageCreator) - throw (cms::CMSException); + virtual void send( const std::string& destinationName, + MessageCreator* messageCreator ) + throw ( cms::CMSException ); /** * Performs a synchronous read from the default destination. @@ -559,7 +564,7 @@ * @throws cms::CMSException thrown if an error occurs */ virtual cms::Message* receive() - throw (cms::CMSException); + throw ( cms::CMSException ); /** * Performs a synchronous read from the specified destination. @@ -568,8 +573,8 @@ * @return the message * @throws cms::CMSException thrown if an error occurs */ - virtual cms::Message* receive(cms::Destination* destination ) - throw (cms::CMSException); + virtual cms::Message* receive( cms::Destination* destination ) + throw ( cms::CMSException ); /** * Performs a synchronous read from the specified destination. @@ -579,8 +584,8 @@ * @return the message * @throws cms::CMSException thrown if an error occurs */ - virtual cms::Message* receive(const std::string& destinationName ) - throw (cms::CMSException); + virtual cms::Message* receive( const std::string& destinationName ) + throw ( cms::CMSException ); /** * Performs a synchronous read consuming only messages identified by the @@ -591,8 +596,8 @@ * @return the message * @throws cms::CMSException thrown if an error occurs */ - virtual cms::Message* receiveSelected(const std::string& selector ) - throw (cms::CMSException); + virtual cms::Message* receiveSelected( const std::string& selector ) + throw ( cms::CMSException ); /** * Performs a synchronous read from the specified destination, consuming @@ -606,8 +611,8 @@ * @throws cms::CMSException thrown if an error occurs */ virtual cms::Message* receiveSelected( cms::Destination* destination, - const std::string& selector ) - throw (cms::CMSException); + const std::string& selector ) + throw ( cms::CMSException ); /** * Performs a synchronous read from the specified destination, consuming @@ -622,8 +627,8 @@ * @throws cms::CMSException thrown if an error occurs */ virtual cms::Message* receiveSelected( const std::string& destinationName, - const std::string& selector ) - throw (cms::CMSException); + const std::string& selector ) + throw ( cms::CMSException ); protected: @@ -632,13 +637,13 @@ * before any other methds are called. */ void init() - throw (cms::CMSException, decaf::lang::exceptions::IllegalStateException); + throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException ); /** * Clears all internal resources. */ void destroy() - throw (cms::CMSException, decaf::lang::exceptions::IllegalStateException); + throw ( cms::CMSException, decaf::lang::exceptions::IllegalStateException ); private: @@ -664,14 +669,14 @@ * if the default destination is invalid. */ void checkDefaultDestination() - throw (decaf::lang::exceptions::IllegalStateException); + throw ( decaf::lang::exceptions::IllegalStateException ); /** * Gets the connection, creating it if it doesn't already exist. * @return the connection * @throws cms::CMSException if any of the CMS methods throw. */ - cms::Connection* getConnection() throw (cms::CMSException); + cms::Connection* getConnection() throw ( cms::CMSException ); /** * Creates a session initialized with the proper values. @@ -679,7 +684,7 @@ * @return the session * @throws cms::CMSException if any of the CMS methods throw. */ - PooledSession* takeSession() throw (cms::CMSException); + PooledSession* takeSession() throw ( cms::CMSException ); /** * Closes, but does not destroy the pooled session resource. @@ -687,7 +692,7 @@ * a pooled session resource * @throws cms::CMSException thrown if the CMS methods throw. */ - void returnSession( PooledSession*& session ) throw (cms::CMSException); + void returnSession( PooledSession*& session ) throw ( cms::CMSException ); /** * Allocates a producer initialized with the proper values. @@ -700,8 +705,8 @@ * @return the producer * @throws cms::CMSException thrown by the CMS API */ - cms::MessageProducer* createProducer(cms::Session* session, - cms::Destination* dest) throw (cms::CMSException); + cms::MessageProducer* createProducer( cms::Session* session, + cms::Destination* dest ) throw ( cms::CMSException ); /** * Closes and destroys a producer resource @@ -722,10 +727,10 @@ * @return the consumer * @throws cms::CMSException thrown by the CMS API */ - cms::MessageConsumer* createConsumer(cms::Session* session, - cms::Destination* dest, - const std::string& selector, - bool noLocal ) throw (cms::CMSException); + cms::MessageConsumer* createConsumer( cms::Session* session, + cms::Destination* dest, + const std::string& selector, + bool noLocal ) throw ( cms::CMSException ); /** * Closes and destroys a consumer resource @@ -752,9 +757,9 @@ * creates the message to be sent * @throws cms::CMSException thrown if the CMS API throws. */ - void doSend(cms::Session* session, - cms::MessageProducer* producer, - MessageCreator* messageCreator) throw (cms::CMSException); + void doSend( cms::Session* session, + cms::MessageProducer* producer, + MessageCreator* messageCreator ) throw ( cms::CMSException ); /** * Receives a message from a destination. @@ -763,8 +768,8 @@ * @return the message that was read * @throws cms::CMSException thrown if the CMS API throws. */ - cms::Message* doReceive(cms::MessageConsumer* consumer ) - throw (cms::CMSException); + cms::Message* doReceive( cms::MessageConsumer* consumer ) + throw ( cms::CMSException ); /** * Resolves the default destination and returns it. @@ -773,8 +778,9 @@ * @return the default destination * @throws cms::CMSException if an error occurs */ - cms::Destination* resolveDefaultDestination(cms::Session* session) - throw (cms::CMSException); + cms::Destination* resolveDefaultDestination( cms::Session* session ) + throw ( cms::CMSException ); + }; }}