activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nmitt...@apache.org
Subject svn commit: r427774 [2/3] - in /incubator/activemq/trunk/activemq-cpp/src/main: activemq/concurrent/ activemq/connector/ activemq/connector/stomp/ activemq/connector/stomp/commands/ activemq/connector/stomp/marshal/ activemq/core/ activemq/io/ activemq...
Date Tue, 01 Aug 2006 22:30:26 GMT
Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompCommand.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompCommand.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompCommand.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompCommand.h Tue Aug  1 15:30:22 2006
@@ -34,14 +34,14 @@
         /**
          * Inheritors are required to override this method to init the
          * frame with data appropriate for the command type.
-         * @param Frame to init
+         * @param frame Frame to init
          */
         virtual void initialize( StompFrame& frame ) = 0;
 
         /**
          * Inheritors are required to override this method to validate 
          * the passed stomp frame before it is marshalled or unmarshaled
-         * @param Frame to validate
+         * @param frame Frame to validate
          * @returns true if frame is valid
          */
         virtual bool validate( const StompFrame& frame ) const = 0;
@@ -52,7 +52,7 @@
 
         /**
          * Sets the Command Id of this Message
-         * @param Command Id
+         * @param id Command Id
          */
         virtual void setCommandId( const unsigned int id ) = 0;
 
@@ -64,7 +64,7 @@
         
         /**
          * Set if this Message requires a Response
-         * @param true if response is required
+         * @param required true if response is required
          */
         virtual void setResponseRequired( const bool required ) = 0;
         
@@ -82,7 +82,7 @@
         
         /**
          * Sets the Correlation Id if this Command
-         * @param Id
+         * @param corrId Id
          */
         virtual void setCorrelationId( const unsigned int corrId ) = 0;
         
