activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r419365 [1/25] - in /incubator/activemq/trunk: activemq-core/src/main/java/org/apache/activemq/thread/ activemq-core/src/test/java/org/apache/activemq/openwire/v1/ activemq-cpp/src/main/activemq/concurrent/ activemq-cpp/src/main/activemq/co...
Date Wed, 05 Jul 2006 22:27:47 GMT
Author: chirino
Date: Wed Jul  5 15:27:34 2006
New Revision: 419365

URL: http://svn.apache.org/viewvc?rev=419365&view=rev
Log:
Set the eol type to native.

Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java   (props changed)
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionControlTest.java   (contents, props changed)
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerControlTest.java   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Concurrent.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Lock.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/PooledThread.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/PooledThread.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/PooledThreadListener.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Runnable.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Synchronizable.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/TaskListener.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Thread.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/ThreadPool.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/ThreadPool.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/Connector.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ConnectorException.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ConnectorFactory.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ConnectorFactoryMap.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ConnectorFactoryMap.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ConnectorFactoryMapRegistrar.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ConnectorResource.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ConsumerInfo.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ConsumerMessageListener.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/ProducerInfo.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/SessionInfo.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/TransactionInfo.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompCommandListener.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompCommandReader.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompCommandReader.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompCommandWriter.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompCommandWriter.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnector.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnectorException.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnectorFactory.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConnectorFactory.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompConsumerInfo.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompDestination.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompProducerInfo.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompQueue.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSelector.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSessionInfo.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSessionManager.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompSessionManager.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompTopic.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompTransactionInfo.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbortCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AckCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/BeginCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommandConstants.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/CommitCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ConnectedCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/DisconnectCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ErrorCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/MessageCommand.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/ReceiptCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/StompMessage.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/SubscribeCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/TextMessageCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/UnsubscribeCommand.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/MarshalException.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/Marshalable.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/Marshaler.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/connector/stomp/marshal/Marshaler.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQAckHandler.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionData.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQConsumer.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQMessage.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQMessageListener.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQProducer.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSessionResource.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQTransaction.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/core/ActiveMQTransaction.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/ActiveMQException.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/ActiveMQException.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/ExceptionDefines.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/IllegalArgumentException.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/IllegalMonitorStateException.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/InterruptedException.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/InvalidStateException.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/NoSuchElementException.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/NullPointerException.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/RuntimeException.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/exceptions/UnsupportedOperationException.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedInputStream.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedInputStream.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedOutputStream.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/BufferedOutputStream.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/ByteArrayInputStream.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/ByteArrayOutputStream.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/ByteArrayOutputStream.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/EndianReader.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/EndianReader.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/EndianWriter.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/EndianWriter.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/IOException.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/InputStream.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/OutputStream.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/Reader.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/StandardErrorOutputStream.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/io/Writer.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/ConsoleHandler.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Filter.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Formatter.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Handler.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogManager.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/Logger.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LoggerCommon.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LoggerDefines.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LoggerHierarchy.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/LoggerHierarchy.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/MarkBlockLogger.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/PropertiesChangeListener.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/SimpleFormatter.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/SimpleLogger.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/SimpleLogger.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/logger/StreamHandler.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/BufferedSocket.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/BufferedSocket.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/ServerSocket.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/Socket.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/SocketException.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/SocketFactory.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/SocketFactory.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/SocketOutputStream.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/network/TcpSocket.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/support/InitDirector.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/support/InitDirector.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/support/LibraryInit.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/BrokerError.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/Command.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/CommandIOException.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/CommandListener.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/CommandReader.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/CommandWriter.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/ExceptionResponse.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/FutureResponse.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/Response.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/ResponseCorrelator.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/ResponseCorrelator.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TcpTransport.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TcpTransport.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TcpTransportFactory.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TcpTransportFactory.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/Transport.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TransportExceptionListener.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TransportFactory.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMapRegistrar.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Boolean.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Endian.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Guid.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Guid.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Integer.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Long.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Number.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Properties.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/Queue.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/SimpleProperties.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/StringTokenizer.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/activemq/util/StringTokenizer.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/cms/MapMessage.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/main/cms/TemporaryQueue.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test-integration/integration/common/AbstractTester.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test-integration/integration/common/IntegrationCommon.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test-integration/integration/durable/DurableTester.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test-integration/integration/simple/SimpleTester.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test-integration/integration/transactional/TransactionTester.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test-integration/main.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/concurrent/MutexTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/concurrent/MutexTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandReaderTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandReaderTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandWriterTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompCommandWriterTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompFrameTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompFrameTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompResponseBuilder.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompSessionManagerTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompSessionManagerTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AbortCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AbortCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AckCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/AckCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BeginCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BeginCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommandConstantsTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommandConstantsTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommitCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/CommitCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectedCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ConnectedCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/DisconnectCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/DisconnectCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ErrorCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ErrorCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ReceiptCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/ReceiptCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/SubscribeCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/SubscribeCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/UnsubscribeCommandTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/UnsubscribeCommandTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/marshal/MarshalerTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/connector/stomp/marshal/MarshalerTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionFactoryTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionFactoryTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/BufferedInputStreamTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/BufferedInputStreamTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/BufferedOutputStreamTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/BufferedOutputStreamTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/ByteArrayInputStreamTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/ByteArrayInputStreamTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/ByteArrayOutputStreamTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/ByteArrayOutputStreamTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/EndianReaderTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/EndianReaderTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/EndianWriterTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/io/EndianWriterTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/logger/LoggerTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/logger/LoggerTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/network/SocketFactoryTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/network/SocketFactoryTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/network/SocketTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/network/SocketTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/DummyTransport.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/DummyTransportFactory.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/DummyTransportFactory.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/IOTransportTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/IOTransportTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/ResponseCorrelatorTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/ResponseCorrelatorTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapRegistrarTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapRegistrarTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapTest.cpp   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapTest.h   (props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/BooleanTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/BooleanTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/GuidTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/GuidTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/IntegerTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/IntegerTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/LongTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/LongTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/QueueTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/QueueTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/StringTokenizerTest.cpp   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/activemq/util/StringTokenizerTest.h   (contents, props changed)
    incubator/activemq/trunk/activemq-cpp/src/test/main.cpp   (props changed)
    incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/AcknowledgementMode.hpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/main/cpp/activemq/Connection.cpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/IUnitTest.hpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestAsynchQueue.cpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestAsynchQueue.hpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestAsynchTopic.cpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestAsynchTopic.hpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestLocalTXCommit.cpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestLocalTXCommit.hpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestSuite.cpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestSuite.hpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestSynchQueue.cpp   (contents, props changed)
    incubator/activemq/trunk/openwire-cpp/src/test/cpp/TestSynchQueue.hpp   (contents, props changed)

Propchange: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionControlTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionControlTest.java?rev=419365&r1=419364&r2=419365&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionControlTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionControlTest.java Wed Jul  5 15:27:34 2006
@@ -1 +1,60 @@
-/**
 *
 * Copyright 2005-2006 The Apache Software Foundation
 *
 * 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.
 */
package org.apache.activemq.openwire.v1;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for ConnectionControl
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to m
 ake a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * @version $Revision: $
 */
public class ConnectionControlTest extends BaseCommandTestSupport {


    public static ConnectionControlTest SINGLETON = new ConnectionControlTest();

    public Object createObject() throws Exception {
    		ConnectionControl info = new ConnectionControl();
    		populateObject(info);
    		return info;
    }

    
    protected void populateObject(Object object) throws Exception {
    		super.populateObject(object);
    		ConnectionControl info = (ConnectionControl) object;
        info.setClose(true);
        info.setExit(false);
        info.setFaultTolerant(true);
        info.setResume(false);
        info.setSuspend(true);

            }
        }
\ No newline at end of file
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * 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.
+ */
+package org.apache.activemq.openwire.v1;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+/**
+ * Test case for the OpenWire marshalling for ConnectionControl
+ *
+ *
+ * NOTE!: This file is auto generated - do not modify!
+ *        if you need to make a change, please see the modify the groovy scripts in the
+ *        under src/gram/script and then use maven openwire:generate to regenerate 
+ *        this file.
+ *
+ * @version $Revision: $
+ */
+public class ConnectionControlTest extends BaseCommandTestSupport {
+
+
+    public static ConnectionControlTest SINGLETON = new ConnectionControlTest();
+
+    public Object createObject() throws Exception {
+    		ConnectionControl info = new ConnectionControl();
+    		populateObject(info);
+    		return info;
+    }
+
+    
+    protected void populateObject(Object object) throws Exception {
+    		super.populateObject(object);
+    		ConnectionControl info = (ConnectionControl) object;
+        info.setClose(true);
+        info.setExit(false);
+        info.setFaultTolerant(true);
+        info.setResume(false);
+        info.setSuspend(true);
+
+            }
+        }

Propchange: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConnectionControlTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerControlTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerControlTest.java?rev=419365&r1=419364&r2=419365&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerControlTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerControlTest.java Wed Jul  5 15:27:34 2006
@@ -1 +1,58 @@
-/**
 *
 * Copyright 2005-2006 The Apache Software Foundation
 *
 * 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.
 */
package org.apache.activemq.openwire.v1;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;


/**
 * Test case for the OpenWire marshalling for ConsumerControl
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if you need to mak
 e a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * @version $Revision: $
 */
public class ConsumerControlTest extends BaseCommandTestSupport {


    public static ConsumerControlTest SINGLETON = new ConsumerControlTest();

    public Object createObject() throws Exception {
    		ConsumerControl info = new ConsumerControl();
    		populateObject(info);
    		return info;
    }

    
    protected void populateObject(Object object) throws Exception {
    		super.populateObject(object);
    		ConsumerControl info = (ConsumerControl) object;
        info.setClose(true);
        info.setConsumerId(createConsumerId("ConsumerId:1"));
        info.setPrefetch(1);

            }
        }
\ No newline at end of file
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * 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.
+ */
+package org.apache.activemq.openwire.v1;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+/**
+ * Test case for the OpenWire marshalling for ConsumerControl
+ *
+ *
+ * NOTE!: This file is auto generated - do not modify!
+ *        if you need to make a change, please see the modify the groovy scripts in the
+ *        under src/gram/script and then use maven openwire:generate to regenerate 
+ *        this file.
+ *
+ * @version $Revision: $
+ */
+public class ConsumerControlTest extends BaseCommandTestSupport {
+
+
+    public static ConsumerControlTest SINGLETON = new ConsumerControlTest();
+
+    public Object createObject() throws Exception {
+    		ConsumerControl info = new ConsumerControl();
+    		populateObject(info);
+    		return info;
+    }
+
+    
+    protected void populateObject(Object object) throws Exception {
+    		super.populateObject(object);
+    		ConsumerControl info = (ConsumerControl) object;
+        info.setClose(true);
+        info.setConsumerId(createConsumerId("ConsumerId:1"));
+        info.setPrefetch(1);
+
+            }
+        }

Propchange: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerControlTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Concurrent.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Concurrent.h?rev=419365&r1=419364&r2=419365&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Concurrent.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Concurrent.h Wed Jul  5 15:27:34 2006
@@ -1,62 +1,62 @@
-/*
- * 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_CONCURRENT_CONCURRENT_H_
-#define _ACTIVEMQ_CONCURRENT_CONCURRENT_H_
-
-#include <activemq/concurrent/Lock.h>
-
-namespace activemq{
-namespace concurrent{
-
-/**
- * The synchronized macro defines a mechanism for snycronizing
- * a scetion of code.  The macro must be passed an object that
- * implements the Syncronizable interface.
- * 
- * The macro works by creating a for loop that will loop exactly
- * once, creating a Lock object that is scoped to the loop.  Once
- * the loop conpletes and exits the Lock object goes out of scope
- * releasing the lock on object W.  For added safety the if else
- * is used because not all compiles restrict the lifetime of 
- * loop variables to the loop, they will however restrict them
- * to the scope of the else.
- * 
- * The macro would be used as follows.
- * 
- * <Syncronizable> X;
- * 
- * somefunction()
- * {
- *    syncronized(X)
- *    {
- *       // Do something that needs syncronizing.
- *    }
- * }
- */
-
-#define WAIT_INFINITE  0xFFFFFFFF
-
-#define synchronized(W)                                                     \
-      if(false){}                                                           \
-      else                                                                  \
-      for(activemq::concurrent::Lock lock_W(W);                                                    \
-          lock_W.isLocked(); lock_W.unlock())
-
-}}
-
-#endif /*_ACTIVEMQ_CONCURRENT_CONCURRENT_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_CONCURRENT_CONCURRENT_H_
+#define _ACTIVEMQ_CONCURRENT_CONCURRENT_H_
+
+#include <activemq/concurrent/Lock.h>
+
+namespace activemq{
+namespace concurrent{
+
+/**
+ * The synchronized macro defines a mechanism for snycronizing
+ * a scetion of code.  The macro must be passed an object that
+ * implements the Syncronizable interface.
+ * 
+ * The macro works by creating a for loop that will loop exactly
+ * once, creating a Lock object that is scoped to the loop.  Once
+ * the loop conpletes and exits the Lock object goes out of scope
+ * releasing the lock on object W.  For added safety the if else
+ * is used because not all compiles restrict the lifetime of 
+ * loop variables to the loop, they will however restrict them
+ * to the scope of the else.
+ * 
+ * The macro would be used as follows.
+ * 
+ * <Syncronizable> X;
+ * 
+ * somefunction()
+ * {
+ *    syncronized(X)
+ *    {
+ *       // Do something that needs syncronizing.
+ *    }
+ * }
+ */
+
+#define WAIT_INFINITE  0xFFFFFFFF
+
+#define synchronized(W)                                                     \
+      if(false){}                                                           \
+      else                                                                  \
+      for(activemq::concurrent::Lock lock_W(W);                                                    \
+          lock_W.isLocked(); lock_W.unlock())
+
+}}
+
+#endif /*_ACTIVEMQ_CONCURRENT_CONCURRENT_H_*/

