activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r593309 [1/8] - in /activemq/activemq-cpp/trunk/src: examples/ examples/consumers/ examples/producers/ main/ main/activemq/concurrent/ main/activemq/connector/ main/activemq/connector/openwire/ main/activemq/connector/openwire/marshal/ main...
Date Thu, 08 Nov 2007 21:02:22 GMT
Author: tabish
Date: Thu Nov  8 13:02:02 2007
New Revision: 593309

URL: http://svn.apache.org/viewvc?rev=593309&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Removed:
    activemq/activemq-cpp/trunk/src/main/activemq/concurrent/
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/IllegalArgumentException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/IllegalMonitorStateException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/IllegalStateException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/IndexOutOfBoundsException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/InterruptedException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/InvalidStateException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/NoSuchElementException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/NullPointerException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/RuntimeException.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/UnsupportedOperationException.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/BlockingByteArrayInputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/BlockingByteArrayInputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/BufferedInputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/BufferedInputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/BufferedOutputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/BufferedOutputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/ByteArrayInputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/ByteArrayInputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/ByteArrayOutputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/ByteArrayOutputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/DataInputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/DataInputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/DataOutputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/DataOutputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/EOFException.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/FilterInputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/FilterOutputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/IOException.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/InputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/OutputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/Reader.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/StandardErrorOutputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/Writer.h
    activemq/activemq-cpp/trunk/src/main/activemq/logger/
    activemq/activemq-cpp/trunk/src/main/activemq/network/
    activemq/activemq-cpp/trunk/src/main/activemq/util/Boolean.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Character.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Date.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/Date.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Guid.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/Guid.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Integer.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Iterator.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Long.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Map.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Math.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/Math.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Number.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Properties.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Queue.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Random.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/Random.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/Set.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/StringTokenizer.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/StringTokenizer.h
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/io/
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/MapBenchmark.cpp
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/MapBenchmark.h
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/PropertiesBenchmark.cpp
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/PropertiesBenchmark.h
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/QueueBenchmark.cpp
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/QueueBenchmark.h
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/SetBenchmark.cpp
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/SetBenchmark.h
    activemq/activemq-cpp/trunk/src/test/activemq/concurrent/
    activemq/activemq-cpp/trunk/src/test/activemq/io/
    activemq/activemq-cpp/trunk/src/test/activemq/logger/
    activemq/activemq-cpp/trunk/src/test/activemq/network/
    activemq/activemq-cpp/trunk/src/test/activemq/util/BooleanTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/BooleanTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/DateTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/DateTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/Endian.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/Endian.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/GuidTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/GuidTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/IntegerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/IntegerTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/LongTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/LongTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/MapTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/MapTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/QueueTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/QueueTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/RandomTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/RandomTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/SetTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/SetTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/StringTokenizerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/util/StringTokenizerTest.h
Modified:
    activemq/activemq-cpp/trunk/src/examples/consumers/SimpleAsyncConsumer.cpp
    activemq/activemq-cpp/trunk/src/examples/main.cpp
    activemq/activemq-cpp/trunk/src/examples/producers/SimpleProducer.cpp
    activemq/activemq-cpp/trunk/src/main/Makefile.am
    activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/Connector.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/ConnectorFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatNegotiator.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireResponseBuilder.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/DataStreamMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/MarshalAware.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/marshal/PrimitiveMapMarshaller.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/utils/BooleanStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/utils/BooleanStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/utils/HexTable.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/utils/HexTable.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/utils/OpenwireStringSupport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/utils/OpenwireStringSupport.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandReader.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandReader.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandWriter.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompCommandWriter.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnectionNegotiator.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnectionNegotiator.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnector.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnector.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnectorFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompConnectorFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompDestination.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompFrame.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompResponseBuilder.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompSessionManager.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/StompSessionManager.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/AbstractCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/CommandConstants.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/CommandConstants.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/ConnectCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/StompCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/StompMessage.h
    activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/SubscribeCommand.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnection.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionData.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConnectionFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConstants.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConsumer.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQConsumer.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQProducer.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSession.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQSessionExecutor.h
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransaction.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/core/ActiveMQTransaction.h
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/ActiveMQException.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/exceptions/ActiveMQException.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/LoggingInputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/LoggingInputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/io/LoggingOutputStream.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/io/LoggingOutputStream.h
    activemq/activemq-cpp/trunk/src/main/activemq/support/InitDirector.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/CommandIOException.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/CommandReader.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/CommandWriter.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/IOTransport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/IOTransport.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/IOTransportFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/IOTransportFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransport.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/MockTransportFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/Transport.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/TransportBuilder.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/TransportBuilder.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/TransportFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/TransportFilter.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/AsyncSendTransport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/AsyncSendTransport.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/AsyncSendTransportFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/AsyncSendTransportFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/FutureResponse.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/LoggingTransport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/LoggingTransport.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/LoggingTransportFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/LoggingTransportFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/ResponseCorrelator.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/ResponseCorrelator.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/ResponseCorrelatorFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/ResponseCorrelatorFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransport.h
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/transport/filters/TcpTransportFactory.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/ActiveMQProperties.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/LongSequenceGenerator.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/PrimitiveMap.h
    activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.cpp
    activemq/activemq-cpp/trunk/src/main/activemq/util/URISupport.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormat.h
    activemq/activemq-cpp/trunk/src/main/activemq/wireformat/WireFormatFactory.h
    activemq/activemq-cpp/trunk/src/test-benchmarks/activemq/util/PrimitiveMapBenchmark.cpp
    activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/BenchmarkBase.h
    activemq/activemq-cpp/trunk/src/test-benchmarks/benchmark/PerformanceTimer.cpp
    activemq/activemq-cpp/trunk/src/test-benchmarks/testRegistry.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.h
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireAsyncSenderTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.h
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.h
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.h
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/AsyncSenderTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.h
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.h
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp
    activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp
    activemq/activemq-cpp/trunk/src/test/Makefile.am
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/OpenWireFormatTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQBytesMessageTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQDestinationTest2.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQQueueTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempQueueTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTempTopicTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/commands/ActiveMQTopicTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/BaseDataStreamMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQBytesMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMapMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQObjectMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQQueueMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ControlCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DataResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/FlushCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTraceMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/KeepAliveInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/LastPartialCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/LocalTransactionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessageAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessageDispatchMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessageDispatchNotificationMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessageIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/MessagePullMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/NetworkBridgeFilterMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/PartialCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ProducerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ProducerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/RemoveInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/RemoveSubscriptionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ReplayCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/SessionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/SessionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/ShutdownInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/SubscriptionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/TransactionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/WireFormatInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v1/XATransactionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQBytesMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQMapMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQObjectMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQQueueMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQStreamMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQTempQueueMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQTempTopicMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQTextMessageMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ActiveMQTopicMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/BrokerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/BrokerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConnectionControlMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConnectionErrorMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConnectionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConnectionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConsumerControlMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConsumerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ConsumerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ControlCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DataArrayResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DataResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DestinationInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/DiscoveryEventMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ExceptionResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/FlushCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/IntegerResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalQueueAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTopicAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTraceMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/JournalTransactionMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/KeepAliveInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LastPartialCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/LocalTransactionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageAckMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageDispatchNotificationMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessageIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/MessagePullMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/NetworkBridgeFilterMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/PartialCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ProducerInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/RemoveSubscriptionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ReplayCommandMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ResponseMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SessionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/ShutdownInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/SubscriptionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/TransactionInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/WireFormatInfoMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/marshal/v2/XATransactionIdMarshallerTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/BooleanStreamTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/openwire/utils/OpenwireStringSupportTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandReaderTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompCommandWriterTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/StompConnectorTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionFactoryTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQConnectionTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.cpp
    activemq/activemq-cpp/trunk/src/test/activemq/core/ActiveMQSessionTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/transport/IOTransportTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/transport/filters/ResponseCorrelatorTest.h
    activemq/activemq-cpp/trunk/src/test/activemq/util/URISupportTest.cpp

