svn commit: r358106 - in /incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq: axis/ActiveMQVendorAdapter.java benchmark/BenchmarkSupport.java

[chirino]

Author: chirino
Date: Tue Dec 20 13:19:28 2005
New Revision: 358106

URL: http://svn.apache.org/viewcvs?rev=358106&view=rev
Log:
the useEmbeddedBroker property not needed anymore.

Modified:
    
incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java
    
incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java

Modified: 
incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java?rev=358106&r1=358105&r2=358106&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java
 (original)
+++ 
incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/axis/ActiveMQVendorAdapter.java
 Tue Dec 20 13:19:28 2005
@@ -52,11 +52,6 @@
      */
     public final static String DEFAULT_PASSWORD = "defaultPassword";
 
-    /**
-     * Specifies whether the broker is embedded
-     */
-    public final static String EMBEDDED_BROKER = "embeddedBroker";
-
 
     public QueueConnectionFactory getQueueConnectionFactory(HashMap properties)
             throws Exception {
@@ -84,14 +79,10 @@
         if (jmsUrl.getPropertyValue(DEFAULT_PASSWORD) != null) {
             properties.put(DEFAULT_PASSWORD, 
jmsUrl.getPropertyValue(DEFAULT_PASSWORD));
         }
-        if (jmsUrl.getPropertyValue(EMBEDDED_BROKER) != null) {
-            properties.put(EMBEDDED_BROKER, 
jmsUrl.getPropertyValue(EMBEDDED_BROKER));
-        }
     }
 
     public boolean isMatchingConnectionFactory(ConnectionFactory 
connectionFactory, JMSURLHelper jmsURL, HashMap properties) {
         String brokerURL = null;
-        boolean embeddedBroker = false;
 
         if (connectionFactory instanceof ActiveMQConnectionFactory) {
             ActiveMQConnectionFactory amqConnectionFactory =
@@ -99,22 +90,11 @@
 
             // get existing queue connection factory properties
             brokerURL = amqConnectionFactory.getBrokerURL();
-            embeddedBroker = amqConnectionFactory.isUseEmbeddedBroker();
         }
 
         // compare broker url
         String propertyBrokerURL = (String) properties.get(BROKER_URL);
         if (!brokerURL.equals(propertyBrokerURL)) {
-            return false;
-        }
-
-        // compare load balancing flag
-        String tmpEmbeddedBroker = (String) properties.get(EMBEDDED_BROKER);
-        boolean propertyEmbeddedBroker = false;
-        if (tmpEmbeddedBroker != null) {
-            propertyEmbeddedBroker = 
Boolean.valueOf(tmpEmbeddedBroker).booleanValue();
-        }
-        if (embeddedBroker != propertyEmbeddedBroker) {
             return false;
         }
         return true;

Modified: 
incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java
URL: 
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java?rev=358106&r1=358105&r2=358106&view=diff
==============================================================================
--- 
incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java
 (original)
+++ 
incubator/activemq/trunk/activemq-optional/src/main/java/org/activemq/benchmark/BenchmarkSupport.java
 Tue Dec 20 13:19:28 2005
@@ -42,7 +42,6 @@
     protected int connectionCount = 1;
     protected int batch = 1000;
     protected Destination destination;
-    protected boolean embeddedBroker = false;
     private boolean topic = true;
     private boolean durable = false;
 
@@ -112,14 +111,6 @@
         this.durable = durable;
     }
 
-    public boolean isEmbeddedBroker() {
-        return embeddedBroker;
-    }
-
-    public void setEmbeddedBroker(boolean embeddedBroker) {
-        this.embeddedBroker = embeddedBroker;
-    }
-
     public int getConnectionCount() {
         return connectionCount;
     }
@@ -148,9 +139,6 @@
 
     protected ActiveMQConnectionFactory createFactory() {
         ActiveMQConnectionFactory answer = new 
ActiveMQConnectionFactory(getUrl());
-        if (embeddedBroker) {
-            answer.setUseEmbeddedBroker(true);
-        }
         return answer;
     }