Propchange: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Concurrent.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Lock.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp?rev=419365&r1=419364&r2=419365&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp Wed Jul  5 15:27:34 2006
@@ -1,21 +1,21 @@
-/*
- * 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 <activemq/concurrent/Mutex.h>
-
-using namespace activemq::concurrent;
-
-////////////////////////////////////////////////////////////////////////////////
+/*
+ * 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 <activemq/concurrent/Mutex.h>
+
+using namespace activemq::concurrent;
+
+////////////////////////////////////////////////////////////////////////////////

Propchange: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h?rev=419365&r1=419364&r2=419365&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h Wed Jul  5 15:27:34 2006
@@ -1,358 +1,358 @@
-/*
- * 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_CONCURRENT_MUTEX_H
-#define ACTIVEMQ_CONCURRENT_MUTEX_H
-
-// Includes.
-#include <activemq/concurrent/Synchronizable.h>
-#include <activemq/concurrent/Concurrent.h>
-#include <activemq/concurrent/Thread.h>
-#include <list>
-
-#if (defined(__unix__) || defined(unix) || defined(MACOSX)) && !defined(USG)
-    #ifndef unix
-        #define unix
-    #endif
-   
-    #include <pthread.h>
-    #include <sys/time.h>
-#endif
-
-#if defined(WIN32) || defined(__CYGWIN__) && !defined unix
-   
-    #include <windows.h>
-   
-    #if ( !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0400)
-    #if ( !defined(WINVER) || WINVER < 0x0400)
-        #pragma message ("Unsupported platform, Windows NT 4.0 or later required")
-    #endif
-    #endif
-
-#endif
-
-#include <assert.h>
-
-namespace activemq{
-namespace concurrent{
-    
-    /**
-     * Creates a pthread_mutex_t object. The object is created
-     * such that successive locks from the same thread is allowed
-     * and will be successful.
-     * @see  pthread_mutex_t
-     */
-    class Mutex : public Synchronizable
-    {
-    private:       // Data
-
-        /**
-         * The mutex object.
-         */
-        #ifdef unix
-            pthread_mutex_t mutex;
-
-            std::list<pthread_cond_t*> eventQ;
-        #else
-            CRITICAL_SECTION mutex;
-
-            std::list<HANDLE> eventQ;
-        #endif
-      
-        // Lock Status Members
-        int           lock_count;
-        unsigned long lock_owner;
-
-    public:
-
-        /**
-         * Constructor - creates and initializes the mutex.
-         */
-        Mutex()
-        {
-            #ifdef unix
-                pthread_mutexattr_t attr;
-                pthread_mutexattr_init(&attr);
-                pthread_mutex_init(&mutex, &attr);
-                pthread_mutexattr_destroy(&attr);
-            #else
-                InitializeCriticalSection(&mutex);            
-            #endif
-          
-            lock_owner = 0;
-            lock_count = 0;
-        }
-      
-        /**
-         * Destructor - destroys the mutex object.
-         */
-        virtual ~Mutex()
-        {
-            // Unlock the mutex.
-            unlock();
-      
-            #ifdef unix
-                pthread_mutex_destroy(&mutex);
-            #else
-                DeleteCriticalSection(&mutex);
-            #endif
-        }
-      
-        /**
-         * Locks the object.
-         */
-        virtual void lock() throw( exceptions::ActiveMQException )
-        {
-            if(isLockOwner())
-            {
-                lock_count++;
-            }
-            else
-            {
-                #ifdef unix               
-                    pthread_mutex_lock(&mutex);
-                #else
-                    EnterCriticalSection(&mutex);
-                #endif
-
-                lock_count = 1;
-                lock_owner = Thread::getId();
-            }         
-        }
-      
-        /**
-         * Unlocks the object.
-         */
-        virtual void unlock() throw( exceptions::ActiveMQException )
-        {
-            if(lock_owner == 0)
-            {
-                return;
-            }
-         
-            if(!isLockOwner())
-            {
-                throw exceptions::ActiveMQException( 
-                    __FILE__, __LINE__,
-                    "Mutex::unlock - Failed, not Lock Owner!" );
-            }
-         
-            lock_count--;
-         
-            if(lock_count == 0)
-            {         
-                lock_owner = 0;
-
-                #ifdef unix
-                    pthread_mutex_unlock(&mutex);
-                #else
-                    LeaveCriticalSection(&mutex);
-                #endif            
-            }
-        }
-      
-        /**
-         * Waits on a signal from this object, which is generated
-         * by a call to Notify.
-         */
-        virtual void wait() throw( exceptions::ActiveMQException )
-        {
-            // Delegate to the timed version
-            wait( WAIT_INFINITE );
-        }
-
-        /**
-         * Waits on a signal from this object, which is generated
-         * by a call to Notify.  Must have this object locked before
-         * calling.  This wait will timeout after the specified time
-         * interval.
-         */
-        virtual void wait( unsigned long millisecs ) 
-            throw( exceptions::ActiveMQException )
-        {
-            if(!isLockOwner())
-            {
-                throw exceptions::ActiveMQException( 
-                    __FILE__, __LINE__,
-                    "Mutex::wait - Failed, not Lock Owner!");
-            }
-
-            // Save the current owner and Lock count as we are going to 
-            // unlock and release for someone else to lock on potentially.
-            // When we come back and re-lock we want to restore to the 
-            // state we were in before.
-            unsigned long lock_owner = this->lock_owner;
-            int           lock_count = this->lock_count;
-
-            this->lock_count = 0;
-            this->lock_owner = 0;
-         
-            #ifdef unix
-
-                // Create this threads wait event
-                pthread_cond_t waitEvent;
-                pthread_cond_init(&waitEvent, NULL);
-            
-                // Store the event in the queue so that a notify can
-                // call it and wake up the thread.
-                eventQ.push_back(&waitEvent);
-
-                int returnValue = 0;
-                if(millisecs != WAIT_INFINITE)
-                {
-                    timeval now = {};
-                    gettimeofday(&now, NULL);
-               
-                    timespec wait = {};
-                    wait.tv_sec = now.tv_sec + (millisecs / 1000);
-                    wait.tv_nsec = (now.tv_usec * 1000) + ((millisecs % 1000) * 1000000);
-               
-                    if(wait.tv_nsec > 1000000000)
-                    {
-                        wait.tv_sec++;
-                        wait.tv_nsec -= 1000000000;
-                    }
-
-                    returnValue =  pthread_cond_timedwait(&waitEvent, &mutex, &wait);
-                }
-                else
-                {
-                    returnValue = pthread_cond_wait(&waitEvent, &mutex);
-                }
-
-                // If the wait did not succeed for any reason, remove it
-                // from the queue.
-                if( returnValue != 0 ){
-                    std::list<pthread_cond_t*>::iterator iter = eventQ.begin();
-                    for( ; iter != eventQ.end(); ++iter ){
-                        if( *iter == &waitEvent ){
-                            eventQ.erase(iter);
-                            break;
-                        }
-                    }
-                }
-                
-                // Destroy our wait event now, the notify method will have removed it
-                // from the event queue.
-                pthread_cond_destroy(&waitEvent);
-
-            #else
-
-                // Create the event to wait on
-                HANDLE waitEvent = CreateEvent( NULL, false, false, NULL );
-            
-                if(waitEvent == NULL)
-                {
-                    throw exceptions::ActiveMQException( 
-                        __FILE__, __LINE__,
-                        "Mutex::Mutex - Failed Creating Event." );
-                }
-
-                eventQ.push_back( waitEvent );
-
-                // Release the Lock
-                LeaveCriticalSection( &mutex );
-
-                // Wait for a signal
-                WaitForSingleObject( waitEvent, millisecs );
-
-                // Reaquire the Lock
-                EnterCriticalSection( &mutex );
-
-                // Clean up the event, the notif methods will have
-                // already poped it from the queue.
-                CloseHandle( waitEvent );
-            
-            #endif
-         
-            // restore the owner
-            this->lock_owner = lock_owner;
-            this->lock_count = lock_count;
-        }
-      
-        /**
-         * Signals a waiter on this object that it can now wake
-         * up and continue.
-         */
-        virtual void notify() throw( exceptions::ActiveMQException )
-        {
-            if( !isLockOwner() )
-            {
-                throw exceptions::ActiveMQException( 
-                    __FILE__, __LINE__,
-                    "Mutex::Notify - Failed, not Lock Owner!" );
-            }
-
-            if( !eventQ.empty() )
-            {
-                #ifdef unix
-                    pthread_cond_signal( eventQ.front() );
-                    eventQ.pop_front();
-                #else
-                    SetEvent( eventQ.front() );
-                    eventQ.pop_front();
-                #endif
-            }
-        }
-
-        /**
-         * Signals the waiters on this object that it can now wake
-         * up and continue.
-         */
-        virtual void notifyAll() throw( exceptions::ActiveMQException )
-        {
-            if(!isLockOwner())
-            {
-                throw exceptions::ActiveMQException( 
-                    __FILE__, __LINE__,
-                    "Mutex::NotifyAll - Failed, not Lock Owner!" );
-            }
-         
-            #ifdef unix
-
-                while(!eventQ.empty())
-                {
-                     pthread_cond_signal( eventQ.front() );
-                     eventQ.pop_front();
-                }
-
-            #else
-
-                while(!eventQ.empty())
-                {
-                     SetEvent( eventQ.front() );
-                     eventQ.pop_front();
-                }
-
-            #endif
-        }
-
-    private:
-   
-        /**
-         * Check if the calling thread is the Lock Owner
-         */
-        bool isLockOwner()
-        {
-            return lock_owner == Thread::getId();
-        }
-      
-    };
-
-}}
-
-#endif // ACTIVEMQ_CONCURRENT_MUTEX_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_CONCURRENT_MUTEX_H
+#define ACTIVEMQ_CONCURRENT_MUTEX_H
+
+// Includes.
+#include <activemq/concurrent/Synchronizable.h>
+#include <activemq/concurrent/Concurrent.h>
+#include <activemq/concurrent/Thread.h>
+#include <list>
+
+#if (defined(__unix__) || defined(unix) || defined(MACOSX)) && !defined(USG)
+    #ifndef unix
+        #define unix
+    #endif
+   
+    #include <pthread.h>
+    #include <sys/time.h>
+#endif
+
+#if defined(WIN32) || defined(__CYGWIN__) && !defined unix
+   
+    #include <windows.h>
+   
+    #if ( !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0400)
+    #if ( !defined(WINVER) || WINVER < 0x0400)
+        #pragma message ("Unsupported platform, Windows NT 4.0 or later required")
+    #endif
+    #endif
+
+#endif
+
+#include <assert.h>
+
+namespace activemq{
+namespace concurrent{
+    
+    /**
+     * Creates a pthread_mutex_t object. The object is created
+     * such that successive locks from the same thread is allowed
+     * and will be successful.
+     * @see  pthread_mutex_t
+     */
+    class Mutex : public Synchronizable
+    {
+    private:       // Data
+
+        /**
+         * The mutex object.
+         */
+        #ifdef unix
+            pthread_mutex_t mutex;
+
+            std::list<pthread_cond_t*> eventQ;
+        #else
+            CRITICAL_SECTION mutex;
+
+            std::list<HANDLE> eventQ;
+        #endif
+      
+        // Lock Status Members
+        int           lock_count;
+        unsigned long lock_owner;
+
+    public:
+
+        /**
+         * Constructor - creates and initializes the mutex.
+         */
+        Mutex()
+        {
+            #ifdef unix
+                pthread_mutexattr_t attr;
+                pthread_mutexattr_init(&attr);
+                pthread_mutex_init(&mutex, &attr);
+                pthread_mutexattr_destroy(&attr);
+            #else
+                InitializeCriticalSection(&mutex);            
+            #endif
+          
+            lock_owner = 0;
+            lock_count = 0;
+        }
+      
+        /**
+         * Destructor - destroys the mutex object.
+         */
+        virtual ~Mutex()
+        {
+            // Unlock the mutex.
+            unlock();
+      
+            #ifdef unix
+                pthread_mutex_destroy(&mutex);
+            #else
+                DeleteCriticalSection(&mutex);
+            #endif
+        }
+      
+        /**
+         * Locks the object.
+         */
+        virtual void lock() throw( exceptions::ActiveMQException )
+        {
+            if(isLockOwner())
+            {
+                lock_count++;
+            }
+            else
+            {
+                #ifdef unix               
+                    pthread_mutex_lock(&mutex);
+                #else
+                    EnterCriticalSection(&mutex);
+                #endif
+
+                lock_count = 1;
+                lock_owner = Thread::getId();
+            }         
+        }
+      
+        /**
+         * Unlocks the object.
+         */
+        virtual void unlock() throw( exceptions::ActiveMQException )
+        {
+            if(lock_owner == 0)
+            {
+                return;
+            }
+         
+            if(!isLockOwner())
+            {
+                throw exceptions::ActiveMQException( 
+                    __FILE__, __LINE__,
+                    "Mutex::unlock - Failed, not Lock Owner!" );
+            }
+         
+            lock_count--;
+         
+            if(lock_count == 0)
+            {         
+                lock_owner = 0;
+
+                #ifdef unix
+                    pthread_mutex_unlock(&mutex);
+                #else
+                    LeaveCriticalSection(&mutex);
+                #endif            
+            }
+        }
+      
+        /**
+         * Waits on a signal from this object, which is generated
+         * by a call to Notify.
+         */
+        virtual void wait() throw( exceptions::ActiveMQException )
+        {
+            // Delegate to the timed version
+            wait( WAIT_INFINITE );
+        }
+
+        /**
+         * Waits on a signal from this object, which is generated
+         * by a call to Notify.  Must have this object locked before
+         * calling.  This wait will timeout after the specified time
+         * interval.
+         */
+        virtual void wait( unsigned long millisecs ) 
+            throw( exceptions::ActiveMQException )
+        {
+            if(!isLockOwner())
+            {
+                throw exceptions::ActiveMQException( 
+                    __FILE__, __LINE__,
+                    "Mutex::wait - Failed, not Lock Owner!");
+            }
+
+            // Save the current owner and Lock count as we are going to 
+            // unlock and release for someone else to lock on potentially.
+            // When we come back and re-lock we want to restore to the 
+            // state we were in before.
+            unsigned long lock_owner = this->lock_owner;
+            int           lock_count = this->lock_count;
+
+            this->lock_count = 0;
+            this->lock_owner = 0;
+         
+            #ifdef unix
+
+                // Create this threads wait event
+                pthread_cond_t waitEvent;
+                pthread_cond_init(&waitEvent, NULL);
+            
+                // Store the event in the queue so that a notify can
+                // call it and wake up the thread.
+                eventQ.push_back(&waitEvent);
+
+                int returnValue = 0;
+                if(millisecs != WAIT_INFINITE)
+                {
+                    timeval now = {};
+                    gettimeofday(&now, NULL);
+               
+                    timespec wait = {};
+                    wait.tv_sec = now.tv_sec + (millisecs / 1000);
+                    wait.tv_nsec = (now.tv_usec * 1000) + ((millisecs % 1000) * 1000000);
+               
+                    if(wait.tv_nsec > 1000000000)
+                    {
+                        wait.tv_sec++;
+                        wait.tv_nsec -= 1000000000;
+                    }
+
+                    returnValue =  pthread_cond_timedwait(&waitEvent, &mutex, &wait);
+                }
+                else
+                {
+                    returnValue = pthread_cond_wait(&waitEvent, &mutex);
+                }
+
+                // If the wait did not succeed for any reason, remove it
+                // from the queue.
+                if( returnValue != 0 ){
+                    std::list<pthread_cond_t*>::iterator iter = eventQ.begin();
+                    for( ; iter != eventQ.end(); ++iter ){
+                        if( *iter == &waitEvent ){
+                            eventQ.erase(iter);
+                            break;
+                        }
+                    }
+                }
+                
+                // Destroy our wait event now, the notify method will have removed it
+                // from the event queue.
+                pthread_cond_destroy(&waitEvent);
+
+            #else
+
+                // Create the event to wait on
+                HANDLE waitEvent = CreateEvent( NULL, false, false, NULL );
+            
+                if(waitEvent == NULL)
+                {
+                    throw exceptions::ActiveMQException( 
+                        __FILE__, __LINE__,
+                        "Mutex::Mutex - Failed Creating Event." );
+                }
+
+                eventQ.push_back( waitEvent );
+
+                // Release the Lock
+                LeaveCriticalSection( &mutex );
+
+                // Wait for a signal
+                WaitForSingleObject( waitEvent, millisecs );
+
+                // Reaquire the Lock
+                EnterCriticalSection( &mutex );
+
+                // Clean up the event, the notif methods will have
+                // already poped it from the queue.
+                CloseHandle( waitEvent );
+            
+            #endif
+         
+            // restore the owner
+            this->lock_owner = lock_owner;
+            this->lock_count = lock_count;
+        }
+      
+        /**
+         * Signals a waiter on this object that it can now wake
+         * up and continue.
+         */
+        virtual void notify() throw( exceptions::ActiveMQException )
+        {
+            if( !isLockOwner() )
+            {
+                throw exceptions::ActiveMQException( 
+                    __FILE__, __LINE__,
+                    "Mutex::Notify - Failed, not Lock Owner!" );
+            }
+
+            if( !eventQ.empty() )
+            {
+                #ifdef unix
+                    pthread_cond_signal( eventQ.front() );
+                    eventQ.pop_front();
+                #else
+                    SetEvent( eventQ.front() );
+                    eventQ.pop_front();
+                #endif
+            }
+        }
+
+        /**
+         * Signals the waiters on this object that it can now wake
+         * up and continue.
+         */
+        virtual void notifyAll() throw( exceptions::ActiveMQException )
+        {
+            if(!isLockOwner())
+            {
+                throw exceptions::ActiveMQException( 
+                    __FILE__, __LINE__,
+                    "Mutex::NotifyAll - Failed, not Lock Owner!" );
+            }
+         
+            #ifdef unix
+
+                while(!eventQ.empty())
+                {
+                     pthread_cond_signal( eventQ.front() );
+                     eventQ.pop_front();
+                }
+
+            #else
+
+                while(!eventQ.empty())
+                {
+                     SetEvent( eventQ.front() );
+                     eventQ.pop_front();
+                }
+
+            #endif
+        }
+
+    private:
+   
+        /**
+         * Check if the calling thread is the Lock Owner
+         */
+        bool isLockOwner()
+        {
+            return lock_owner == Thread::getId();
+        }
+      
+    };
+
+}}
+
+#endif // ACTIVEMQ_CONCURRENT_MUTEX_H