Modified: activemq/activemq-cpp/trunk/src/examples/consumers/SimpleAsyncConsumer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/examples/consumers/SimpleAsyncConsumer.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/examples/consumers/SimpleAsyncConsumer.cpp (original)
+++ activemq/activemq-cpp/trunk/src/examples/consumers/SimpleAsyncConsumer.cpp Thu Nov  8 13:02:02 2007
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-#include <activemq/concurrent/Thread.h>
-#include <activemq/concurrent/Runnable.h>
-#include <activemq/concurrent/CountDownLatch.h>
+#include <decaf/lang/Thread.h>
+#include <decaf/lang/Runnable.h>
+#include <decaf/util/concurrent/CountDownLatch.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
-#include <activemq/util/Integer.h>
+#include <decaf/lang/Integer.h>
 #include <activemq/util/Config.h>
-#include <activemq/util/Date.h>
+#include <decaf/util/Date.h>
 #include <cms/Connection.h>
 #include <cms/Session.h>
 #include <cms/TextMessage.h>
@@ -35,7 +35,7 @@
 using namespace activemq;
 using namespace activemq::core;
 using namespace activemq::util;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 using namespace cms;
 using namespace std;
 

Modified: activemq/activemq-cpp/trunk/src/examples/main.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/examples/main.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/examples/main.cpp (original)
+++ activemq/activemq-cpp/trunk/src/examples/main.cpp Thu Nov  8 13:02:02 2007
@@ -17,13 +17,13 @@
 
 // START SNIPPET: demo
 
-#include <activemq/concurrent/Thread.h>
-#include <activemq/concurrent/Runnable.h>
-#include <activemq/concurrent/CountDownLatch.h>
+#include <decaf/lang/Thread.h>
+#include <decaf/lang/Runnable.h>
+#include <decaf/util/concurrent/CountDownLatch.h>
+#include <decaf/lang/Integer.h>
+#include <decaf/util/Date.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
-#include <activemq/util/Integer.h>
 #include <activemq/util/Config.h>
-#include <activemq/util/Date.h>
 #include <cms/Connection.h>
 #include <cms/Session.h>
 #include <cms/TextMessage.h>
@@ -36,7 +36,8 @@
 
 using namespace activemq::core;
 using namespace activemq::util;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
+using namespace decaf::util;
 using namespace cms;
 using namespace std;
 

Modified: activemq/activemq-cpp/trunk/src/examples/producers/SimpleProducer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/examples/producers/SimpleProducer.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/examples/producers/SimpleProducer.cpp (original)
+++ activemq/activemq-cpp/trunk/src/examples/producers/SimpleProducer.cpp Thu Nov  8 13:02:02 2007
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-#include <activemq/concurrent/Thread.h>
-#include <activemq/concurrent/Runnable.h>
-#include <activemq/concurrent/CountDownLatch.h>
+#include <decaf/lang/Thread.h>
+#include <decaf/lang/Runnable.h>
+#include <decaf/util/concurrent/CountDownLatch.h>
 #include <activemq/core/ActiveMQConnectionFactory.h>
-#include <activemq/util/Integer.h>
+#include <decaf/lang/Integer.h>
 #include <activemq/util/Config.h>
-#include <activemq/util/Date.h>
+#include <decaf/util/Date.h>
 #include <cms/Connection.h>
 #include <cms/Session.h>
 #include <cms/TextMessage.h>
@@ -35,7 +35,7 @@
 using namespace activemq;
 using namespace activemq::core;
 using namespace activemq::util;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 using namespace cms;
 using namespace std;
 

Modified: activemq/activemq-cpp/trunk/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/Makefile.am?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/src/main/Makefile.am Thu Nov  8 13:02:02 2007
@@ -16,6 +16,12 @@
 # ---------------------------------------------------------------------------
 
 cc_sources = \
+    activemq/io/LoggingInputStream.cpp \
+    activemq/io/LoggingOutputStream.cpp \
+    activemq/exceptions/ActiveMQException.cpp \
+    activemq/util/PrimitiveMap.cpp \
+    activemq/util/LongSequenceGenerator.cpp \
+    activemq/util/URISupport.cpp \
     activemq/core/ActiveMQConsumer.cpp \
     activemq/core/ActiveMQConnection.cpp \
     activemq/core/ActiveMQSession.cpp \
@@ -24,27 +30,7 @@
     activemq/core/ActiveMQProducer.cpp \
     activemq/core/ActiveMQConnectionFactory.cpp \
     activemq/core/ActiveMQSessionExecutor.cpp \
-    activemq/logger/LoggerHierarchy.cpp \
-    activemq/logger/LogWriter.cpp \
-    activemq/logger/Logger.cpp \
-    activemq/logger/LogManager.cpp \
-    activemq/logger/SimpleLogger.cpp \
     activemq/support/InitDirector.cpp \
-    activemq/io/BlockingByteArrayInputStream.cpp \
-    activemq/io/ByteArrayInputStream.cpp \
-    activemq/io/BufferedInputStream.cpp \
-    activemq/io/DataInputStream.cpp \
-    activemq/io/DataOutputStream.cpp \
-    activemq/io/BufferedOutputStream.cpp \
-    activemq/io/ByteArrayOutputStream.cpp \
-    activemq/io/LoggingInputStream.cpp \
-    activemq/io/LoggingOutputStream.cpp \
-    activemq/concurrent/PooledThread.cpp \
-    activemq/concurrent/ThreadPool.cpp \
-    activemq/concurrent/Mutex.cpp \
-    activemq/concurrent/Thread.cpp \
-    activemq/concurrent/CountDownLatch.cpp \
-    activemq/exceptions/ActiveMQException.cpp \
     activemq/connector/stomp/StompSessionManager.cpp \
     activemq/connector/stomp/commands/CommandConstants.cpp \
     activemq/connector/stomp/StompCommandReader.cpp \