@@ -94,7 +94,7 @@
       
         /**
          * Set the Transaction Id of this Command
-         * @param the Id of the Transaction
+         * @param id the Id of the Transaction
          */
         virtual void setTransactionId( const std::string& id ) = 0;
         

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h Tue Aug  1 15:30:22 2006
@@ -98,7 +98,7 @@
 
         /**
          * Sets the Correlation Id used by this message
-         * @param String representing the correlation id.
+         * @param correlationId String representing the correlation id.
          */
         virtual void setCMSCorrelationId(const std::string& correlationId) {
             setPropertyValue( 
@@ -110,6 +110,7 @@
         /**
          * Acknowledges all consumed messages of the session 
          * of this consumed message.
+         * @throws CMSException
          */
         virtual void acknowledge(void) const throw( cms::CMSException ) {
             if(ackHandler != NULL) ackHandler->acknowledgeMessage( this );
@@ -133,7 +134,7 @@
 
         /**
          * Sets the DeliveryMode for this message
-         * @param DeliveryMode enumerated value.
+         * @param mode DeliveryMode enumerated value.
          */
         virtual void setCMSDeliveryMode( int mode ) {
             setPropertyValue( 
@@ -152,7 +153,7 @@
               
         /**
          * Sets the Destination for this message
-         * @param Destination Object
+         * @param destination Destination Object
          */
         virtual void setCMSDestination( const cms::Destination* destination ) {
             if( destination != NULL )
@@ -177,7 +178,7 @@
       
         /**
          * Sets the Expiration Time for this message
-         * @param time value
+         * @param expireTime time value
          */
         virtual void setCMSExpiration( long expireTime ) {
             setPropertyValue( 
@@ -198,7 +199,7 @@
       
         /**
          * Sets the CMS Message Id for this message
-         * @param time value
+         * @param id time value
          */
         virtual void setCMSMessageId( const std::string& id ) {
             setPropertyValue( 
@@ -219,7 +220,7 @@
       
         /**
          * Sets the Priority Value for this message
-         * @param priority value
+         * @param priority priority value
          */
         virtual void setCMSPriority( int priority ) {
             setPropertyValue( 
@@ -241,7 +242,7 @@
       
         /**
          * Sets the Redelivered Flag for this message
-         * @param redelivered value
+         * @param redelivered redelivered value
          */
         virtual void setCMSRedelivered( bool redelivered ) {
             setPropertyValue( 
@@ -262,7 +263,7 @@
 
         /**
          * Sets the CMS Reply To Address for this message
-         * @param Reply To value
+         * @param id Reply To value
          */
         virtual void setCMSReplyTo( const std::string& id ) {
             setPropertyValue( 
@@ -283,7 +284,7 @@
       
         /**
          * Sets the Time Stamp for this message
-         * @param time stamp value
+         * @param timeStamp time stamp value
          */
         virtual void setCMSTimeStamp( long timeStamp ) {
             setPropertyValue( 
@@ -304,7 +305,7 @@
       
         /**
          * Sets the CMS Message Type for this message
-         * @param type value
+         * @param type type value
          */
         virtual void setCMSMessageType( const std::string& type ) {
             setPropertyValue( 
@@ -318,7 +319,7 @@
         /**
          * Sets the Acknowledgement Handler that this Message will use
          * when the Acknowledge method is called.
-         * @param ActiveMQAckHandler
+         * @param handler ActiveMQAckHandler
          */
         virtual void setAckHandler( core::ActiveMQAckHandler* handler ) {
             this->ackHandler = handler;
@@ -338,7 +339,7 @@
         /**
          * Sets the count of the number of times this message has been 
          * redelivered
-         * @param redelivery count
+         * @param count redelivery count
          */
         virtual void setRedeliveryCount( int count ) {
             setPropertyValue( 
@@ -352,7 +353,7 @@
         /**
          * Inheritors are required to override this method to init the
          * frame with data appropriate for the command type.
-         * @param Frame to init
+         * @param frame Frame to init
          */
         virtual void initialize( StompFrame& frame )
         {
@@ -363,7 +364,7 @@
         /**
          * Inheritors are required to override this method to validate 
          * the passed stomp frame before it is marshalled or unmarshaled
-         * @param Frame to validate
+         * @param frame Frame to validate
          * @returns true if frame is valid
          */
         virtual bool validate( const StompFrame& frame ) const

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/SubscribeCommand.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/SubscribeCommand.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/SubscribeCommand.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/SubscribeCommand.h Tue Aug  1 15:30:22 2006
@@ -58,18 +58,18 @@
       
         /**
          * Set the destination
-         * @param the destination Name String
+         * @param destination the destination Name String
          */
-        virtual void setDestination( const std::string& dest ){
+        virtual void setDestination( const std::string& destination ){
             setPropertyValue( 
                 CommandConstants::toString( 
                     CommandConstants::HEADER_DESTINATION ),
-                dest );
+                destination );
         }
 
         /** 
          * Set the Ack Mode of this Subscription
-         * @param mode setting.
+         * @param mode Ack mode setting.
          */
         virtual void setAckMode( const CommandConstants::AckMode mode ){
             setPropertyValue( 
@@ -92,7 +92,7 @@
         /**
          * Sets the Message Selector that is associated with this
          * subscribe request
-         * @param selector string
+         * @param selector Destination selector string
          */
         virtual void setMessageSelector( const std::string& selector ) {
             setPropertyValue( 
@@ -115,7 +115,7 @@
         /**
          * Sets the Subscription Name that is associated with this
          * subscribe request
-         * @param Subscription Name
+         * @param name Subscription Name
          */
         virtual void setSubscriptionName( const std::string& name ) {
             setPropertyValue( 
@@ -150,7 +150,7 @@
         /**
          * Sets whether or not locally sent messages should be ignored for 
          * subscriptions. Set to true to filter out locally sent messages
-         * @param NoLocal value
+         * @param noLocal No Local delivery value
          */
         virtual void setNoLocal( bool noLocal ) {
             setPropertyValue( 
@@ -174,7 +174,7 @@
         /**
          * Sets whether or not the broker is to dispatch messages in an 
          * asynchronous manner. Set to true if you want Async.
-         * @param true for async dispatch mode
+         * @param dispatchAsync true for async dispatch mode
          */
         virtual void setDispatchAsync( bool dispatchAsync ) {
             setPropertyValue( 
@@ -198,7 +198,7 @@
         /**
          * Sets whether or not this consumer is an exclusive consumer for
          * this destination.
-         * @param true if in exclusive mode
+         * @param exclusive true if in exclusive mode
          */
         virtual void setExclusive( bool exclusive ) {
             setPropertyValue( 
@@ -228,7 +228,7 @@
          * messages - we can set a maximum pending limit which once a slow 
          * consumer backs up to this high water mark we begin to discard 
          * old messages
-         * @param Max value
+         * @param limit Max Pending value
          */
         virtual void setMaxPendingMsgLimit( int limit ) {
             setPropertyValue( 
@@ -258,7 +258,7 @@
          * messages are dispatched until the client acknowledges a message. 
          * Set to 1 for very fair distribution of messages across consumers
          * where processing messages can be slow
-         * @param prefetch size value
+         * @param size prefetch size value
          */
         virtual void setPrefetchSize( int size ) {
             setPropertyValue( 
@@ -282,7 +282,7 @@
         /**
          * Sets the priority of the consumer so that dispatching can be 
          * weighted in priority order
-         * @param prioirty level
+         * @param priority message prioirty level
          */
         virtual void setPriority( int priority ) {
             setPropertyValue( 
@@ -306,7 +306,7 @@
         /**
          * Set For non-durable topics if this subscription is set to be 
          * retroactive
-         * @param true if in retroactive mode
+         * @param retroactive true if in retroactive mode
          */
         virtual void setRetroactive( bool retroactive ) {
             setPropertyValue( 
@@ -320,7 +320,7 @@
         /**
          * Inheritors are required to override this method to init the
          * frame with data appropriate for the command type.
-         * @param Frame to init
+         * @param frame Frame to init
          */
         virtual void initialize( StompFrame& frame )
         {
@@ -337,8 +337,8 @@
         /**
          * Inheritors are required to override this method to validate 
          * the passed stomp frame before it is marshalled or unmarshaled
-         * @param Frame to validate
-         * @returns true if frame is valid
+         * @param frame Frame to validate
+         * @returns frame true if frame is valid
          */
         virtual bool validate( const StompFrame& frame ) const
         {

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/UnsubscribeCommand.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/UnsubscribeCommand.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/UnsubscribeCommand.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/UnsubscribeCommand.h Tue Aug  1 15:30:22 2006
@@ -47,6 +47,7 @@
         
         /**
          * Get the destination
+         * @returns the Destination as a string
          */      
         virtual const char* getDestination(void) const{
             return getPropertyValue( 
@@ -56,12 +57,13 @@
       
         /**
          * Set the destination
+         * @param destination the destiantion as a String
          */
-        virtual void setDestination( const std::string& dest ){
+        virtual void setDestination( const std::string& destination ){
             setPropertyValue( 
                 CommandConstants::toString( 
                     CommandConstants::HEADER_DESTINATION ),
-                dest );
+                destination );
         }
       
     protected:
@@ -69,7 +71,7 @@
         /**
          * Inheritors are required to override this method to init the
          * frame with data appropriate for the command type.
-         * @param Frame to init
+         * @param frame Frame to init
          */
         virtual void initialize( StompFrame& frame )
         {
@@ -80,7 +82,7 @@
         /**
          * Inheritors are required to override this method to validate 
          * the passed stomp frame before it is marshalled or unmarshaled
-         * @param Frame to validate
+         * @param frame Frame to validate
          * @returns true if frame is valid
          */
         virtual bool validate( const StompFrame& frame ) const

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/MarshalException.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/MarshalException.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/MarshalException.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/MarshalException.h Tue Aug  1 15:30:22 2006
@@ -31,13 +31,33 @@
 	{
 	public:
 
+        /**
+         * Default Constructor
+         */
         MarshalException() {}
+
+        /**
+         * Copy Constructor
+         * @param ex the exception to copy
+         */
         MarshalException( const exceptions::ActiveMQException& ex ){
           *(ActiveMQException*)this = ex;
         }
+
+        /**
+         * Copy Constructor
+         * @param ex the exception to copy, which is an instance of this type
+         */
         MarshalException( const MarshalException& ex ){
             *(exceptions::ActiveMQException*)this = ex;
         }
+
+        /**
+         * Consturctor
+         * @param file name of the file were the exception occured.
+         * @param lineNumber line where the exception occured
+         * @param msg the message that was generated
+         */
         MarshalException(const char* file, const int lineNumber, 
             const char* msg, ...)
         {

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/Marshaler.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/Marshaler.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/Marshaler.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/Marshaler.h Tue Aug  1 15:30:22 2006
@@ -41,7 +41,7 @@
         /**
          * Marshall a Stomp Frame to a Stomp Command, the frame is now
          * owned by this Command, caller should not use the frame again.
-         * @param Frame to Marshall
+         * @param frame Frame to Marshall
          * @return Newly Marshaled Stomp Message
          * @throws MarshalException
          */
@@ -52,7 +52,7 @@
          * Marshal a Stomp Command to a Stom Frame, if the command that
          * is past is not castable to a Stomp Command an Exception will
          * be thrown
-         * @param The Stomp Command to Marshal
+         * @param command The Stomp Command to Marshal
          * @return newly Marshaled Stomp Frame
          * @throws MarshalException
          */

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQAckHandler.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQAckHandler.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQAckHandler.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQAckHandler.h Tue Aug  1 15:30:22 2006
@@ -36,7 +36,7 @@
     
         /**
          * Method called to acknowledge the message passed
-         * @param Message to Acknowlegde
+         * @param message Message to Acknowlegde
          * @throw CMSException
          */
         virtual void acknowledgeMessage( const ActiveMQMessage* message )

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h Tue Aug  1 15:30:22 2006
@@ -74,13 +74,15 @@
    
         /**
          * Creates a new Session to work for this Connection
+         * @throws CMSException
          */
         virtual cms::Session* createSession(void) throw ( cms::CMSException );
       
         /**
          * Creates a new Session to work for this Connection using the
          * specified acknowledgment mode
-         * @param the Acknowledgement Mode to use.
+         * @param ackMode the Acknowledgement Mode to use.
+         * @throws CMSException
          */
         virtual cms::Session* createSession( cms::Session::AcknowledgeMode ackMode ) 
             throw ( cms::CMSException );
@@ -108,7 +110,7 @@
       
         /**
          * Sets the registed Exception Listener for this connection
-         * @param pointer to and <code>ExceptionListener</code>
+         * @param listener pointer to and <code>ExceptionListener</code>
          */
         virtual void setExceptionListener( cms::ExceptionListener* listener ){
             exceptionListener = listener; };
@@ -137,15 +139,15 @@
          * Adds the ActiveMQMessageListener to the Mapping of Consumer Id's
          * to listeners, all message to that id will be routed to the given
          * listener
-         * @param Consumer Id String
-         * @param ActiveMQMessageListener Pointer
+         * @param consumerId Consumer Id String
+         * @param listener ActiveMQMessageListener Pointer
          */
         virtual void addMessageListener( const unsigned int consumerId,
                                          ActiveMQMessageListener* listener ); 
       
         /**
          * Remove the Listener for the specified Consumer Id
-         * @param Consumer Id string
+         * @param consumerId Consumer Id string
          */
         virtual void removeMessageListener( const unsigned int consumerId );
 
@@ -153,6 +155,7 @@
    
         /**
          * Notify the excpetion listener
+         * @param ex the exception to fire
          */
         void fire( exceptions::ActiveMQException& ex )
         {
@@ -169,7 +172,7 @@
         /**
          * Called to dispatch a message to a particular consumer.
          * @param consumer the target consumer of the dispatch.
-         * @param msg the message to be dispatched.
+         * @param message the message to be dispatched.
          */
         virtual void onConsumerMessage( connector::ConsumerInfo* consumer,
                                         core::ActiveMQMessage* message );

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionData.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionData.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionData.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionData.h Tue Aug  1 15:30:22 2006
@@ -48,9 +48,9 @@
         /**
          * Creates a new Connection Data object, passing it the data that
          * it will manage for the parent connection object.
-         * @param A connector instance
-         * @param A Socket instance
-         * @param A Transport instance
+         * @param connector an connector instance
+         * @param transport an <code>Transport</code> instance
+         * @param properties an IPoperties instance
          * @throw IllegalArgumentException if an element is NULL
          */
         ActiveMQConnectionData( connector::Connector* connector,

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h Tue Aug  1 15:30:22 2006
@@ -45,18 +45,15 @@
         std::string brokerURL;
 
     public:
-      
-        /**
-         * Constructor
-         */
+
    	    ActiveMQConnectionFactory(void);
 
         /**
          * Constructor
-         * @param the URL of the Broker we are connecting to.
+         * @param url the URL of the Broker we are connecting to.
          * @param username to authenticate with, defaults to ""
          * @param password to authenticate with, defaults to ""
-         * @param client Id to assign to connection, defaults to ""
+         * @param clientId to assign to connection, defaults to ""
          */
         ActiveMQConnectionFactory( const std::string& url,
                                    const std::string& username = "",
@@ -70,6 +67,7 @@
          * connection is created in stopped mode. No messages will be 
          * delivered until the Connection.start method is explicitly 
          * called. 
+         * @returns a Connection Pointer
          * @throws CMSException
          */
         virtual cms::Connection* createConnection(void) throw ( cms::CMSException );
@@ -78,6 +76,9 @@
          * Creates a connection with the specified user identity. The 
          * connection is created in stopped mode. No messages will be 
          * delivered until the Connection.start method is explicitly called.
+         * @param username to authenticate with, defaults to ""
+         * @param password to authenticate with, defaults to ""
+         * @param clientId to assign to connection, defaults to ""
          * @throw CMSException.
          */
         virtual cms::Connection* createConnection( const std::string& username,
@@ -160,8 +161,8 @@
         /**
          * Parses the properties out of the provided Broker URI and sets
          * them in the passed Properties Object.
-         * @param a Broker URI to parse
-         * @param a Properties object to set the parsed values in
+         * @param URI a Broker URI to parse
+         * @param properties a Properties object to set the parsed values in
          * @throws IllegalArgumentException if the passed URI is invalid
          */
         virtual void parseURL( const std::string& URI, 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConstants.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConstants.cpp?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConstants.cpp (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConstants.cpp Tue Aug  1 15:30:22 2006
@@ -1,58 +1,58 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- 
-#include "ActiveMQConstants.h"
-#include <stdio.h>
-
-using namespace std;
-using namespace activemq;
-using namespace activemq::core;
-
-////////////////////////////////////////////////////////////////////////////////
-string ActiveMQConstants::StaticInitializer::destOptions[NUM_OPTIONS];
-string ActiveMQConstants::StaticInitializer::uriParams[NUM_PARAMS];
-
-map< std::string, ActiveMQConstants::DestinationOption > 
-    ActiveMQConstants::StaticInitializer::destOptionMap;
-map< std::string, ActiveMQConstants::URIParam > 
-    ActiveMQConstants::StaticInitializer::uriParamsMap;
-
-ActiveMQConstants::StaticInitializer ActiveMQConstants::staticInits;
-
-////////////////////////////////////////////////////////////////////////////////
-ActiveMQConstants::StaticInitializer::StaticInitializer(){
-    
-    destOptions[CONSUMER_PREFECTCHSIZE] = "consumer.prefetchSize";
-    destOptions[CUNSUMER_MAXPENDINGMSGLIMIT] = "consumer.maximumPendingMessageLimit";
-    destOptions[CONSUMER_NOLOCAL] = "consumer.noLocal";
-    destOptions[CONSUMER_DISPATCHASYNC] = "consumer.dispatchAsync";
-    destOptions[CONSUMER_RETROACTIVE] = "consumer.retroactive";
-    destOptions[CONSUMER_SELECTOR] = "consumer.selector";
-    destOptions[CONSUMER_EXCLUSIVE] = "consumer.exclusive";
-    destOptions[CONSUMER_PRIORITY] = "consumer.priority";
-    
-    uriParams[PARAM_USERNAME] = "username";
-    uriParams[PARAM_PASSWORD] = "password";
-    uriParams[PARAM_CLIENTID] = "client-id";    
-
-    for( int ix=0; ix<NUM_OPTIONS; ++ix ){
-        destOptionMap[destOptions[ix]] = (DestinationOption)ix;
-    }
-    for( int ix=0; ix<NUM_PARAMS; ++ix ){
-        uriParamsMap[uriParams[ix]] = (URIParam)ix;
-    }
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+#include "ActiveMQConstants.h"
+#include <stdio.h>
+
+using namespace std;
+using namespace activemq;
+using namespace activemq::core;
+
+////////////////////////////////////////////////////////////////////////////////
+string ActiveMQConstants::StaticInitializer::destOptions[NUM_OPTIONS];
+string ActiveMQConstants::StaticInitializer::uriParams[NUM_PARAMS];
+
+map< std::string, ActiveMQConstants::DestinationOption > 
+    ActiveMQConstants::StaticInitializer::destOptionMap;
+map< std::string, ActiveMQConstants::URIParam > 
+    ActiveMQConstants::StaticInitializer::uriParamsMap;
+
+ActiveMQConstants::StaticInitializer ActiveMQConstants::staticInits;
+
+////////////////////////////////////////////////////////////////////////////////
+ActiveMQConstants::StaticInitializer::StaticInitializer(){
+    
+    destOptions[CONSUMER_PREFECTCHSIZE] = "consumer.prefetchSize";
+    destOptions[CUNSUMER_MAXPENDINGMSGLIMIT] = "consumer.maximumPendingMessageLimit";
+    destOptions[CONSUMER_NOLOCAL] = "consumer.noLocal";
+    destOptions[CONSUMER_DISPATCHASYNC] = "consumer.dispatchAsync";
+    destOptions[CONSUMER_RETROACTIVE] = "consumer.retroactive";
+    destOptions[CONSUMER_SELECTOR] = "consumer.selector";
+    destOptions[CONSUMER_EXCLUSIVE] = "consumer.exclusive";
+    destOptions[CONSUMER_PRIORITY] = "consumer.priority";
+    
+    uriParams[PARAM_USERNAME] = "username";
+    uriParams[PARAM_PASSWORD] = "password";
+    uriParams[PARAM_CLIENTID] = "client-id";    
+
+    for( int ix=0; ix<NUM_OPTIONS; ++ix ){
+        destOptionMap[destOptions[ix]] = (DestinationOption)ix;
+    }
+    for( int ix=0; ix<NUM_PARAMS; ++ix ){
+        uriParamsMap[uriParams[ix]] = (URIParam)ix;
+    }
+}

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConstants.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConstants.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConstants.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConstants.h Tue Aug  1 15:30:22 2006
@@ -1,113 +1,113 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef ACTIVEMQ_CORE_ACTIVEMQCONSTANTS_H_
-#define ACTIVEMQ_CORE_ACTIVEMQCONSTANTS_H_
-
-#include <activemq/exceptions/IllegalArgumentException.h>
-
-#include <string>
-#include <map>
-
-namespace activemq{
-namespace core{
-    
-    /**
-     * Class holding constant values for various ActiveMQ specific things
-     * Each constant is defined as an enumeration and has functions that
-     * convert back an forth between string and enum values.
-     */
-    class ActiveMQConstants{    
-    public:
-    
-        /**
-         * These values represent the options that can be appended to an
-         * Destination name, i.e. /topic/foo?consumer.exclusive=true
-         */
-        enum DestinationOption{
-            CONSUMER_PREFECTCHSIZE,
-            CUNSUMER_MAXPENDINGMSGLIMIT,
-            CONSUMER_NOLOCAL,
-            CONSUMER_DISPATCHASYNC,
-            CONSUMER_RETROACTIVE,
-            CONSUMER_SELECTOR,
-            CONSUMER_EXCLUSIVE,
-            CONSUMER_PRIORITY,
-            NUM_OPTIONS
-        };
-
-        /**
-         * These values represent the parameters that can be added to the
-         * connection URI that affect the ActiveMQ Core API
-         */        
-        enum URIParam
-        {
-            PARAM_USERNAME,
-            PARAM_PASSWORD,
-            PARAM_CLIENTID,
-            NUM_PARAMS
-        };
-        
-        static const std::string& toString( const DestinationOption option ){
-            return StaticInitializer::destOptions[option];
-        }
-        
-        static DestinationOption toDestinationOption( const std::string& option ){     
-            std::map< std::string, DestinationOption >::iterator iter = 
-                StaticInitializer::destOptionMap.find( option );
-
-            if( iter == StaticInitializer::destOptionMap.end() ){
-                return NUM_OPTIONS;
-            }
-                    
-            return iter->second;
-        }             
-        
-        static const std::string& toString( const URIParam option ){
-            return StaticInitializer::uriParams[option];
-        }
-        
-        static URIParam toURIOption( const std::string& option ){     
-            std::map< std::string, URIParam >::iterator iter = 
-                StaticInitializer::uriParamsMap.find( option );
-
-            if( iter == StaticInitializer::uriParamsMap.end() ){
-                return NUM_PARAMS;
-            }
-                    
-            return iter->second;
-        }             
-
-        class StaticInitializer{
-        public:
-            StaticInitializer();
-            virtual ~StaticInitializer(){}
-            
-            static std::string destOptions[NUM_OPTIONS];
-            static std::string uriParams[NUM_PARAMS];
-            static std::map<std::string, DestinationOption> destOptionMap;
-            static std::map<std::string, URIParam> uriParamsMap;
-        };
-        
-    private:
-    
-        static StaticInitializer staticInits;        
-
-    };
-    
-}}
-
-#endif /*ACTIVEMQ_CORE_ACTIVEMQCONSTANTS_H_*/
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ACTIVEMQ_CORE_ACTIVEMQCONSTANTS_H_
+#define ACTIVEMQ_CORE_ACTIVEMQCONSTANTS_H_
+
+#include <activemq/exceptions/IllegalArgumentException.h>
+
+#include <string>
+#include <map>
+
+namespace activemq{
+namespace core{
+    
+    /**
+     * Class holding constant values for various ActiveMQ specific things
+     * Each constant is defined as an enumeration and has functions that
+     * convert back an forth between string and enum values.
+     */
+    class ActiveMQConstants{    
+    public:
+    
+        /**
+         * These values represent the options that can be appended to an
+         * Destination name, i.e. /topic/foo?consumer.exclusive=true
+         */
+        enum DestinationOption{
+            CONSUMER_PREFECTCHSIZE,
+            CUNSUMER_MAXPENDINGMSGLIMIT,
+            CONSUMER_NOLOCAL,
+            CONSUMER_DISPATCHASYNC,
+            CONSUMER_RETROACTIVE,
+            CONSUMER_SELECTOR,
+            CONSUMER_EXCLUSIVE,
+            CONSUMER_PRIORITY,
+            NUM_OPTIONS
+        };
+
+        /**
+         * These values represent the parameters that can be added to the
+         * connection URI that affect the ActiveMQ Core API
+         */        
+        enum URIParam
+        {
+            PARAM_USERNAME,
+            PARAM_PASSWORD,
+            PARAM_CLIENTID,
+            NUM_PARAMS
+        };
+        
+        static const std::string& toString( const DestinationOption option ){
+            return StaticInitializer::destOptions[option];
+        }
+        
+        static DestinationOption toDestinationOption( const std::string& option ){     
+            std::map< std::string, DestinationOption >::iterator iter = 
+                StaticInitializer::destOptionMap.find( option );
+
+            if( iter == StaticInitializer::destOptionMap.end() ){
+                return NUM_OPTIONS;
+            }
+                    
+            return iter->second;
+        }             
+        
+        static const std::string& toString( const URIParam option ){
+            return StaticInitializer::uriParams[option];
+        }
+        
+        static URIParam toURIOption( const std::string& option ){     
+            std::map< std::string, URIParam >::iterator iter = 
+                StaticInitializer::uriParamsMap.find( option );
+
+            if( iter == StaticInitializer::uriParamsMap.end() ){
+                return NUM_PARAMS;
+            }
+                    
+            return iter->second;
+        }             
+
+        class StaticInitializer{
+        public:
+            StaticInitializer();
+            virtual ~StaticInitializer(){}
+            
+            static std::string destOptions[NUM_OPTIONS];
+            static std::string uriParams[NUM_PARAMS];
+            static std::map<std::string, DestinationOption> destOptionMap;
+            static std::map<std::string, URIParam> uriParamsMap;
+        };
+        
+    private:
+    
+        static StaticInitializer staticInits;        
+
+    };
+    
+}}
+
+#endif /*ACTIVEMQ_CORE_ACTIVEMQCONSTANTS_H_*/

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h Tue Aug  1 15:30:22 2006
@@ -88,7 +88,8 @@
         /**
          * Synchronously Receive a Message, time out after defined interval.
          * Returns null if nothing read.
-         * @return new message
+         * @param millisecs the time in milliseconds to wait before returning
+         * @return new message or null on timeout
          * @throws CMSException
          */
         virtual cms::Message* receive( int millisecs ) throw ( cms::CMSException );
@@ -103,7 +104,7 @@
 
         /**
          * Sets the MessageListener that this class will send notifs on
-         * @param MessageListener interface pointer
+         * @param listener MessageListener interface pointer
          */
         virtual void setMessageListener( cms::MessageListener* listener );
 
@@ -125,7 +126,7 @@
           
         /**
          * Method called to acknowledge the message passed
-         * @param Message to Acknowlegde
+         * @param message the Message to Acknowlegde
          * @throw CMSException
          */
         virtual void acknowledgeMessage( const ActiveMQMessage* message )
@@ -149,7 +150,7 @@
          * Called asynchronously when a new message is received, the message
          * that is passed is now the property of the callee, and the caller
          * will disavowe all knowledge of the message, i.e Callee must delete.
-         * @param Message object pointer
+         * @param message object pointer
          */
         virtual void onActiveMQMessage( ActiveMQMessage* message ) 
             throw ( exceptions::ActiveMQException );
@@ -172,8 +173,8 @@
          * called from the context of another thread.  This will enqueue a
          * message on the Consumers Queue, or notify a listener if one is
          * currently registered.
-         * @param cms::Message pointer to the message to dispatch
-         * @throw cms::CMSException
+         * @param message cms::Message pointer to the message to dispatch
+         * @throws cms::CMSException
          */
         virtual void dispatch( ActiveMQMessage* message ) 
             throw ( cms::CMSException );
@@ -197,11 +198,13 @@
         /**
          * Destroys the message if the session is transacted, otherwise
          * does nothing.
+         * @param message the message to destroy
          */
         virtual void destroyMessage( cms::Message* message );
 
         /**
          * Notifies the listener of a message.
+         * @param message the message to pass to the listener
          */
         void notifyListener( cms::Message* message );
         

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQDestination.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQDestination.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQDestination.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQDestination.h Tue Aug  1 15:30:22 2006
@@ -45,7 +45,7 @@
 
         /**
          * Copy Consturctor
-         * @param CMS Dest to Copy, must be a compatible type
+         * @param source CMS Dest to Copy, must be a compatible type
          */
         ActiveMQDestination( const cms::Destination* source ){
             this->copy( *source );
@@ -53,8 +53,8 @@
 
         /**
          * Custom Constructor
-         * @param string destination name plus any params
-         * @param type of destination this represents.
+         * @param dest string destination name plus any params
+         * @param destType type of destination this represents.
          */
         ActiveMQDestination( const std::string& dest,
                              cms::Destination::DestinationType destType )
@@ -124,7 +124,7 @@
         /**
          * Copy the contents of the given properties object to this
          * objects Properties object.  Existing values are erased.
-         * @param Properties to copy to this object.
+         * @param properties the Properties to copy to this object.
          */
         virtual void setProperties( const util::Properties& properties ){
             this->properties.copy( &properties );
@@ -142,9 +142,9 @@
         /**
          * Sets the Destination Name minus any optional params that can
          * be appended to the destination with an ?
-         * @param destination name minus params
+         * @param name destination name minus params
          */
-        virtual void setName( const std::string& ) {
+        virtual void setName( const std::string& name ) {
             this->name = name;
         }
         
@@ -158,7 +158,7 @@
         
         /**
          * Set the Destination Type for this Destination
-         * @param The Destination Type
+         * @param destType The Destination Type
          */
         virtual void setDestinationType( cms::Destination::DestinationType destType ) {
             this->destType = destType;

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQMessage.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQMessage.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQMessage.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQMessage.h Tue Aug  1 15:30:22 2006
@@ -41,7 +41,7 @@
         /**
          * Sets the Acknowledgement Handler that this Message will use
          * when the Acknowledge method is called.
-         * @param ActiveMQAckHandler
+         * @param handler ActiveMQAckHandler to call
          */
         virtual void setAckHandler( ActiveMQAckHandler* handler ) = 0;
         
@@ -54,7 +54,7 @@
         /**
          * Sets the count of the number of times this message has been 
          * redelivered
-         * @param redelivery count
+         * @param count the redelivery count
          */
         virtual void setRedeliveryCount( int count ) = 0;
 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQTransaction.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQTransaction.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQTransaction.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQTransaction.h Tue Aug  1 15:30:22 2006
@@ -102,6 +102,9 @@
     
         /**
          * Constructor
+         * @param connection - Connection to the Broker
+         * @param session - the session that contains this transaction
+         * @param properties - configuratoin parameters for this object
          */
     	ActiveMQTransaction( ActiveMQConnection* connection,
                              ActiveMQSession* session,
@@ -112,8 +115,8 @@
         /**
          * Adds the Message as a part of the Transaction for the specified
          * ActiveMQConsumer.
-         * @param ActiveMQMessage
-         * @param ActiveMQMessageListener
+         * @param message - Message to Transact
+         * @param listener - Listener to redeliver to on Rollback
          */
         virtual void addToTransaction( ActiveMQMessage* message,
                                        ActiveMQMessageListener* listener );
@@ -122,7 +125,7 @@
          * Removes the ActiveMQMessageListener and all of its transacted 
          * messages from the Transaction, this is usually only done when 
          * a ActiveMQMessageListener is destroyed.
-         * @param consumer who is to be removed.
+         * @param listener - consumer who is to be removed.
          */
         virtual void removeFromTransaction( ActiveMQMessageListener* listener );
         
@@ -159,7 +162,7 @@
 
         /**
          * Sets the Transction Id
-         * @param unsigned int Id
+         * @param id - unsigned int Id
          */
         virtual void setTransactionId( const unsigned int id ) {
             transactionInfo->setTransactionId( id );
@@ -175,7 +178,7 @@
 
         /**
          * Gets the Session Info that this transaction is attached too
-         * @return SessionnInfo pointer
+         * @param session - SessionnInfo pointer
          */
         virtual void setSessionInfo( const connector::SessionInfo* session ) {
             transactionInfo->setSessionInfo( session );
@@ -187,7 +190,7 @@
          * Called when a queued task has completed, the task that
          * finished is passed along for user consumption.  The task is
          * deleted and the count of outstanding tasks is reduced.
-         * @param Runnable Pointer to the task that finished
+         * @param task - Runnable Pointer to the task that finished
          */
         virtual void onTaskComplete( concurrent::Runnable* task );
            
@@ -197,8 +200,8 @@
           * unrecoverable exeption and that this task is now defunct.
           * Deletes the Task and notifies the connection that the
           * exception has occurred.  Reduce the outstanding task count.
-          * @param Runnable Pointer to the task
-          * @param The ActiveMQException that was thrown.
+          * @param task - Runnable Pointer to the task
+          * @param ex - The ActiveMQException that was thrown.
           */
          virtual void onTaskException( concurrent::Runnable* task, 
                                        exceptions::ActiveMQException& ex );

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedInputStream.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedInputStream.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedInputStream.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedInputStream.h Tue Aug  1 15:30:22 2006
@@ -110,7 +110,7 @@
          * by a call to Notify.  Must have this object locked before
          * calling.  This wait will timeout after the specified time
          * interval.
-         * @param time in millisecsonds to wait, or WAIT_INIFINITE
+         * @param millisecs time in millisecsonds to wait, or WAIT_INIFINITE
          * @throws ActiveMQException
          */
         virtual void wait( unsigned long millisecs ) 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedOutputStream.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedOutputStream.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedOutputStream.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedOutputStream.h Tue Aug  1 15:30:22 2006
@@ -108,7 +108,7 @@
          * by a call to Notify.  Must have this object locked before
          * calling.  This wait will timeout after the specified time
          * interval.
-         * @param time in millisecsonds to wait, or WAIT_INIFINITE
+         * @param millisecs time in millisecsonds to wait, or WAIT_INIFINITE
          * @throws ActiveMQException
          */
         virtual void wait( unsigned long millisecs ) 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h Tue Aug  1 15:30:22 2006
@@ -54,8 +54,8 @@
       
         /**
          * Constructor
-         * @param initial byte array to use to read from
-         * @param the size of the buffer
+         * @param buffer initial byte array to use to read from
+         * @param bufferSize the size of the buffer
          */
         ByteArrayInputStream( const unsigned char* buffer,
                               int bufferSize );
@@ -65,8 +65,8 @@
         /** 
          * Sets the data that this reader uses, replaces any existing
          * data and resets to beginning of the buffer.
-         * @param initial byte array to use to read from
-         * @param the size of the buffer
+         * @param buffer initial byte array to use to read from
+         * @param bufferSize the size of the buffer
          */
         virtual void setByteArray( const unsigned char* buffer,
                                    int bufferSize );
@@ -77,7 +77,7 @@
          * calling.
          * @throws ActiveMQException
          */
-        virtual void lock() throw(exceptions::ActiveMQException){
+        virtual void lock() throw( exceptions::ActiveMQException ){
             mutex.lock();
         }
     
@@ -85,7 +85,7 @@
          * Unlocks the object.
          * @throws ActiveMQException
          */
-        virtual void unlock() throw(exceptions::ActiveMQException){ 
+        virtual void unlock() throw( exceptions::ActiveMQException ){ 
             mutex.unlock();
         }
         
@@ -95,7 +95,7 @@
          * calling.
          * @throws ActiveMQException
          */
-        virtual void wait() throw(exceptions::ActiveMQException){
+        virtual void wait() throw( exceptions::ActiveMQException ){
             mutex.wait();
         }
     
@@ -104,10 +104,11 @@
          * by a call to Notify.  Must have this object locked before
          * calling.  This wait will timeout after the specified time
          * interval.
-         * @param time in millisecsonds to wait, or WAIT_INIFINITE
+         * @param millisecs the time in millisecsonds to wait, or 
+         * WAIT_INIFINITE
          * @throws ActiveMQException
          */
-        virtual void wait(unsigned long millisecs) throw(exceptions::ActiveMQException){
+        virtual void wait( unsigned long millisecs ) throw( exceptions::ActiveMQException ){
             mutex.wait(millisecs);
         }
 
@@ -117,7 +118,7 @@
          * calling.
          * @throws ActiveMQException
          */
-        virtual void notify() throw(exceptions::ActiveMQException){
+        virtual void notify() throw( exceptions::ActiveMQException ){
             mutex.notify();
         }
          
@@ -127,7 +128,7 @@
          * calling.
          * @throws ActiveMQException
          */
-        virtual void notifyAll() throw(exceptions::ActiveMQException){
+        virtual void notifyAll() throw( exceptions::ActiveMQException ){
             mutex.notifyAll();
         }
        
@@ -138,7 +139,7 @@
          * input stream.
          */
         virtual int available() const{   
-            return distance(pos, buffer.end());
+            return distance( pos, buffer.end() );
         }
             
         /**
@@ -146,7 +147,7 @@
          * @return The next byte.
          * @throws IOException thrown if an error occurs.
          */
-        virtual unsigned char read() throw (IOException);
+        virtual unsigned char read() throw ( IOException );
       
         /**
          * Reads an array of bytes from the buffer.

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/IOException.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/IOException.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/IOException.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/IOException.h Tue Aug  1 15:30:22 2006
@@ -29,13 +29,33 @@
     {
     public:
 
+        /**
+         * Default Constructor
+         */
         IOException(){}
+
+        /**
+         * Copy Constructor
+         * @param ex the exception to copy
+         */
         IOException( const exceptions::ActiveMQException& ex ){
             *(exceptions::ActiveMQException*)this = ex;
         }
+        
+        /**
+         * Copy Constructor
+         * @param ex the exception to copy, which is an instance of this type
+         */
         IOException( const IOException& ex ){
             *(exceptions::ActiveMQException*)this = ex;
         }
+
+        /**
+         * Consturctor
+         * @param file name of the file were the exception occured.
+         * @param lineNumber line where the exception occured
+         * @param msg the message that was generated
+         */
         IOException( const char* file, const int lineNumber,
                      const char* msg, ... )
         {

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/InputStream.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/InputStream.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/InputStream.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/InputStream.h Tue Aug  1 15:30:22 2006
@@ -55,11 +55,12 @@
          * Reads an array of bytes from the buffer.
          * @param buffer (out) the target buffer.
          * @param bufferSize the size of the output buffer.
-         * @return The number of bytes read.
+         * @return The number of bytes read or -1 if EOS is detected
          * @throws IOException thrown if an error occurs.
          */
         virtual int read( unsigned char* buffer, const int bufferSize ) 
             throw ( IOException ) = 0;
+
     };
     
 }}

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/OutputStream.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/OutputStream.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/OutputStream.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/OutputStream.h Tue Aug  1 15:30:22 2006
@@ -55,6 +55,7 @@
         
         /**
          * Flushes any pending writes in this output stream.
+         * @throws IOException
          */
         virtual void flush() throw ( IOException ) = 0;
     };

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/ConsoleHandler.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/ConsoleHandler.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/ConsoleHandler.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/ConsoleHandler.h Tue Aug  1 15:30:22 2006
@@ -23,64 +23,58 @@
 namespace activemq{
 namespace logger{
 
-   /**
-    * This Handler publishes log records to System.err. By default the
-    * SimpleFormatter is used to generate brief summaries.
-    * 
-    * Configuration: By default each ConsoleHandler is initialized using 
-    * the following LogManager configuration properties. If properties are
-    * not defined (or have invalid values) then the specified default 
-    * values are used.
-    *
-    * ConsoleHandler.level specifies the default level for the Handler 
-    *  (defaults to Level.INFO).
-    * ConsoleHandler.filter specifies the name of a Filter class to use 
-    *  (defaults to no Filter).
-    * ConsoleHandler.formatter specifies the name of a Formatter class to 
-    *  use (defaults to SimpleFormatter).
-    */
-   class ConsoleHandler
-   {
-   private:
+    /**
+     * This Handler publishes log records to System.err. By default the
+     * SimpleFormatter is used to generate brief summaries.
+     * 
+     * Configuration: By default each ConsoleHandler is initialized using 
+     * the following LogManager configuration properties. If properties are
+     * not defined (or have invalid values) then the specified default 
+     * values are used.
+     *
+     * ConsoleHandler.level specifies the default level for the Handler 
+     *  (defaults to Level.INFO).
+     * ConsoleHandler.filter specifies the name of a Filter class to use 
+     *  (defaults to no Filter).
+     * ConsoleHandler.formatter specifies the name of a Formatter class to 
+     *  use (defaults to SimpleFormatter).
+     */
+    class ConsoleHandler
+    {
+    private:
    
-      // The Standard Error Stream to log to
-      io::StandardErrorOutputStream stream;
+        // The Standard Error Stream to log to
+        io::StandardErrorOutputStream stream;
       
-      // The default Simple Formatter
-      SimpleFormatter formatter;
+        // The default Simple Formatter
+        SimpleFormatter formatter;
    
-   public:
+    public:
    
-      /**
-       * Constructor
-       */
-      ConsoleHandler(void) : StreamHandler(&stream, &formatter)
-      {
-         // Defaults level to Info
-         setLevel(Level.INFO);
-      }
+        ConsoleHandler(void) : StreamHandler(&stream, &formatter)
+        {
+            // Defaults level to Info
+            setLevel(Level.INFO);
+        }
       
-      /**
-       * Destructor
-       */
-      virtual ~ConsoleHandler(void) {}
+        virtual ~ConsoleHandler(void) {}
       
-      /**
-       * Close the current output stream.
-       * <p>
-       * Override the StreamHandler close to flush the Std Err stream
-       * but doesn't close.
-       * @throw CMSException
-       */
-      virtual void close(void) throw ( cms::CMSException )
-      {
-         if(getOutputStream())
-         {
-            getOutputStream->flush();
-         }
-      }      
+        /**
+         * Close the current output stream.
+         * <p>
+         * Override the StreamHandler close to flush the Std Err stream
+         * but doesn't close.
+         * @throw CMSException
+         */
+        virtual void close(void) throw ( cms::CMSException )
+        {
+            if(getOutputStream())
+            {
+                getOutputStream->flush();
+            }
+        }      
 
-   };
+    };
 
 }}
 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Filter.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Filter.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Filter.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Filter.h Tue Aug  1 15:30:22 2006
@@ -22,31 +22,29 @@
 namespace activemq{
 namespace logger{
    
-   /**
-    * A Filter can be used to provide fine grain control over what is 
-    * logged, beyond the control provided by log levels.
-    * 
-    * Each Logger and each Handler can have a filter associated with it. 
-    * The Logger or Handler will call the isLoggable method to check if a 
-    * given LogRecord should be published. If isLoggable returns false, 
-    * the LogRecord will be discarded. 
-    */
-   class Filter
-   {
-   public:
+    /**
+     * A Filter can be used to provide fine grain control over what is 
+     * logged, beyond the control provided by log levels.
+     * 
+     * Each Logger and each Handler can have a filter associated with it. 
+     * The Logger or Handler will call the isLoggable method to check if a 
+     * given LogRecord should be published. If isLoggable returns false, 
+     * the LogRecord will be discarded. 
+     */
+    class Filter
+    {
+    public:
 
-      /**
-       * Destructor
-       */
-   	virtual ~Filter(void) {}
+        virtual ~Filter(void) {}
       
-      /**
-       * Check if a given log record should be published.
-       * @param the <code>LogRecord</code> to check.
-       */
-      virtual bool isLoggable(const LogRecord& record) const = 0;
+        /**
+         * Check if a given log record should be published.
+         * @param record the <code>LogRecord</code> to check.
+         * @returns true if the record is loggable.
+         */
+        virtual bool isLoggable( const LogRecord& record ) const = 0;
 
-   };
+    };
 
 }}
 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Formatter.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Formatter.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Formatter.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Formatter.h Tue Aug  1 15:30:22 2006
@@ -20,54 +20,53 @@
 namespace activemq{
 namespace logger{
 
-   /**
-    * A Formatter provides support for formatting LogRecords.
-    *
-    * Typically each logging Handler will have a Formatter associated with 
-    * it. The Formatter takes a LogRecord and converts it to a string.
-    *
-    * Some formatters (such as the XMLFormatter) need to wrap head and 
-    * tail strings around a set of formatted records. The getHeader and 
-    * getTail methods can be used to obtain these strings.
-    */
-   class Formatter
-   {
-   public:
+    /**
+     * A Formatter provides support for formatting LogRecords.
+     *
+     * Typically each logging Handler will have a Formatter associated with 
+     * it. The Formatter takes a LogRecord and converts it to a string.
+     *
+     * Some formatters (such as the XMLFormatter) need to wrap head and 
+     * tail strings around a set of formatted records. The getHeader and 
+     * getTail methods can be used to obtain these strings.
+     */
+    class Formatter
+    {
+    public:
 
-      /**
-       * Destrcutor
-       */
-   	virtual ~Formatter(void) {}
+        virtual ~Formatter(void) {}
 
-      /**
-       * Format the given log record and return the formatted string.
-       * @param The Log Record to Format
-       */
-      virtual std::string format(const LogRecord& record) const = 0;
+        /**
+         * Format the given log record and return the formatted string.
+         * @param record The Log Record to Format
+         * @returns the formatted record.
+         */
+        virtual std::string format( const LogRecord& record ) const = 0;
       
-      /**
-       * Format the message string from a log record.
-       * @param The Log Record to Format
-       */
-      virtual std::string formatMessage(const LogRecord& record) const = 0;
+        /**
+         * Format the message string from a log record.
+         * @param record The Log Record to Format
+         * @returns the formatted message
+         */
+        virtual std::string formatMessage( const LogRecord& record ) const = 0;
       
-      /**
-       * Return the header string for a set of formatted records.  In the
-       * default implementation this method should return empty string
-       * @param the target handler, can be null
-       * @return the head string
-       */
-      virtual std::string getHead(const Handler* handler) = 0;
+        /**
+         * Return the header string for a set of formatted records.  In the
+         * default implementation this method should return empty string
+         * @param handler the target handler, can be null
+         * @return the head string
+         */
+        virtual std::string getHead( const Handler* handler ) = 0;
 
-      /**
-       * Return the tail string for a set of formatted records.  In the
-       * default implementation this method should return empty string
-       * @param the target handler, can be null
-       * @return the tail string
-       */
-      virtual std::string getTail(const Handler* handler) = 0;
+        /**
+         * Return the tail string for a set of formatted records.  In the
+         * default implementation this method should return empty string
+         * @param handler the target handler, can be null
+         * @return the tail string
+         */
+        virtual std::string getTail( const Handler* handler ) = 0;
 
-   };
+    };
 
 }}
 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Handler.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Handler.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Handler.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Handler.h Tue Aug  1 15:30:22 2006
@@ -23,100 +23,97 @@
 namespace activemq{
 namespace logger{
 
-   class Filter;
-   class Formatter;
+    class Filter;
+    class Formatter;
    
-   /**
-    * A Handler object takes log messages from a Logger and exports them. 
-    * It might for example, write them to a console or write them to a file, 
-    * or send them to a network logging service, or forward them to an OS 
-    * log, or whatever.
-    * 
-    * A Handler can be disabled by doing a setLevel(Level.OFF) and can be 
-    * re-enabled by doing a setLevel with an appropriate level.
-    * 
-    * Handler classes typically use LogManager properties to set default 
-    * values for the Handler's Filter, Formatter, and Level. See the 
-    * specific documentation for each concrete Handler class. 
-    */
-   class Handler : public cms::Closeable
-   {
-   public:
+    /**
+     * A Handler object takes log messages from a Logger and exports them. 
+     * It might for example, write them to a console or write them to a file, 
+     * or send them to a network logging service, or forward them to an OS 
+     * log, or whatever.
+     * 
+     * A Handler can be disabled by doing a setLevel(Level.OFF) and can be 
+     * re-enabled by doing a setLevel with an appropriate level.
+     * 
+     * Handler classes typically use LogManager properties to set default 
+     * values for the Handler's Filter, Formatter, and Level. See the 
+     * specific documentation for each concrete Handler class. 
+     */
+    class Handler : public cms::Closeable
+    {
+    public:
    
-      /**
-       * Destructor
-       */
-      virtual ~Handler(void) {}
-      
-      /**
-       * Flush the Handler's output, clears any buffers.
-       */
-      virtual void flush(void) = 0;
-      
-      /**
-       * Publish the Log Record to this Handler
-       * @param The Log Record to Publish
-       */
-      virtual void publish(const LogRecord& record) = 0;
-      
-      /**
-       * Check if this Handler would actually log a given LogRecord.
-       * <p>
-       * This method checks if the LogRecord has an appropriate Level and 
-       * whether it satisfies any Filter. It also may make other Handler 
-       * specific checks that might prevent a handler from logging the 
-       * LogRecord.
-       * @param <code>LogRecord</code> to check
-       */
-      virtual void isLoggable(const LogRecord& record) = 0;
-      
-      /**
-       * Sets the Filter that this Handler uses to filter Log Records
-       * <p>
-       * For each call of publish the Handler will call this Filter (if it 
-       * is non-null) to check if the LogRecord should be published or 
-       * discarded.
-       * @param <code>Filter</code> derived instance
-       */
-      virtual void setFilter(const Filter* filter) = 0;
-      
-      /**
-       * Gets the Filter that this Handler uses to filter Log Records
-       * @param <code>Filter</code> derived instance
-       */
-      virtual const Filter* getFilter(void) = 0;
-      
-      /**
-       * Set the log level specifying which message levels will be logged 
-       * by this Handler.
-       * <p>
-       * The intention is to allow developers to turn on voluminous logging, 
-       * but to limit the messages that are sent to certain Handlers.
-       * @param Level enumeration value
-       */
-      virtual void setLevel(Level value) = 0;
-      
-      /**
-       * Get the log level specifying which message levels will be logged 
-       * by this Handler.
-       * @param Level enumeration value
-       */
-      virtual Level getLevel(void) = 0;
-      
-      /**
-       * Sets the <code>Formatter</code> used by this Handler
-       * <p>
-       * Some Handlers may not use Formatters, in which case the 
-       * Formatter will be remembered, but not used.
-       * @param <code>Filter</code> derived instance
-       */
-      virtual void setFormatter(const Formatter* formatter) = 0;
-      
-      /**
-       * Gets the <code>Formatter</code> used by this Handler
-       * @param <code>Filter</code> derived instance
-       */
-      virtual const Formatter* getFormatter(void) = 0;
+        virtual ~Handler(void) {}
+      
+        /**
+         * Flush the Handler's output, clears any buffers.
+         */
+        virtual void flush(void) = 0;
+      
+        /**
+         * Publish the Log Record to this Handler
+         * @param record The Log Record to Publish
+         */
+        virtual void publish( const LogRecord& record ) = 0;
+      
+        /**
+         * Check if this Handler would actually log a given LogRecord.
+         * <p>
+         * This method checks if the LogRecord has an appropriate Level and 
+         * whether it satisfies any Filter. It also may make other Handler 
+         * specific checks that might prevent a handler from logging the 
+         * LogRecord.
+         * @param record <code>LogRecord</code> to check
+         */
+        virtual void isLoggable( const LogRecord& record ) = 0;
+      
+        /**
+         * Sets the Filter that this Handler uses to filter Log Records
+         * <p>
+         * For each call of publish the Handler will call this Filter (if it 
+         * is non-null) to check if the LogRecord should be published or 
+         * discarded.
+         * @param filter <code>Filter</code> derived instance
+         */
+        virtual void setFilter( const Filter* filter ) = 0;
+      
+        /**
+         * Gets the Filter that this Handler uses to filter Log Records
+         * @returns <code>Filter</code> derived instance
+         */
+        virtual const Filter* getFilter(void) = 0;
+      
+        /**
+         * Set the log level specifying which message levels will be logged 
+         * by this Handler.
+         * <p>
+         * The intention is to allow developers to turn on voluminous logging, 
+         * but to limit the messages that are sent to certain Handlers.
+         * @param value Level enumeration value
+         */
+        virtual void setLevel( Level value ) = 0;
+      
+        /**
+         * Get the log level specifying which message levels will be logged 
+         * by this Handler.
+         * @returns Level enumeration value
+         */
+        virtual Level getLevel(void) = 0;
+      
+        /**
+         * Sets the <code>Formatter</code> used by this Handler
+         * <p>
+         * Some Handlers may not use Formatters, in which case the 
+         * Formatter will be remembered, but not used.
+         * @param formatter <code>Filter</code> derived instance
+         */
+        virtual void setFormatter( const Formatter* formatter ) = 0;
+      
+        /**
+         * Gets the <code>Formatter</code> used by this Handler
+         * @returns <code>Filter</code> derived instance
+         */
+        virtual const Formatter* getFormatter(void) = 0;
 
    };
 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogManager.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogManager.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogManager.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogManager.h Tue Aug  1 15:30:22 2006
@@ -138,15 +138,12 @@
 
     public:
 
-        /**
-         * Destructor
-         */
         virtual ~LogManager();
 
         /**
          * Sets the Properties this LogManager should use to configure
          * its loggers.  Once set a properties change event is fired.
-         * @param Properties Pointer to read the configuration from
+         * @param properties Pointer to read the configuration from
          */
         virtual void setProperties( const util::Properties* properties );
 
@@ -161,7 +158,7 @@
 
         /**
          * Gets the value of a named property of this LogManager
-         * @param Name of the Property to retrieve
+         * @param name of the Property to retrieve
          * @return the value of the property
          */
         virtual std::string getProperty( const std::string& name ) {
@@ -171,13 +168,14 @@
         /**
          * Adds a change listener for LogManager Properties, adding the same
          * instance of a change event listener does nothing.
-         * @param PropertyChangeListener
+         * @param listener a PropertyChangeListener
          */
         virtual void addPropertyChangeListener( 
             PropertyChangeListener* listener );
 
         /**
          * Removes a properties change listener from the LogManager.
+         * @param listener a PropertyChangeListener
          */
         virtual void removePropertyChangeListener(
             PropertyChangeListener* listener );
@@ -186,14 +184,14 @@
          * Retrieves or creates a new Logger using the name specified
          * a new logger inherits the configuration of the logger's 
          * parent if there is no configuration data for the logger.
-         * @param The name of the Logger.
+         * @param name The name of the Logger.
          */
         virtual Logger* getLogger( const std::string& name );
 
         /**
          * Gets a list of known Logger Names from this Manager
-         * @param STL Vector to hold string logger names
-         * @return count of how many loggers were inserted
+         * @param names STL Vector to hold string logger names
+         * @return names count of how many loggers were inserted
          */
         virtual int getLoggerNames( const std::vector<std::string>& names );
 
@@ -221,16 +219,17 @@
         /**
          * Constructor, hidden to protect against direct instantiation
          */
-        LogManager( void )
-        {}
+        LogManager( void ) {}
 
         /**
          * Copy Constructo
+         * @param manager the Manager to copy
          */
         LogManager( const LogManager& manager );
 
         /**
          * Assignment operator
+         * @param manager the manager to assign from
          */
         void operator=( const LogManager& manager );
 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h Tue Aug  1 15:30:22 2006
@@ -24,156 +24,165 @@
 namespace activemq{
 namespace logger{
 
-   class LogRecord
-   {
-   private:
+    class LogRecord
+    {
+    private:
    
-      // Level of this Record
-      Level level;
+        // Level of this Record
+        Level level;
       
-      // Name of the source Logger
-      std::string loggerName;
+        // Name of the source Logger
+        std::string loggerName;
       
-      // Name of the File that originated the Log
-      std::string sourceFile;
+        // Name of the File that originated the Log
+        std::string sourceFile;
       
-      // Line in the source file where log occured
-      unsigned long sourceLine;
-      
-      // The message to Log.
-      std::string message;
-      
-      // The function Name where the log occured
-      std::string functionName;
-      
-      // Time in Mills since UTC that this Record was logged
-      unsigned long timeStamp;
-      
-      // Thread Id of the Thread that logged this Record
-      unsigned long threadId;
-
-   public:
-
-      /**
-       * Constructor
-       */
-      LogRecord() {}
-      
-      /**
-       * Destructor
-       */
-      virtual ~LogRecord() {}
-      
-      /**
-       * Get Level of this log record
-       * @return Level enumeration value.
-       */
-      Level getLevel(void) const { return level; };
-      
-      /**
-       * Set the Level of this Log Record
-       * @param Level Enumeration Value
-       */
-      void setLevel(Level value) { level = value; };
-      
-      /**
-       * Gets the Source Logger's Name
-       * @return the source loggers name
-       */
-      const std::string& getLoggerName(void) const { return loggerName; };
-      
-      /**
-       * Sets the Source Logger's Name
-       * @param the source loggers name
-       */
-      void setLoggerName(const std::string& loggerName) { 
-         this->loggerName = loggerName;
-      };
-      
-      /**
-       * Gets the Source Log File name
-       * @return the source loggers name
-       */
-      const std::string& getSourceFile(void) const { return sourceFile; };
-      
-      /**
-       * Sets the Source Log File Name
-       * @param the source loggers name
-       */
-      void setSourceFile(const std::string& loggerName) { 
-         this->sourceFile = sourceFile;
-      };
-
-      /**
-       * Gets the Source Log line number
-       * @return the source loggers line number
-       */
-      unsigned long getSourceLine(void) const { return sourceLine; };
-      
-      /**
-       * Sets the Source Log line number
-       * @param the source logger's line number
-       */
-      void setSourceLine(long sourceLine) { 
-         this->sourceLine = sourceLine;
-      };
-
-      /**
-       * Gets the Message to be Logged
-       * @return the source logger's message
-       */
-      const std::string& getMessage(void) const { return message; };
-      
-      /**
-       * Sets the Message to be Logged
-       * @param the source loggers message
-       */
-      void setMessage(const std::string& message) { 
-         this->message = message;
-      };
-      
-      /**
-       * Gets the name of the function where this log was logged
-       * @return the source logger's message
-       */
-      const std::string& getSourceFunction(void) const { return functionName; };
-      
-      /**
-       * Sets the name of the function where this log was logged
-       * @param the source loggers message
-       */
-      void setSourceFunction(const std::string& functionName) { 
-         this->functionName = functionName;
-      };
-
-      /**
-       * Gets the time in mills that this message was logged.
-       * @return UTC time in milliseconds
-       */
-      unsigned long getTimestamp(void) const { return timeStamp; };
-      
-      /**
-       * Sets the time in mills that this message was logged.
-       * @param UTC Time in Milliseconds.
-       */
-      void setTimestamp(long timeStamp) { 
-         this->timeStamp = timeStamp;
-      };
-
-      /**
-       * Gets the Thread Id where this Log was created
-       * @return the source loggers line number
-       */
-      unsigned long getTreadId(void) const { return threadId; };
-      
-      /**
-       * Sets the Thread Id where this Log was created
-       * @param the source logger's line number
-       */
-      void setTreadId(long threadId) { 
-         this->threadId = threadId;
-      };
-   };
+        // Line in the source file where log occured
+        unsigned long sourceLine;
+      
+        // The message to Log.
+        std::string message;
+      
+        // The function Name where the log occured
+        std::string functionName;
+      
+        // Time in Mills since UTC that this Record was logged
+        unsigned long timeStamp;
+      
+        // Thread Id of the Thread that logged this Record
+        unsigned long threadId;
+
+    public:
+
+        LogRecord() {}
+        virtual ~LogRecord() {}
+      
+        /**
+         * Get Level of this log record
+         * @return Level enumeration value.
+         */
+        Level getLevel(void) const { 
+            return level; 
+        };
+      
+        /**
+         * Set the Level of this Log Record
+         * @param value Level Enumeration Value
+         */
+        void setLevel( Level value ) { 
+            level = value; 
+        };
+      
+        /**
+         * Gets the Source Logger's Name
+         * @return the source loggers name
+         */
+        const std::string& getLoggerName(void) const { 
+            return loggerName; 
+        };
+      
+        /**
+         * Sets the Source Logger's Name
+         * @param loggerName the source loggers name
+         */
+        void setLoggerName( const std::string& loggerName ) { 
+            this->loggerName = loggerName;
+        };
+      
+        /**
+         * Gets the Source Log File name
+         * @return the source loggers name
+         */
+        const std::string& getSourceFile(void) const { 
+            return sourceFile; 
+        };
+      
+        /**
+         * Sets the Source Log File Name
+         * @param loggerName the source loggers name
+         */
+        void setSourceFile( const std::string& loggerName ) { 
+            this->sourceFile = sourceFile;
+        };
+
+        /**
+         * Gets the Source Log line number
+         * @return the source loggers line number
+         */
+        unsigned long getSourceLine(void) const { 
+            return sourceLine;
+        };
+      
+        /**
+         * Sets the Source Log line number
+         * @param sourceLine the source logger's line number
+         */
+        void setSourceLine( long sourceLine ) { 
+            this->sourceLine = sourceLine;
+        };
+
+        /**
+         * Gets the Message to be Logged
+         * @return the source logger's message
+         */
+        const std::string& getMessage(void) const { 
+            return message; 
+        };
+      
+        /**
+         * Sets the Message to be Logged
+         * @param message the source loggers message
+         */
+        void setMessage( const std::string& message ) { 
+            this->message = message;
+        };
+      
+        /**
+         * Gets the name of the function where this log was logged
+         * @return the source logger's message
+         */
+        const std::string& getSourceFunction(void) const { 
+            return functionName; 
+         };
+      
+        /**
+         * Sets the name of the function where this log was logged
+         * @param functionName the source of the log
+         */
+        void setSourceFunction( const std::string& functionName ) { 
+            this->functionName = functionName;
+        };
+
+        /**
+         * Gets the time in mills that this message was logged.
+         * @return UTC time in milliseconds
+         */
+        unsigned long getTimestamp(void) const { return timeStamp; };
+      
+        /**
+         * Sets the time in mills that this message was logged.
+         * @param timeStamp UTC Time in Milliseconds.
+         */
+        void setTimestamp( long timeStamp ) { 
+            this->timeStamp = timeStamp;
+        };
+
+        /**
+         * Gets the Thread Id where this Log was created
+         * @return the source loggers line number
+         */
+        unsigned long getTreadId(void) const { 
+            return threadId; 
+        };
+      
+        /**
+         * Sets the Thread Id where this Log was created
+         * @param threadId the source logger's line number
+         */
+        void setTreadId( long threadId ) { 
+            this->threadId = threadId;
+        };
+    };
 
 }}
 

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.h?rev=427774&r1=427773&r2=427774&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.h Tue Aug  1 15:30:22 2006
@@ -28,18 +28,15 @@
    {
    public:
       
-      /**
-       * Constructor
-       */
       LogWriter(void);
-      
-      /**
-       * Destructor
-       */
       virtual ~LogWriter(void);
 
       /**
        * Writes a message to the output destination
+       * @param file
+       * @param line
+       * @param prefix
+       * @param message
        */
       virtual void log(const std::string& file,
                        const int          line,
@@ -48,6 +45,7 @@
       
       /**
        * Writes a message to the output destination
+       * @param message
        */
       virtual void log(const std::string& message);
 



Mime
View raw message