activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r783627 - in /activemq/sandbox/activemq-flow: ./ activemq-flow/src/test/java/org/ activemq-queue/src/test/java/org/apache/activemq/flow/ activemq-queue/src/test/java/org/apache/activemq/queue/ activemq-queue/src/test/java/org/apache/activem...
Date Thu, 11 Jun 2009 04:32:16 GMT
Author: chirino
Date: Thu Jun 11 04:32:16 2009
New Revision: 783627

URL: http://svn.apache.org/viewvc?rev=783627&view=rev
Log:
Setup the build so that test cases in perf packages are skipped by maven.  No point in maven
running performance tests.
moved that queue perf suite into a perf package.

Added:
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/
      - copied from r783625, activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/flow/
Removed:
    activemq/sandbox/activemq-flow/activemq-flow/src/test/java/org/
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/flow/
Modified:
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/BrokerConnection.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ClientConnection.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Message.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MessageGenerator.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockQueue.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Proto2WireFormatFactory.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ProtoWireFormatFactory.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Router.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestFlowManager.java
    activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestWireFormatFactory.java
    activemq/sandbox/activemq-flow/pom.xml

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/AbstractTestConnection.java
Thu Jun 11 04:32:16 2009
@@ -1,4 +1,4 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -11,10 +11,15 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.activemq.dispatch.IDispatcher;
+import org.apache.activemq.flow.AbstractLimiter;
+import org.apache.activemq.flow.Flow;
+import org.apache.activemq.flow.IFlowLimiter;
+import org.apache.activemq.flow.IFlowSink;
+import org.apache.activemq.flow.ISourceController;
+import org.apache.activemq.flow.SizeLimiter;
 import org.apache.activemq.flow.Commands.FlowControl;
 import org.apache.activemq.flow.Commands.FlowControl.FlowControlBean;
 import org.apache.activemq.flow.Commands.FlowControl.FlowControlBuffer;
-import org.apache.activemq.flow.MockBroker.DeliveryTarget;
 import org.apache.activemq.queue.AbstractFlowRelay;
 import org.apache.activemq.queue.ExclusiveQueue;
 import org.apache.activemq.queue.IFlowQueue;
@@ -22,6 +27,7 @@
 import org.apache.activemq.queue.QueueDispatchTarget;
 import org.apache.activemq.queue.SingleFlowRelay;
 import org.apache.activemq.queue.IPollableFlowSource.FlowReadyListener;
+import org.apache.activemq.queue.perf.MockBroker.DeliveryTarget;
 import org.apache.activemq.transport.AsyncTransport;
 import org.apache.activemq.transport.DispatchableTransport;
 import org.apache.activemq.transport.Transport;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/BrokerConnection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/BrokerConnection.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/BrokerConnection.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/BrokerConnection.java
Thu Jun 11 04:32:16 2009
@@ -1,5 +1,6 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
+import org.apache.activemq.flow.ISourceController;
 import org.apache.activemq.flow.Commands.Destination;
 import org.apache.activemq.flow.Commands.FlowControl;
 import org.apache.activemq.flow.Commands.Destination.DestinationBuffer;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ClientConnection.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ClientConnection.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ClientConnection.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ClientConnection.java
Thu Jun 11 04:32:16 2009
@@ -1,4 +1,4 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.net.URI;
 

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Message.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Message.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Message.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Message.java
Thu Jun 11 04:32:16 2009
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.io.Serializable;
 
+import org.apache.activemq.flow.Flow;
 import org.apache.activemq.flow.Commands.Destination;
 import org.apache.activemq.flow.Commands.Message.MessageBean;
 import org.apache.activemq.flow.Commands.Message.MessageBuffer;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MessageGenerator.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MessageGenerator.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MessageGenerator.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MessageGenerator.java