@@ -70,13 +56,6 @@
     activemq/connector/openwire/marshal/PrimitiveMapMarshaller.cpp \
     activemq/connector/ConnectorFactoryMap.cpp \
     activemq/connector/BaseConnectorResource.cpp \
-    activemq/network/SocketInputStream.cpp \
-    activemq/network/ServerSocket.cpp \
-    activemq/network/TcpSocket.cpp \
-    activemq/network/BufferedSocket.cpp \
-    activemq/network/SocketOutputStream.cpp \
-    activemq/network/SocketFactory.cpp \
-    activemq/network/SocketError.cpp \
     activemq/transport/TransportBuilder.cpp \
     activemq/transport/TransportFactoryMap.cpp \
     activemq/transport/TransportFilter.cpp \
@@ -91,15 +70,8 @@
     activemq/transport/filters/TcpTransport.cpp \
     activemq/transport/filters/TcpTransportFactory.cpp \
     activemq/transport/filters/LoggingTransport.cpp \
-    activemq/transport/filters/LoggingTransportFactory.cpp \
-    activemq/util/StringTokenizer.cpp \
-    activemq/util/Guid.cpp \
-    activemq/util/Date.cpp \
-    activemq/util/Math.cpp \
-    activemq/util/Random.cpp \
-    activemq/util/PrimitiveMap.cpp \
-    activemq/util/LongSequenceGenerator.cpp \
-    activemq/util/URISupport.cpp
+    activemq/transport/filters/LoggingTransportFactory.cpp
+
 
 h_sources = \
     activemq/core/ActiveMQProducer.h \
@@ -115,65 +87,11 @@
     activemq/core/ActiveMQSessionExecutor.h \
     activemq/core/DispatchData.h \
     activemq/core/Dispatcher.h \
-    activemq/logger/LoggerCommon.h \
-    activemq/logger/LogRecord.h \
-    activemq/logger/SimpleLogger.h \
-    activemq/logger/LoggerDefines.h \
-    activemq/logger/LoggerHierarchy.h \
-    activemq/logger/LogWriter.h \
-    activemq/logger/SimpleFormatter.h \
-    activemq/logger/Filter.h \
-    activemq/logger/Formatter.h \
-    activemq/logger/LogManager.h \
-    activemq/logger/Logger.h \
-    activemq/logger/StreamHandler.h \
-    activemq/logger/ConsoleHandler.h \
-    activemq/logger/PropertiesChangeListener.h \
-    activemq/logger/MarkBlockLogger.h \
-    activemq/logger/Handler.h \
     activemq/support/LibraryInit.h \
     activemq/support/InitDirector.h \
-    activemq/io/StandardErrorOutputStream.h \
-    activemq/io/BlockingByteArrayInputStream.h \
-    activemq/io/ByteArrayInputStream.h \
-    activemq/io/InputStream.h \
-    activemq/io/DataOutputStream.h \
-    activemq/io/BufferedOutputStream.h \
-    activemq/io/Reader.h \
-    activemq/io/BufferedInputStream.h \
-    activemq/io/DataInputStream.h \
-    activemq/io/Writer.h \
-    activemq/io/ByteArrayOutputStream.h \
     activemq/io/LoggingInputStream.h \
     activemq/io/LoggingOutputStream.h \
-    activemq/io/OutputStream.h \
-    activemq/io/IOException.h \
-    activemq/io/FilterInputStream.h \
-    activemq/io/FilterOutputStream.h \
-    activemq/io/EOFException.h \
-    activemq/concurrent/Lock.h \
-    activemq/concurrent/ThreadPool.h \
-    activemq/concurrent/Thread.h \
-    activemq/concurrent/TaskListener.h \
-    activemq/concurrent/Synchronizable.h \
-    activemq/concurrent/Runnable.h \
-    activemq/concurrent/Mutex.h \
-    activemq/concurrent/PooledThread.h \
-    activemq/concurrent/Concurrent.h \
-    activemq/concurrent/PooledThreadListener.h \
-    activemq/concurrent/CountDownLatch.h \
-    activemq/exceptions/InvalidStateException.h \
-    activemq/exceptions/RuntimeException.h \
-    activemq/exceptions/InterruptedException.h \
     activemq/exceptions/ActiveMQException.h \
-    activemq/exceptions/IllegalMonitorStateException.h \
-    activemq/exceptions/ExceptionDefines.h \
-    activemq/exceptions/NoSuchElementException.h \
-    activemq/exceptions/UnsupportedOperationException.h \
-    activemq/exceptions/NullPointerException.h \
-    activemq/exceptions/IllegalArgumentException.h \
-    activemq/exceptions/IllegalStateException.h \
-    activemq/exceptions/IndexOutOfBoundsException.h \
     activemq/connector/ConsumerMessageListener.h \
     activemq/connector/ConnectorException.h \
     activemq/connector/TransactionInfo.h \
@@ -241,15 +159,6 @@
     activemq/connector/ConnectorFactoryMapRegistrar.h \
     activemq/connector/ProducerInfo.h \
     activemq/connector/ConsumerInfo.h \
-    activemq/network/SocketException.h \
-    activemq/network/TcpSocket.h \
-    activemq/network/ServerSocket.h \
-    activemq/network/Socket.h \
-    activemq/network/SocketInputStream.h \
-    activemq/network/BufferedSocket.h \
-    activemq/network/SocketOutputStream.h \
-    activemq/network/SocketFactory.h \
-    activemq/network/SocketError.h \
     activemq/transport/TransportBuilder.h \
     activemq/transport/Transport.h \
     activemq/transport/TransportFilter.h \
@@ -276,26 +185,11 @@
     activemq/transport/filters/TcpTransportFactory.h \
     activemq/transport/filters/LoggingTransport.h \
     activemq/transport/filters/LoggingTransportFactory.h \
-    activemq/util/Number.h \
     activemq/util/Config.h \
-    activemq/util/Character.h \
-    activemq/util/Integer.h \
-    activemq/util/Guid.h \
     activemq/util/ActiveMQProperties.h \
-    activemq/util/Properties.h \
-    activemq/util/Long.h \
-    activemq/util/Boolean.h \
-    activemq/util/StringTokenizer.h \
-    activemq/util/Queue.h \
-    activemq/util/Date.h \
-    activemq/util/Map.h \
-    activemq/util/Math.h \
     activemq/util/LongSequenceGenerator.h \
     activemq/util/PrimitiveMap.h \
-    activemq/util/Set.h \
     activemq/util/URISupport.h \
-    activemq/util/Random.h \
-    activemq/util/Iterator.h \
     cms/DeliveryMode.h \
     cms/TemporaryQueue.h \
     cms/MapMessage.h \
