svn commit: r787429 - in /activemq/sandbox/activemq-flow/activemq-queue/src/test: java/org/apache/activemq/queue/perf/MockBrokerTest.java resources/META-INF/services/org/apache/activemq/wireformat/default

[chirino]

Author: chirino
Date: Mon Jun 22 22:45:36 2009
New Revision: 787429

URL: http://svn.apache.org/viewvc?rev=787429&view=rev
Log:
delete the default service entry as it conflicts with the standard default 
entry defined in the openwire module.

Removed:
    
activemq/sandbox/activemq-flow/activemq-queue/src/test/resources/META-INF/services/org/apache/activemq/wireformat/default
Modified:
    
activemq/sandbox/activemq-flow/activemq-queue/src/test/java/org/apache/activemq/queue/perf/MockBrokerTest.java

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=787429&r1=787428&r2=787429&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
 Mon Jun 22 22:45:36 2009
@@ -85,11 +85,11 @@
             receiveBrokerURI = "tcp://localhost:20000?wireFormat=proto";
         } else {
             if (forceMarshalling) {
+                sendBrokerURI = 
"pipe://SendBroker?wireFormat=proto&marshal=true";
+                receiveBrokerURI = 
"pipe://ReceiveBroker?wireFormat=proto&marshal=true";
+            } else {
                 sendBrokerURI = "pipe://SendBroker?wireFormat=proto";
                 receiveBrokerURI = "pipe://ReceiveBroker?wireFormat=proto";
-            } else {
-                sendBrokerURI = "pipe://SendBroker";
-                receiveBrokerURI = "pipe://ReceiveBroker";
             }
         }
     }