activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r359637 - in /incubator/activemq/trunk/jmeter/src: java/org/activemq/sampler/ java/org/activemq/util/connection/ test/java/org/activemq/usecases/
Date Wed, 28 Dec 2005 20:49:23 GMT
Author: chirino
Date: Wed Dec 28 12:49:18 2005
New Revision: 359637

URL: http://svn.apache.org/viewcvs?rev=359637&view=rev
Log:
Updated to use new activemq package names

Modified:
    incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Consumer.java
    incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java
    incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Producer.java
    incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java
    incubator/activemq/trunk/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
    incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
    incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java

Modified: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Consumer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Consumer.java?rev=359637&r1=359636&r2=359637&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Consumer.java (original)
+++ incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Consumer.java Wed Dec 28
12:49:18 2005
@@ -16,7 +16,7 @@
  */
 package org.activemq.sampler;
 
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 import org.activemq.util.connection.ServerConnectionFactory;
 import org.apache.jmeter.samplers.Entry;
 import org.apache.jmeter.samplers.SampleResult;

Modified: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java?rev=359637&r1=359636&r2=359637&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java (original)
+++ incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java Wed
Dec 28 12:49:18 2005
@@ -22,8 +22,8 @@
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Entry;
 import org.activemq.util.connection.ServerConnectionFactory;
-import org.activemq.util.IdGenerator;
-import org.activemq.command.ActiveMQMessage;
+import org.apache.activemq.util.IdGenerator;
+import org.apache.activemq.command.ActiveMQMessage;
 
 import javax.jms.*;
 import java.util.*;

Modified: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Producer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Producer.java?rev=359637&r1=359636&r2=359637&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Producer.java (original)
+++ incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/Producer.java Wed Dec 28
12:49:18 2005
@@ -24,7 +24,7 @@
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
 import org.activemq.util.connection.ServerConnectionFactory;
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 
 import javax.jms.Connection;
 import javax.jms.Session;

Modified: incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java?rev=359637&r1=359636&r2=359637&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java (original)
+++ incubator/activemq/trunk/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java Wed
Dec 28 12:49:18 2005
@@ -25,7 +25,7 @@
 import org.apache.jorphan.logging.LoggingManager;
 
 import org.activemq.util.connection.ServerConnectionFactory;
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 
 import javax.jms.*;
 import java.io.File;

Modified: incubator/activemq/trunk/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java?rev=359637&r1=359636&r2=359637&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
(original)
+++ incubator/activemq/trunk/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
Wed Dec 28 12:49:18 2005
@@ -16,34 +16,32 @@
  */
 package org.activemq.util.connection;
 
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.ActiveMQConnection;
-import org.mr.api.jms.MantaTopicConnectionFactory;
-import org.mr.api.jms.MantaQueueConnectionFactory;
-
-import org.apache.jmeter.util.JMeterUtils;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Properties;
 
 import javax.jms.Connection;
-import javax.jms.Session;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
 import javax.jms.JMSException;
-import javax.jms.Topic;
 import javax.jms.Queue;
-import javax.jms.ConnectionFactory;
-import javax.jms.TopicConnectionFactory;
+import javax.jms.QueueConnection;
 import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicSession;
 import javax.jms.QueueSession;
-import javax.jms.Destination;
+import javax.jms.Session;
+import javax.jms.Topic;
 import javax.jms.TopicConnection;
-import javax.jms.QueueConnection;
-
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicSession;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Properties;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.jmeter.util.JMeterUtils;
+import org.mr.api.jms.MantaQueueConnectionFactory;
+import org.mr.api.jms.MantaTopicConnectionFactory;
 
 /**
  * Provides static methods for creating Session and Destination objects.
@@ -202,10 +200,6 @@
             //Used to create a session from the default MQ server ActiveMQConnectionFactory.
             ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(url);
             factory.setUseAsyncSend(true);
-
-            if (embeddedBroker) {
-                factory.setUseEmbeddedBroker(true);
-            }
             
             ActiveMQConnection c = (ActiveMQConnection) factory.createConnection();
 

Modified: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java?rev=359637&r1=359636&r2=359637&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
(original)
+++ incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
Wed Dec 28 12:49:18 2005
@@ -8,11 +8,11 @@
 
 import junit.framework.TestCase;
 
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.ActiveMQConnection;
-import org.activemq.broker.BrokerService;
-import org.activemq.broker.BrokerFactory;
-import org.activemq.broker.TransportConnector;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.TransportConnector;
 
 /**
 * This Unit Test is created to test the memory leakage when a new producer is created and
closed for each message that was sent.

Modified: incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java?rev=359637&r1=359636&r2=359637&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java
(original)
+++ incubator/activemq/trunk/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java
Wed Dec 28 12:49:18 2005
@@ -6,13 +6,13 @@
 import java.util.*;
 import java.net.URI;
 
-import org.activemq.ActiveMQConnection;
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.broker.BrokerService;
-import org.activemq.broker.BrokerFactory;
-import org.activemq.broker.TransportConnector;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.TransportConnector;
 
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;



Mime
View raw message