@@ -321,9 +215,9 @@
     cms/MessageConsumer.h \
     cms/Config.h
 
-include activemq/connector/openwire/commands/srcmakefile.mk
-include activemq/connector/openwire/marshal/v1/srcmakefile.mk
-include activemq/connector/openwire/marshal/v2/srcmakefile.mk
+#include activemq/connector/openwire/commands/srcmakefile.mk
+#include activemq/connector/openwire/marshal/v1/srcmakefile.mk
+#include activemq/connector/openwire/marshal/v2/srcmakefile.mk
 
 ##
 ## Compiler / Linker Info

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/BaseConnectorResource.cpp Thu Nov  8 13:02:02 2007
@@ -17,7 +17,7 @@
 
 #include "BaseConnectorResource.h"
 
-#include <activemq/exceptions/NullPointerException.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
 #include <activemq/connector/Connector.h>
 
 using namespace activemq;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/Connector.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/Connector.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/Connector.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/Connector.h Thu Nov  8 13:02:02 2007
@@ -32,8 +32,8 @@
 #include <cms/TextMessage.h>
 #include <cms/MapMessage.h>
 
-#include <activemq/exceptions/InvalidStateException.h>
-#include <activemq/exceptions/UnsupportedOperationException.h>
+#include <decaf/lang/exceptions/InvalidStateException.h>
+#include <decaf/lang/exceptions/UnsupportedOperationException.h>
 
 #include <activemq/transport/Transport.h>
 #include <activemq/connector/SessionInfo.h>
@@ -105,7 +105,7 @@
          * @throws InvalidStateException if the Transport is not set
          */
         virtual transport::Transport& getTransport() const
-            throw (exceptions::InvalidStateException ) = 0;
+            throw ( decaf::lang::exceptions::InvalidStateException ) = 0;
 
         /**
          * Creates a Session Info object for this connector
@@ -207,7 +207,7 @@
          */
         virtual cms::TemporaryTopic* createTemporaryTopic(
             SessionInfo* session )
-                throw ( ConnectorException, exceptions::UnsupportedOperationException ) = 0;
+                throw ( ConnectorException, decaf::lang::exceptions::UnsupportedOperationException ) = 0;
 
         /**
          * Creates a Temporary Queue given a name and session info
@@ -218,7 +218,7 @@
          */
         virtual cms::TemporaryQueue* createTemporaryQueue(
             SessionInfo* session )
-                throw ( ConnectorException, exceptions::UnsupportedOperationException ) = 0;
+                throw ( ConnectorException, decaf::lang::exceptions::UnsupportedOperationException ) = 0;
 
         /**
          * Sends a Message
@@ -325,7 +325,7 @@
         virtual cms::MapMessage* createMapMessage(
             SessionInfo* session,
             TransactionInfo* transaction )
-                throw ( ConnectorException, exceptions::UnsupportedOperationException ) = 0;
+                throw ( ConnectorException, decaf::lang::exceptions::UnsupportedOperationException ) = 0;
 
         /**
          * Unsubscribe from a givenDurable Subscription
@@ -334,7 +334,7 @@
          * @throws UnsupportedOperationException
          */
         virtual void unsubscribe( const std::string&  )
-            throw ( ConnectorException, exceptions::UnsupportedOperationException ) = 0;
+            throw ( ConnectorException, decaf::lang::exceptions::UnsupportedOperationException ) = 0;
 
         /**
          * Closes the given connector resource, caller must still delete

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/ConnectorFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/ConnectorFactory.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/ConnectorFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/ConnectorFactory.h Thu Nov  8 13:02:02 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef CONNECTORFACTORY_H_
-#define CONNECTORFACTORY_H_
+#ifndef _ACTIVEMQ_CONNECTOR_CONNECTORFACTORY_H_
+#define _ACTIVEMQ_CONNECTOR_CONNECTORFACTORY_H_
 
-#include <activemq/util/Properties.h>
+#include <decaf/util/Properties.h>
 #include <activemq/transport/Transport.h>
 #include <activemq/connector/Connector.h>
 
@@ -27,23 +27,22 @@
     /**
      * Interface class for all Connector Factory Classes
      */
-    class ConnectorFactory
-    {
+    class ConnectorFactory {
     public:
 
-        virtual ~ConnectorFactory(void) {};
+        virtual ~ConnectorFactory(void) {}
 
-        /** 
+        /**
          * Creates a connector
          * @param properties The Properties that the new connector is configured with
          * @param transport the Transport that the connector should use
          */
         virtual Connector* createConnector(
-            const activemq::util::Properties& properties,
+            const decaf::util::Properties& properties,
             activemq::transport::Transport* transport ) = 0;
 
    };
 
 }}
 
-#endif /*CONNECTORFACTORY_H_*/
+#endif /*_ACTIVEMQ_CONNECTOR_CONNECTORFACTORY_H_*/

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.cpp Thu Nov  8 13:02:02 2007
@@ -17,17 +17,17 @@
 
 #include "OpenWireCommandReader.h"
 
-#include <activemq/concurrent/Thread.h>
+#include <decaf/lang/Thread.h>
 #include <iostream>
 
 using namespace std;
 using namespace activemq;
-using namespace activemq::concurrent;
+using namespace decaf::util::concurrent;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::transport;
-using namespace activemq::io;
 using namespace activemq::exceptions;
+using namespace decaf::io;
 
 ////////////////////////////////////////////////////////////////////////////////
 OpenWireCommandReader::OpenWireCommandReader()
@@ -47,7 +47,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 OpenWireCommandReader::~OpenWireCommandReader() {
-    
+
     if( dataInputStream != NULL ) {
         delete dataInputStream;
     }
@@ -77,7 +77,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 size_t OpenWireCommandReader::read( unsigned char* buffer, size_t count )
-   throw( io::IOException )
+   throw( decaf::io::IOException )
 {
     try
     {
@@ -88,7 +88,7 @@
                 "OpenwireCommandReader::read(char*,int) - input stream is NULL" );
         }
 
-        return inputStream->read( &buffer[0], count );
+        return inputStream->read( &buffer[0], 0, count );
     }
     AMQ_CATCH_RETHROW( IOException )
     AMQ_CATCH_EXCEPTION_CONVERT( ActiveMQException, IOException )
