Author: tabish
Date: Fri Nov 9 10:31:06 2007
New Revision: 593618
URL: http://svn.apache.org/viewvc?rev=593618&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.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/OpenwireSimpleRollbackTest.cpp
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/OpenwireSlowListenerTest.h
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.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/SimpleRollbackTest.cpp
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
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/TestSupport.cpp
Fri Nov 9 10:31:06 2007
@@ -35,9 +35,9 @@
using namespace cms;
using namespace activemq;
using namespace activemq::core;
-using namespace activemq::util;
-using namespace activemq::exceptions;
using namespace decaf::util::concurrent;
+using namespace decaf::util;
+using namespace decaf::lang;
using namespace integration;
@@ -67,7 +67,7 @@
delete connection;
}
}
- AMQ_CATCH_NOTHROW( ActiveMQException )
+ AMQ_CATCH_NOTHROW( activemq::exceptions::ActiveMQException )
AMQ_CATCHALL_NOTHROW( )
session = NULL;
@@ -81,7 +81,7 @@
// Now create the connection
connection = createDetachedConnection(
- "", "", Guid().createGUIDString() );
+ "", "", UUID::randomUUID().toString() );
// Set ourself as a recipient of Exceptions
connection->setExceptionListener( this );
@@ -90,8 +90,8 @@
// Create a Session
session = connection->createSession( ackMode );
}
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
+ AMQ_CATCH_RETHROW( activemq::exceptions::ActiveMQException )
+ AMQ_CATCHALL_THROW( activemq::exceptions::ActiveMQException )
}
cms::Connection* TestSupport::createDetachedConnection(
@@ -108,8 +108,8 @@
return connection;
}
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
+ AMQ_CATCH_RETHROW( activemq::exceptions::ActiveMQException )
+ AMQ_CATCHALL_THROW( activemq::exceptions::ActiveMQException )
}
void TestSupport::doSleep(void)
@@ -147,8 +147,8 @@
return realCount;
}
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
+ AMQ_CATCH_RETHROW( activemq::exceptions::ActiveMQException )
+ AMQ_CATCHALL_THROW( activemq::exceptions::ActiveMQException )
}
unsigned int TestSupport::produceBytesMessages(
@@ -185,8 +185,8 @@
return realCount;
}
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
+ AMQ_CATCH_RETHROW( activemq::exceptions::ActiveMQException )
+ AMQ_CATCHALL_THROW( activemq::exceptions::ActiveMQException )
}
void TestSupport::waitForMessages( unsigned int count )
@@ -208,8 +208,8 @@
}
}
}
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
+ AMQ_CATCH_RETHROW( activemq::exceptions::ActiveMQException )
+ AMQ_CATCHALL_THROW( activemq::exceptions::ActiveMQException )
}
void TestSupport::onException( const cms::CMSException& error )
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireDurableTest.cpp
Fri Nov 9 10:31:06 2007
@@ -61,12 +61,12 @@
using namespace cms;
using namespace activemq;
using namespace activemq::core;
-using namespace activemq::util;
using namespace activemq::connector;
using namespace activemq::exceptions;
-using namespace decaf::net;
using namespace activemq::transport;
using namespace decaf::util::concurrent;
+using namespace decaf::util;
+using namespace decaf::net;
using namespace integration;
using namespace integration::connector::openwire;
@@ -94,11 +94,11 @@
<< endl;
}
- std::string subName = Guid().createGUID();
+ std::string subName = UUID::randomUUID().toString();
// Create CMS Object for Comms
cms::Session* session = testSupport.getSession();
- cms::Topic* topic =
session->createTopic(UUID::randomUUID().toString());
+ cms::Topic* topic = session->createTopic(
UUID::randomUUID().toString() );
cms::MessageConsumer* consumer =
session->createDurableConsumer( topic, subName, "" );
consumer->setMessageListener( &testSupport );
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireExpirationTest.cpp
Fri Nov 9 10:31:06 2007
@@ -58,18 +58,18 @@
#include <cms/MapMessage.h>
#include <cms/Session.h>
-using namespace activemq::connector::stomp;
-using namespace activemq::transport;
-using namespace activemq::util;
using namespace std;
using namespace cms;
using namespace activemq;
using namespace activemq::core;
-using namespace activemq::util;
using namespace activemq::connector;
+using namespace activemq::connector::stomp;
+using namespace activemq::util;
using namespace activemq::exceptions;
-using namespace decaf::net;
using namespace activemq::transport;
+using namespace decaf::net;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace decaf::util::concurrent;
using namespace std;
@@ -268,7 +268,7 @@
void OpenwireExpirationTest::testExpired()
{
- string topic = Guid().createGUID();
+ string topic = UUID::randomUUID().toString();
Producer producer( topic, 1, 1 );
Thread producerThread( &producer );
producerThread.start();
@@ -288,7 +288,7 @@
void OpenwireExpirationTest::testNotExpired()
{
- string topic = Guid().createGUID();
+ string topic = UUID::randomUUID().toString();
Producer producer( topic, 2, 2000 );
producer.setDisableTimeStamps( true );
Thread producerThread( &producer );
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleRollbackTest.cpp
Fri Nov 9 10:31:06 2007
@@ -71,7 +71,9 @@
using namespace activemq::connector;
using namespace activemq::exceptions;
using namespace decaf::net;
+using namespace decaf::lang;
using namespace activemq::transport;
+using namespace decaf::util;
using namespace decaf::util::concurrent;
using namespace std;
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSimpleTest.cpp
Fri Nov 9 10:31:06 2007
@@ -66,6 +66,8 @@
using namespace activemq::exceptions;
using namespace decaf::net;
using namespace activemq::transport;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace decaf::util::concurrent;
using namespace integration;
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.cpp
Fri Nov 9 10:31:06 2007
@@ -67,6 +67,8 @@
using namespace activemq::exceptions;
using namespace decaf::net;
using namespace activemq::transport;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace decaf::util::concurrent;
using namespace integration;
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.h?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.h
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireSlowListenerTest.h
Fri Nov 9 10:31:06 2007
@@ -21,7 +21,7 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <activemq/util/Set.h>
+#include <decaf/util/Set.h>
#include <cms/MessageListener.h>
namespace integration{
@@ -40,7 +40,7 @@
public:
unsigned int count;
- activemq::util::Set<long long> threadIds;
+ decaf::util::Set<long long> threadIds;
SlowListener() { count = 0; }
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTempDestinationTest.cpp
Fri Nov 9 10:31:06 2007
@@ -67,6 +67,8 @@
using namespace decaf::net;
using namespace activemq::transport;
using namespace decaf::util::concurrent;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace integration;
using namespace integration::connector;
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/openwire/OpenwireTransactionTest.cpp
Fri Nov 9 10:31:06 2007
@@ -66,6 +66,8 @@
using namespace decaf::net;
using namespace activemq::transport;
using namespace decaf::util::concurrent;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace integration;
using namespace integration::connector::openwire;
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/DurableTest.cpp
Fri Nov 9 10:31:06 2007
@@ -66,6 +66,8 @@
using namespace activemq::exceptions;
using namespace decaf::net;
using namespace activemq::transport;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace decaf::util::concurrent;
using namespace integration;
@@ -94,7 +96,7 @@
<< endl;
}
- std::string subName = Guid().createGUID();
+ std::string subName = UUID::randomUUID().toString();
// Create CMS Object for Comms
cms::Session* session = testSupport.getSession();
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/ExpirationTest.cpp
Fri Nov 9 10:31:06 2007
@@ -71,6 +71,8 @@
using namespace decaf::net;
using namespace activemq::transport;
using namespace decaf::util::concurrent;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace std;
using namespace integration;
@@ -268,7 +270,7 @@
void ExpirationTest::testExpired()
{
- string topic = Guid().createGUID();
+ string topic = UUID::randomUUID().toString();
Producer producer( topic, 1, 1 );
Thread producerThread( &producer );
producerThread.start();
@@ -288,7 +290,7 @@
void ExpirationTest::testNotExpired()
{
- string topic = Guid().createGUID();
+ string topic = UUID::randomUUID().toString();
Producer producer( topic, 2, 2000 );
producer.setDisableTimeStamps( true );
Thread producerThread( &producer );
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleRollbackTest.cpp
Fri Nov 9 10:31:06 2007
@@ -73,6 +73,8 @@
using namespace decaf::net;
using namespace activemq::transport;
using namespace decaf::util::concurrent;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace std;
using namespace integration;
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/SimpleTest.cpp
Fri Nov 9 10:31:06 2007
@@ -67,6 +67,8 @@
using namespace decaf::net;
using namespace activemq::transport;
using namespace decaf::util::concurrent;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace integration;
using namespace integration::connector::stomp;
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/StompStressTests.cpp
Fri Nov 9 10:31:06 2007
@@ -68,6 +68,8 @@
using namespace decaf::net;
using namespace activemq::transport;
using namespace decaf::util::concurrent;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace integration;
using namespace integration::connector::stomp;
Modified:
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp?rev=593618&r1=593617&r2=593618&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp
(original)
+++
activemq/activemq-cpp/trunk/src/test-integration/integration/connector/stomp/TransactionTest.cpp
Fri Nov 9 10:31:06 2007
@@ -66,6 +66,8 @@
using namespace decaf::net;
using namespace activemq::transport;
using namespace decaf::util::concurrent;
+using namespace decaf::lang;
+using namespace decaf::util;
using namespace integration;
using namespace integration::connector::stomp;