Thu Jun 11 04:32:16 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 public interface MessageGenerator {
     interface MessageReadyListener {

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBroker.java
Thu Jun 11 04:32:16 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -23,6 +23,7 @@
 
 import org.apache.activemq.dispatch.IDispatcher;
 import org.apache.activemq.dispatch.PriorityDispatcher;
+import org.apache.activemq.flow.IFlowSink;
 import org.apache.activemq.flow.Commands.Destination;
 import org.apache.activemq.transport.DispatchableTransportServer;
 import org.apache.activemq.transport.Transport;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java
Thu Jun 11 04:32:16 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.util.ArrayList;
 

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockClient.java
Thu Jun 11 04:32:16 2009
@@ -1,4 +1,4 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.io.FileInputStream;
 import java.net.URI;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockQueue.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockQueue.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockQueue.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockQueue.java
Thu Jun 11 04:32:16 2009
@@ -1,12 +1,15 @@
 /**
  * 
  */
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.util.HashMap;
 
+import org.apache.activemq.flow.IFlowSink;
+import org.apache.activemq.flow.ISourceController;
+import org.apache.activemq.flow.PrioritySizeLimiter;
+import org.apache.activemq.flow.SizeLimiter;
 import org.apache.activemq.flow.Commands.Destination;
-import org.apache.activemq.flow.MockBroker.DeliveryTarget;
 import org.apache.activemq.queue.IQueue;
 import org.apache.activemq.queue.PartitionedQueue;
 import org.apache.activemq.queue.PersistencePolicy;
@@ -18,6 +21,7 @@
 import org.apache.activemq.queue.SharedQueue;
 import org.apache.activemq.queue.SharedQueueOld;
 import org.apache.activemq.queue.Subscription;
+import org.apache.activemq.queue.perf.MockBroker.DeliveryTarget;
 import org.apache.activemq.util.Mapper;
 
 class MockQueue implements MockBroker.DeliveryTarget {

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Proto2WireFormatFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Proto2WireFormatFactory.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Proto2WireFormatFactory.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Proto2WireFormatFactory.java
Thu Jun 11 04:32:16 2009
@@ -1,4 +1,4 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.io.DataInput;
 import java.io.DataOutput;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ProtoWireFormatFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ProtoWireFormatFactory.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ProtoWireFormatFactory.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/ProtoWireFormatFactory.java
Thu Jun 11 04:32:16 2009
@@ -1,4 +1,4 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.io.DataInput;
 import java.io.DataOutput;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteConsumer.java
Thu Jun 11 04:32:16 2009
@@ -1,8 +1,9 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.activemq.flow.ISourceController;
 import org.apache.activemq.flow.Commands.Destination;
 import org.apache.activemq.metric.MetricAggregator;
 import org.apache.activemq.metric.MetricCounter;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/RemoteProducer.java
Thu Jun 11 04:32:16 2009
@@ -1,9 +1,12 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.activemq.dispatch.IDispatcher.DispatchContext;
 import org.apache.activemq.dispatch.IDispatcher.Dispatchable;
+import org.apache.activemq.flow.IFlowController;
+import org.apache.activemq.flow.ISinkController;
+import org.apache.activemq.flow.ISourceController;
 import org.apache.activemq.flow.Commands.Destination;
 import org.apache.activemq.flow.ISinkController.FlowUnblockListener;
 import org.apache.activemq.metric.MetricAggregator;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Router.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Router.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Router.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/Router.java
Thu Jun 11 04:32:16 2009
@@ -1,15 +1,16 @@
 /**
  * 
  */
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 
+import org.apache.activemq.flow.ISourceController;
 import org.apache.activemq.flow.Commands.Destination;
-import org.apache.activemq.flow.MockBroker.DeliveryTarget;
 import org.apache.activemq.protobuf.AsciiBuffer;
+import org.apache.activemq.queue.perf.MockBroker.DeliveryTarget;
 
 public class Router {
     final HashMap<AsciiBuffer, Collection<DeliveryTarget>> lookupTable = new
HashMap<AsciiBuffer, Collection<DeliveryTarget>>();

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestFlowManager.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestFlowManager.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestFlowManager.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestFlowManager.java
Thu Jun 11 04:32:16 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import org.apache.activemq.flow.Flow;
 import org.apache.activemq.flow.SizeLimiter;

Modified: activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestWireFormatFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestWireFormatFactory.java?rev=783627&r1=783625&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestWireFormatFactory.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/TestWireFormatFactory.java
Thu Jun 11 04:32:16 2009
@@ -1,4 +1,4 @@
-package org.apache.activemq.flow;
+package org.apache.activemq.queue.perf;
 
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.wireformat.ObjectStreamWireFormat;

Modified: activemq/sandbox/activemq-flow/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/pom.xml?rev=783627&r1=783626&r2=783627&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/pom.xml (original)
+++ activemq/sandbox/activemq-flow/pom.xml Thu Jun 11 04:32:16 2009
@@ -905,6 +905,15 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${org-apache-maven-surefire-plugin-version}</version>
+          <configuration>
+            <includes>
+              <include>**/*Test.java</include>
+              <include>**/*TestCase.java</include>
+            </includes>
+            <excludes>
+              <exclude>**/perf/**</exclude>
+            </excludes>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>



Mime
View raw message