@@ -96,7 +96,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-unsigned char OpenWireCommandReader::readByte() throw( io::IOException )
+unsigned char OpenWireCommandReader::readByte() throw( decaf::io::IOException )
 {
     try
     {
@@ -109,7 +109,7 @@
         }
 
         unsigned char c = 0;
-        inputStream->read( &c, 1 );
+        inputStream->read( &c, 0, 1 );
         return c;
     }
     AMQ_CATCH_RETHROW( IOException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandReader.h Thu Nov  8 13:02:02 2007
@@ -19,8 +19,8 @@
 #define _ACTIVEMQ_CONNECTOR_OPENWIRE_OPENWIRECOMMANDREADER_H_
 
 #include <activemq/transport/CommandReader.h>
-#include <activemq/io/InputStream.h>
-#include <activemq/io/DataInputStream.h>
+#include <decaf/io/InputStream.h>
+#include <decaf/io/DataInputStream.h>
 #include <activemq/transport/CommandIOException.h>
 #include <activemq/transport/Command.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
@@ -36,7 +36,7 @@
         /**
          * The target input stream.
          */
-        io::InputStream* inputStream;
+        decaf::io::InputStream* inputStream;
 
         /**
          * Pointer to the OpenWireFormat object for this Reader
@@ -47,7 +47,7 @@
          * This is our DataInputStream that we will wrap around the target
          * input stream
          */
-        io::DataInputStream* dataInputStream;
+        decaf::io::DataInputStream* dataInputStream;
 
     public:
 
@@ -61,7 +61,7 @@
          * @param inputStream the target input stream.
          * @param owFormat the OpenWireFormat object that handles unmarshaling
          */
-        OpenWireCommandReader( io::InputStream* inputStream,
+        OpenWireCommandReader( decaf::io::InputStream* inputStream,
                                OpenWireFormat* openWireFormat );
 
         virtual ~OpenWireCommandReader();
@@ -78,21 +78,21 @@
          * Sets the target input stream.
          * @param Target Input Stream
          */
-        virtual void setInputStream( io::InputStream* inputStream ){
+        virtual void setInputStream( decaf::io::InputStream* inputStream ){
             this->inputStream = inputStream;
-            
+
             if( dataInputStream != NULL ) {
                 delete dataInputStream;
             }
-            
-            dataInputStream = new io::DataInputStream( inputStream );
+
+            dataInputStream = new decaf::io::DataInputStream( inputStream );
         }
 
         /**
          * Gets the target input stream.
          * @return Target Input Stream
          */
-        virtual io::InputStream* getInputStream(void){
+        virtual decaf::io::InputStream* getInputStream(void){
             return inputStream;
         }
 
@@ -120,14 +120,14 @@
          * @throws IOException thrown if an error occurs.
          */
         virtual size_t read( unsigned char* buffer, size_t count )
-            throw( io::IOException );
+            throw( decaf::io::IOException );
 
         /**
          * Attempts to read a byte from the input stream
          * @return The byte.
          * @throws IOException thrown if an error occurs.
          */
-        virtual unsigned char readByte() throw( io::IOException );
+        virtual unsigned char readByte() throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.cpp Thu Nov  8 13:02:02 2007
@@ -23,12 +23,13 @@
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::transport;
-using namespace activemq::io;
 using namespace activemq::exceptions;
+using namespace decaf::io;
+using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
-OpenWireCommandWriter::OpenWireCommandWriter()
-{
+OpenWireCommandWriter::OpenWireCommandWriter() {
+
     this->outputStream = NULL;
     this->openWireFormat = NULL;
     this->dataOutputStream = NULL;
@@ -44,7 +45,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 OpenWireCommandWriter::~OpenWireCommandWriter() {
-    
+
     if( dataOutputStream != NULL ) {
         delete dataOutputStream;
     }
@@ -87,7 +88,7 @@
             "OpenWireCommandWriter::write(char*,int) - input stream is NULL" );
     }
 
-    outputStream->write( buffer, count );
+    outputStream->write( buffer, 0, count );
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -102,5 +103,3 @@
 
     outputStream->write( v );
 }
-
-

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireCommandWriter.h Thu Nov  8 13:02:02 2007
@@ -19,24 +19,23 @@
 #define _ACTIVEMQ_CONNECTOR_OPENWIRE_OPENWIRECOMMANDWRITER_H_
 
 #include <activemq/transport/CommandWriter.h>
-#include <activemq/io/OutputStream.h>
-#include <activemq/io/DataOutputStream.h>
 #include <activemq/transport/CommandIOException.h>
 #include <activemq/transport/Command.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
+#include <decaf/io/OutputStream.h>
+#include <decaf/io/DataOutputStream.h>
 
 namespace activemq{
 namespace connector{
 namespace openwire{
 
-    class OpenWireCommandWriter : public transport::CommandWriter
-    {
+    class OpenWireCommandWriter : public transport::CommandWriter {
     private:
 
         /**
          * Target output stream.
          */
-        io::OutputStream* outputStream;
+        decaf::io::OutputStream* outputStream;
 
         /**
          * OpenWireFormat object we use to marshal.
@@ -46,7 +45,7 @@
         /**
          * DataOutputStream that wraps the supplied OutputStream
          */
-        io::DataOutputStream* dataOutputStream;
+        decaf::io::DataOutputStream* dataOutputStream;
 
     public:
 
@@ -59,7 +58,7 @@
          * Constructor.
          * @param os the target output stream.
          */
-        OpenWireCommandWriter( io::OutputStream* outputStream,
+        OpenWireCommandWriter( decaf::io::OutputStream* outputStream,
                                OpenWireFormat* openWireFormat );
 
         virtual ~OpenWireCommandWriter();
@@ -68,20 +67,20 @@
          * Sets the target output stream.
          * @param outputStream - stream to write to.
          */
-        virtual void setOutputStream( io::OutputStream* outputStream ){
+        virtual void setOutputStream( decaf::io::OutputStream* outputStream ){
             this->outputStream = outputStream;
-            
+
             if( dataOutputStream != NULL ) {
                 delete dataOutputStream;
             }
-            
-            dataOutputStream = new io::DataOutputStream( outputStream );
+
+            dataOutputStream = new decaf::io::DataOutputStream( outputStream );
         }
 
         /**
          * Gets the target output stream.
          */
-        virtual io::OutputStream* getOutputStream(){
+        virtual decaf::io::OutputStream* getOutputStream(){
             return outputStream;
         }
 
@@ -117,14 +116,14 @@
          * @throws IOException thrown if an error occurs.
          */
         virtual void write( const unsigned char* buffer, size_t count )
-            throw( io::IOException );
+            throw( decaf::io::IOException );
 
         /**
          * Writes a byte to the output stream.
          * @param v The value to be written.
          * @throws IOException thrown if an error occurs.
          */
-        virtual void writeByte( unsigned char v ) throw( io::IOException );
+        virtual void writeByte( unsigned char v ) throw( decaf::io::IOException );
 
     };
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.cpp Thu Nov  8 13:02:02 2007
@@ -17,13 +17,13 @@
 
 #include <activemq/connector/openwire/OpenWireConnector.h>
 
-#include <activemq/concurrent/Concurrent.h>
+#include <decaf/util/concurrent/Concurrent.h>
 #include <activemq/transport/Transport.h>
-#include <activemq/exceptions/UnsupportedOperationException.h>
-#include <activemq/util/Integer.h>
-#include <activemq/util/Boolean.h>
-#include <activemq/util/Long.h>
-#include <activemq/util/Guid.h>
+#include <decaf/lang/exceptions/UnsupportedOperationException.h>
+#include <decaf/lang/Integer.h>
+#include <decaf/lang/Boolean.h>
+#include <decaf/lang/Long.h>
+#include <decaf/util/UUID.h>
 #include <activemq/connector/openwire/OpenWireConnectorException.h>
 #include <activemq/connector/openwire/OpenWireSessionInfo.h>
 #include <activemq/connector/openwire/OpenWireProducerInfo.h>
@@ -63,10 +63,13 @@
 using namespace activemq::transport;
 using namespace activemq::exceptions;
 using namespace activemq::connector::openwire;
+using namespace decaf::util;
+using namespace decaf::lang;
+using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
 OpenWireConnector::OpenWireConnector( Transport* transport,
-                                      const util::Properties& properties )
+                                      const decaf::util::Properties& properties )
     throw ( IllegalArgumentException )
 {
     if( transport == NULL )
@@ -193,12 +196,12 @@
         if( clientId.length() > 0 ){
             connectionInfo.setClientId( clientId );
         } else {
-            connectionInfo.setClientId( Guid::createGUIDString() );
+            connectionInfo.setClientId( UUID::randomUUID().toString() );
         }
 
         // Generate a connectionId
         commands::ConnectionId* connectionId = new commands::ConnectionId();
-        connectionId->setValue( Guid::createGUIDString() );
+        connectionId->setValue( UUID::randomUUID().toString() );
         connectionInfo.setConnectionId( connectionId );
 
         // Now we ping the broker and see if we get an ack / nack
@@ -1297,7 +1300,7 @@
         }
         else
         {
-            //LOGCMS_WARN( logger, "Received an unknown command" );
+            //LOGDECAF_WARN( logger, "Received an unknown command" );
             delete command;
         }
     }
@@ -1443,7 +1446,7 @@
 {
     try {
         return connectionInfo.getConnectionId()->getValue() + ":" +
-               util::Long::toString( tempDestinationIds.getNextSequenceId() );
+               Long::toString( tempDestinationIds.getNextSequenceId() );
     }
     AMQ_CATCH_RETHROW( ConnectorException )
     AMQ_CATCHALL_THROW( OpenWireConnectorException )

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnector.h Thu Nov  8 13:02:02 2007
@@ -33,8 +33,8 @@
 #include <cms/TextMessage.h>
 #include <cms/MapMessage.h>
 
-#include <activemq/exceptions/InvalidStateException.h>
-#include <activemq/exceptions/IllegalArgumentException.h>
+#include <decaf/lang/exceptions/InvalidStateException.h>
+#include <decaf/lang/exceptions/IllegalArgumentException.h>
 
 #include <activemq/transport/Transport.h>
 #include <activemq/connector/SessionInfo.h>
@@ -45,8 +45,8 @@
 #include <activemq/connector/ConnectorException.h>
 #include <activemq/transport/CommandListener.h>
 #include <activemq/transport/TransportExceptionListener.h>
-#include <activemq/concurrent/Mutex.h>
-#include <activemq/util/Properties.h>
+#include <decaf/util/concurrent/Mutex.h>
+#include <decaf/util/Properties.h>
 #include <activemq/core/ActiveMQConstants.h>
 #include <activemq/util/LongSequenceGenerator.h>
 
@@ -122,7 +122,7 @@
         /**
          * Sync object.
          */
-        concurrent::Mutex mutex;
+        decaf::util::concurrent::Mutex mutex;
 
         /**
          * Observer of messages directed at a particular
@@ -178,13 +178,13 @@
         /**
          * Properties for the connector.
          */
-        util::Properties properties;
+        decaf::util::Properties properties;
 
         /**
          * Mapping of consumer IDs to their respective
          * consumer info object.
          */
-        util::Map< long long, OpenWireConsumerInfo* > consumerInfoMap;
+        decaf::util::Map< long long, OpenWireConsumerInfo* > consumerInfoMap;
 
     private:
 
@@ -234,8 +234,8 @@
          * @param properties - properties for configuring the connector.
          */
         OpenWireConnector( transport::Transport* transport,
-                           const util::Properties& properties )
-            throw ( exceptions::IllegalArgumentException );
+                           const decaf::util::Properties& properties )
+            throw ( decaf::lang::exceptions::IllegalArgumentException );
 
         virtual ~OpenWireConnector();
 
@@ -291,10 +291,10 @@
          * @throws InvalidStateException if the Transport is not set
          */
         virtual transport::Transport& getTransport() const
-            throw ( exceptions::InvalidStateException ) {
+            throw ( decaf::lang::exceptions::InvalidStateException ) {
 
             if( transport == NULL ) {
-                throw exceptions::InvalidStateException(
+                throw decaf::lang::exceptions::InvalidStateException(
                     __FILE__, __LINE__,
                     "OpenWireConnector::getTransport - "
                     "Invalid State, No Transport.");
@@ -403,7 +403,7 @@
          */
         virtual cms::TemporaryTopic* createTemporaryTopic(
             SessionInfo* session )
-                throw ( ConnectorException, exceptions::UnsupportedOperationException );
+                throw ( ConnectorException, decaf::lang::exceptions::UnsupportedOperationException );
 
         /**
          * Creates a Temporary Queue given a name and session info
@@ -414,7 +414,7 @@
          */
         virtual cms::TemporaryQueue* createTemporaryQueue(
             SessionInfo* session )
-                throw ( ConnectorException, exceptions::UnsupportedOperationException );
+                throw ( ConnectorException, decaf::lang::exceptions::UnsupportedOperationException );
 
         /**
          * Sends a Message
@@ -520,7 +520,7 @@
         virtual cms::MapMessage* createMapMessage(
             SessionInfo* session,
             TransactionInfo* transaction )
-                throw ( ConnectorException, exceptions::UnsupportedOperationException );
+                throw ( ConnectorException, decaf::lang::exceptions::UnsupportedOperationException );
 
         /**
          * Unsubscribe from a givenDurable Subscription
@@ -528,7 +528,7 @@
          * @throws ConnectorException
          */
         virtual void unsubscribe( const std::string& name )
-            throw ( ConnectorException, exceptions::UnsupportedOperationException );
+            throw ( ConnectorException, decaf::lang::exceptions::UnsupportedOperationException );
 
         /**
          * Closes the given connector resource, caller must still delete

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.cpp Thu Nov  8 13:02:02 2007
@@ -28,7 +28,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 Connector* OpenWireConnectorFactory::createConnector(
-    const activemq::util::Properties& properties,
+    const decaf::util::Properties& properties,
     activemq::transport::Transport* transport )
 {
     return dynamic_cast<Connector*>(

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireConnectorFactory.h Thu Nov  8 13:02:02 2007
@@ -38,7 +38,7 @@
          * @param transport the Transport instance this connector uses.
          */
         virtual Connector* createConnector(
-            const activemq::util::Properties& properties,
+            const decaf::util::Properties& properties,
             activemq::transport::Transport* transport );
 
         /**

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.cpp Thu Nov  8 13:02:02 2007
@@ -17,12 +17,12 @@
 
 #include "OpenWireFormat.h"
 
-#include <activemq/util/Boolean.h>
-#include <activemq/util/Integer.h>
-#include <activemq/util/Long.h>
-#include <activemq/util/Guid.h>
-#include <activemq/util/Math.h>
-#include <activemq/io/ByteArrayOutputStream.h>
+#include <decaf/lang/Boolean.h>
+#include <decaf/lang/Integer.h>
+#include <decaf/lang/Long.h>
+#include <decaf/util/UUID.h>
+#include <decaf/lang/Math.h>
+#include <decaf/io/ByteArrayOutputStream.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
 #include <activemq/connector/openwire/commands/WireFormatInfo.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
@@ -30,11 +30,11 @@
 #include <activemq/connector/openwire/marshal/DataStreamMarshaller.h>
 #include <activemq/connector/openwire/marshal/v2/MarshallerFactory.h>
 #include <activemq/connector/openwire/marshal/v1/MarshallerFactory.h>
+#include <activemq/exceptions/ActiveMQException.h>
 
 using namespace std;
 using namespace activemq;
 using namespace activemq::wireformat;
-using namespace activemq::io;
 using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::transport;
@@ -43,12 +43,16 @@
 using namespace activemq::connector::openwire::commands;
 using namespace activemq::connector::openwire::marshal;
 using namespace activemq::connector::openwire::utils;
+using namespace decaf::io;
+using namespace decaf::util;
+using namespace decaf::lang;
+using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
 const unsigned char OpenWireFormat::NULL_TYPE = 0;
 
 ////////////////////////////////////////////////////////////////////////////////
-OpenWireFormat::OpenWireFormat( const activemq::util::Properties& properties ) {
+OpenWireFormat::OpenWireFormat( const decaf::util::Properties& properties ) {
 
     // Copy config data
     this->properties.copy( &properties );
@@ -58,8 +62,7 @@
     dataMarshallers.resize( 256 );
 
     // Generate an ID
-    this->id = Guid::createGUIDString();
-
+    this->id = UUID::randomUUID().toString();
     // Set defaults for initial WireFormat negotiation
     this->version = 0;
     this->stackTraceEnabled = false;
@@ -139,8 +142,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormat::marshal( transport::Command* command,
-                              io::DataOutputStream* dataOut )
-    throw ( io::IOException ) {
+                              decaf::io::DataOutputStream* dataOut )
+    throw ( decaf::io::IOException ) {
 
     try {
 
@@ -189,9 +192,8 @@
 
                 if( !sizePrefixDisabled ) {
                     looseOut->close();
-                    dataOut->writeInt( (int)baos->getByteArraySize() );
-                    dataOut->write( baos->getByteArray(),
-                                    baos->getByteArraySize() );
+                    dataOut->writeInt( (int)baos->size() );
+                    dataOut->write( baos->toByteArray(), 0, baos->size() );
 
                     // Delete allocated resource
                     delete baos;
@@ -209,8 +211,8 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-transport::Command* OpenWireFormat::unmarshal( io::DataInputStream* dis )
-    throw ( io::IOException ) {
+transport::Command* OpenWireFormat::unmarshal( decaf::io::DataInputStream* dis )
+    throw ( decaf::io::IOException ) {
 
     try {
 
@@ -296,7 +298,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 int OpenWireFormat::tightMarshalNestedObject1( commands::DataStructure* object,
                                                utils::BooleanStream* bs )
-    throw ( io::IOException ) {
+    throw ( decaf::io::IOException ) {
 
     try {
 
@@ -358,7 +360,7 @@
 
             MarshalAware* ma = dynamic_cast< MarshalAware* >( o );
             vector<unsigned char> sequence = ma->getMarshaledForm( this );
-            ds->write( &sequence[0], sequence.size() );
+            ds->write( &sequence[0], 0, sequence.size() );
 
         } else {
 
@@ -382,7 +384,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 DataStructure* OpenWireFormat::tightUnmarshalNestedObject( DataInputStream* dis,
                                                            BooleanStream* bs )
-    throw ( io::IOException ) {
+    throw ( decaf::io::IOException ) {
 
     try {
 
@@ -425,7 +427,7 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-DataStructure* OpenWireFormat::looseUnmarshalNestedObject( io::DataInputStream* dis )
+DataStructure* OpenWireFormat::looseUnmarshalNestedObject( decaf::io::DataInputStream* dis )
     throw ( IOException ) {
 
     try{
@@ -459,8 +461,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormat::looseMarshalNestedObject( commands::DataStructure* o,
-                                               io::DataOutputStream* dataOut )
-    throw ( io::IOException ) {
+                                               decaf::io::DataOutputStream* dataOut )
+    throw ( decaf::io::IOException ) {
 
     try{
 
@@ -490,7 +492,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 void OpenWireFormat::renegotiateWireFormat( WireFormatInfo* info )
-    throw ( exceptions::IllegalStateException ) {
+    throw ( IllegalStateException ) {
 
     if( preferedWireFormatInfo == NULL ) {
         throw IllegalStateException(

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormat.h Thu Nov  8 13:02:02 2007
@@ -22,9 +22,9 @@
 #include <activemq/connector/openwire/commands/WireFormatInfo.h>
 #include <activemq/connector/openwire/commands/DataStructure.h>
 #include <activemq/connector/openwire/utils/BooleanStream.h>
-#include <activemq/util/Properties.h>
-#include <activemq/exceptions/IllegalStateException.h>
-#include <activemq/exceptions/IllegalArgumentException.h>
+#include <decaf/util/Properties.h>
+#include <decaf/lang/exceptions/IllegalStateException.h>
+#include <decaf/lang/exceptions/IllegalArgumentException.h>
 
 namespace activemq{
 namespace connector{
@@ -39,7 +39,7 @@
          * Constructs a new OpenWireFormat object
          * @param properties - can contain optional config params.
          */
-        OpenWireFormat( const activemq::util::Properties& properties );
+        OpenWireFormat( const decaf::util::Properties& properties );
 
         virtual ~OpenWireFormat();
 
@@ -57,8 +57,8 @@
          * @throws IOException
          */
         virtual void marshal( transport::Command* command,
-                              io::DataOutputStream* dataOut )
-            throw ( io::IOException );
+                              decaf::io::DataOutputStream* dataOut )
+            throw ( decaf::io::IOException );
 
         /**
          * Packet based un-marshaling
@@ -66,7 +66,7 @@
          * @returns the newly marshaled Command, caller owns the pointer
          * @throws IOException
          */
-        virtual transport::Command* unmarshal( io::DataInputStream* dis ) throw ( io::IOException );
+        virtual transport::Command* unmarshal( decaf::io::DataInputStream* dis ) throw ( decaf::io::IOException );
 
         /**
          * Utility method for Tight Marshalling the given object to the boolean
@@ -77,7 +77,7 @@
          */
         virtual int tightMarshalNestedObject1( commands::DataStructure* object,
                                                utils::BooleanStream* bs )
-            throw ( io::IOException );
+            throw ( decaf::io::IOException );
 
         /**
          * Utility method that will Tight marshall some internally nested object
@@ -89,8 +89,8 @@
          * @throws IOException if an error occurs.
          */
         void tightMarshalNestedObject2( commands::DataStructure* o,
-                                        io::DataOutputStream* ds,
-                                        utils::BooleanStream* bs ) throw ( io::IOException );
+                                        decaf::io::DataOutputStream* ds,
+                                        utils::BooleanStream* bs ) throw ( decaf::io::IOException );
 
         /**
          * Utility method used to Unmarshal a Nested DataStructure type object
@@ -101,9 +101,9 @@
          * @returns Newly allocated DataStructure Object
          * @throws IOException if an error occurs.
          */
-        commands::DataStructure* tightUnmarshalNestedObject( io::DataInputStream* dis,
+        commands::DataStructure* tightUnmarshalNestedObject( decaf::io::DataInputStream* dis,
                                                              utils::BooleanStream* bs )
-            throw ( io::IOException );
+            throw ( decaf::io::IOException );
 
         /**
          * Utility method to unmarshal an DataStructure object from an
@@ -115,8 +115,8 @@
          * @throws IOException if an error occurs.
          */
         commands::DataStructure* looseUnmarshalNestedObject(
-            io::DataInputStream* dis)
-                throw ( io::IOException );
+            decaf::io::DataInputStream* dis)
+                throw ( decaf::io::IOException );
 
         /**
          * Utility method to loosely Marshal an object that is derived from the
@@ -127,8 +127,8 @@
          * @throw IOException if an error occurs.
          */
         void looseMarshalNestedObject( commands::DataStructure* o,
-                                       io::DataOutputStream* dataOut )
-                                           throw ( io::IOException );
+                                       decaf::io::DataOutputStream* dataOut )
+                                           throw ( decaf::io::IOException );
 
         /**
          * Called to renegotiate the settings for the WireFormatInfo, these
@@ -137,14 +137,14 @@
          * @throws IllegalStateException is the params can't be negotiated.
          */
         void renegotiateWireFormat( commands::WireFormatInfo* info )
-            throw ( exceptions::IllegalStateException );
+            throw ( decaf::lang::exceptions::IllegalStateException );
 
         /**
          * Configures this object using the provieded WireformatInfo object
          * @param info - a WireFormatInfo object, takes ownership.
          */
         virtual void setPreferedWireFormatInfo( commands::WireFormatInfo* info )
-            throw ( exceptions::IllegalStateException );
+            throw ( decaf::lang::exceptions::IllegalStateException );
 
         /**
          * Gets the Preferend WireFormatInfo object that this class holds
@@ -198,7 +198,7 @@
          * Set the current Wireformat Version
          * @param version - int that identifies the version
          */
-        void setVersion( int version ) throw ( exceptions::IllegalArgumentException );
+        void setVersion( int version ) throw ( decaf::lang::exceptions::IllegalArgumentException );
 
         /**
          * Checks if the cacheEnabled flag is on
@@ -259,8 +259,8 @@
          * @returns new DataStructure* that the caller owns
          * @throws IOException if an error occurs during the unmarshal
          */
-        commands::DataStructure* doUnmarshal( io::DataInputStream* dis )
-            throw ( io::IOException );
+        commands::DataStructure* doUnmarshal( decaf::io::DataInputStream* dis )
+            throw ( decaf::io::IOException );
 
         /**
          * Cleans up all registered Marshallers and empties the dataMarshallers
@@ -280,7 +280,7 @@
     private:
 
         // This object config data
-        activemq::util::Properties properties;
+        decaf::util::Properties properties;
 
         // Prefered WireFormatInfo
         commands::WireFormatInfo* preferedWireFormatInfo;

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.cpp?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.cpp Thu Nov  8 13:02:02 2007
@@ -18,8 +18,8 @@
 #include <activemq/connector/openwire/OpenWireFormatFactory.h>
 #include <activemq/connector/openwire/OpenWireFormat.h>
 
-#include <activemq/util/Boolean.h>
-#include <activemq/util/Integer.h>
+#include <decaf/lang/Boolean.h>
+#include <decaf/lang/Integer.h>
 
 using namespace std;
 using namespace activemq;
@@ -30,11 +30,12 @@
 using namespace activemq::exceptions;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::commands;
+using namespace decaf::lang;
 
 ////////////////////////////////////////////////////////////////////////////////
 WireFormat* OpenWireFormatFactory::createWireFormat(
-    const util::Properties& properties )
-        throw ( exceptions::IllegalStateException ) {
+    const decaf::util::Properties& properties )
+        throw ( decaf::lang::exceptions::IllegalStateException ) {
 
     WireFormatInfo* info = new WireFormatInfo();
 

Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.h?rev=593309&r1=593308&r2=593309&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.h (original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/openwire/OpenWireFormatFactory.h Thu Nov  8 13:02:02 2007
@@ -20,8 +20,8 @@
 
 #include <activemq/wireformat/WireFormatFactory.h>
 #include <activemq/connector/openwire/commands/WireFormatInfo.h>
-#include <activemq/exceptions/IllegalStateException.h>
-#include <activemq/util/Properties.h>
+#include <decaf/lang/exceptions/IllegalStateException.h>
+#include <decaf/util/Properties.h>
 
 namespace activemq{
 namespace connector{
@@ -35,7 +35,7 @@
          * Constructor - Sets Defaults for all properties, these are all
          * subject to change once the <code>createWireFormat</code> method
          * is called.
-         * 
+         *
          * URL options
          * --------------------
          * wireFormat.stackTraceEnabled
@@ -49,13 +49,14 @@
 
         virtual ~OpenWireFormatFactory() {};
 
-        /**    
+        /**
          * Creates a new WireFormat Object passing it a set of
          * properties from which it can obtain any optional settings
          * @param properties - the Properties for this WireFormat
          */
-        virtual wireformat::WireFormat* createWireFormat( const util::Properties& properties )
-            throw ( exceptions::IllegalStateException );
+        virtual wireformat::WireFormat* createWireFormat(
+            const decaf::util::Properties& properties )
+                throw ( decaf::lang::exceptions::IllegalStateException );
 
     };
 



Mime
View raw message