Propchange: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/Mutex.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/PooledThread.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/PooledThread.cpp?rev=419365&r1=419364&r2=419365&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/PooledThread.cpp (original)
+++ incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/PooledThread.cpp Wed Jul  5 15:27:34 2006
@@ -1,161 +1,161 @@
-/*
- * 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 <activemq/concurrent/PooledThread.h>
-#include <activemq/concurrent/ThreadPool.h>
-#include <activemq/concurrent/TaskListener.h>
-#include <activemq/exceptions/IllegalArgumentException.h>
-
-#include <iostream>
-
-using namespace activemq;
-using namespace activemq::concurrent;
-
-////////////////////////////////////////////////////////////////////////////////
-LOGCMS_INITIALIZE(logger, PooledThread, "com.activemq.concurrent.PooledThread");
-
-////////////////////////////////////////////////////////////////////////////////
-PooledThread::PooledThread(ThreadPool* pool)
-{
-   if(pool == NULL)
-   {
-      throw exceptions::IllegalArgumentException( __FILE__, __LINE__, 
-        "PooledThread::PooledThread");
-   }
-   
-   busy = false;
-   done = false;
-
-   listener = NULL;
-   
-   // Store our Pool.
-   this->pool = pool;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-PooledThread::~PooledThread()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void PooledThread::run(void) 
-{
-   ThreadPool::Task task;
-
-   try
-   {
-      while(!done)
-      {
-         //LOGCMS_DEBUG(logger, "PooledThread::run - Entering deQ");
-
-         // Blocks until there something to be done
-         task = pool->deQueueTask();
-
-         //LOGCMS_DEBUG(logger, "PooledThread::run - Exited deQ");
-         
-         // Check if the Done Flag is set, in case it happened while we
-         // were waiting for a task
-         if(done)
-         {
-            break;
-         }
-         
-         // If we got here and the runnable was null then something
-         // bad must have happened.  Throw an Exception and bail.
-         if(!task.first)
-         {
-            throw exceptions::ActiveMQException( __FILE__, __LINE__, 
-               "PooledThread::run - Retrieive NULL task from Pool.");
-         }
-                  
-         // Got some work to do, so set flag to busy
-         busy = true;
-         
-         // Inform a listener that we are going to start
-         if(listener)
-         {
-            /*LOGCMS_DEBUG(logger, 
-               "PooledThread::run - Inform Listener we are starting");*/
-            listener->onTaskStarted(this);
-         }
-         
-         // Perform the work
-         task.first->run();
-         
-         /*LOGCMS_DEBUG(logger, 
-            "PooledThread::run - Inform Task Listener we are done");*/
-
-         // Notify the Task listener that we are done
-         task.second->onTaskComplete(task.first);
-
-         // Inform a listener that we are going to stop and wait
-         // for a new task
-         if(listener)
-         {
-            /*LOGCMS_DEBUG(logger, 
-               "PooledThread::run - Inform Listener we are done");*/
-            listener->onTaskCompleted(this);
-         }
-
-         // Set flag to inactive, we will wait for work
-         busy = false;   
-      }
-   }
-   catch(exceptions::ActiveMQException& ex)
-   {
-      ex.setMark( __FILE__, __LINE__ );
-      
-      // Notify the Task owner
-      if(task.first && task.second)
-      {
-         task.second->onTaskException(task.first, ex);
-      }
-
-      busy = false;
-      
-      // Notify the PooledThreadListener
-      if(listener)
-      {
-         listener->onTaskException(this, ex);
-      }
-   }
-   catch(...)
-   {
-      exceptions::ActiveMQException ex(
-         __FILE__, __LINE__, 
-         "PooledThread::run - Caught Unknown Exception");
-         
-      // Notify the Task owner
-      if(task.first && task.second)
-      {
-         task.second->onTaskException(task.first, ex);
-      }
-
-      busy = false;
-
-      // Notify the PooledThreadListener
-      if(listener)
-      {
-         listener->onTaskException(this, ex);
-      }
-   }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-void PooledThread::stop(void) throw ( cms::CMSException )
-{
-   done = true;
-}
+/*
+ * 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 <activemq/concurrent/PooledThread.h>
+#include <activemq/concurrent/ThreadPool.h>
+#include <activemq/concurrent/TaskListener.h>
+#include <activemq/exceptions/IllegalArgumentException.h>
+
+#include <iostream>
+
+using namespace activemq;
+using namespace activemq::concurrent;
+
+////////////////////////////////////////////////////////////////////////////////
+LOGCMS_INITIALIZE(logger, PooledThread, "com.activemq.concurrent.PooledThread");
+
+////////////////////////////////////////////////////////////////////////////////
+PooledThread::PooledThread(ThreadPool* pool)
+{
+   if(pool == NULL)
+   {
+      throw exceptions::IllegalArgumentException( __FILE__, __LINE__, 
+        "PooledThread::PooledThread");
+   }
+   
+   busy = false;
+   done = false;
+
+   listener = NULL;
+   
+   // Store our Pool.
+   this->pool = pool;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+PooledThread::~PooledThread()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void PooledThread::run(void) 
+{
+   ThreadPool::Task task;
+
+   try
+   {
+      while(!done)
+      {
+         //LOGCMS_DEBUG(logger, "PooledThread::run - Entering deQ");
+
+         // Blocks until there something to be done
+         task = pool->deQueueTask();
+
+         //LOGCMS_DEBUG(logger, "PooledThread::run - Exited deQ");
+         
+         // Check if the Done Flag is set, in case it happened while we
+         // were waiting for a task
+         if(done)
+         {
+            break;
+         }
+         
+         // If we got here and the runnable was null then something
+         // bad must have happened.  Throw an Exception and bail.
+         if(!task.first)
+         {
+            throw exceptions::ActiveMQException( __FILE__, __LINE__, 
+               "PooledThread::run - Retrieive NULL task from Pool.");
+         }
+                  
+         // Got some work to do, so set flag to busy
+         busy = true;
+         
+         // Inform a listener that we are going to start
+         if(listener)
+         {
+            /*LOGCMS_DEBUG(logger, 
+               "PooledThread::run - Inform Listener we are starting");*/
+            listener->onTaskStarted(this);
+         }
+         
+         // Perform the work
+         task.first->run();
+         
+         /*LOGCMS_DEBUG(logger, 
+            "PooledThread::run - Inform Task Listener we are done");*/
+
+         // Notify the Task listener that we are done
+         task.second->onTaskComplete(task.first);
+
+         // Inform a listener that we are going to stop and wait
+         // for a new task
+         if(listener)
+         {
+            /*LOGCMS_DEBUG(logger, 
+               "PooledThread::run - Inform Listener we are done");*/
+            listener->onTaskCompleted(this);
+         }
+
+         // Set flag to inactive, we will wait for work
+         busy = false;   
+      }
+   }
+   catch(exceptions::ActiveMQException& ex)
+   {
+      ex.setMark( __FILE__, __LINE__ );
+      
+      // Notify the Task owner
+      if(task.first && task.second)
+      {
+         task.second->onTaskException(task.first, ex);
+      }
+
+      busy = false;
+      
+      // Notify the PooledThreadListener
+      if(listener)
+      {
+         listener->onTaskException(this, ex);
+      }
+   }
+   catch(...)
+   {
+      exceptions::ActiveMQException ex(
+         __FILE__, __LINE__, 
+         "PooledThread::run - Caught Unknown Exception");
+         
+      // Notify the Task owner
+      if(task.first && task.second)
+      {
+         task.second->onTaskException(task.first, ex);
+      }
+
+      busy = false;
+
+      // Notify the PooledThreadListener
+      if(listener)
+      {
+         listener->onTaskException(this, ex);
+      }
+   }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void PooledThread::stop(void) throw ( cms::CMSException )
+{
+   done = true;
+}

Propchange: incubator/activemq/trunk/activemq-cpp/src/main/activemq/concurrent/PooledThread.cpp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message