[jboss-cvs] JBoss Messaging SVN: r2653 - in projects/perf/trunk: src/main/org/jboss/jms/perf/framework/configuration and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: sergeypk
Date: 2007-05-04 11:57:37 -0400 (Fri, 04 May 2007)
New Revision: 2653

Modified:
   projects/perf/trunk/etc/perf.xml
   projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/Configuration.java
   projects/perf/trunk/src/main/org/jboss/jms/perf/framework/data/PerformanceTest.java
Log:
More QPid settings.
Change default-executor-url to default-executor-name.

Modified: projects/perf/trunk/etc/perf.xml
===================================================================
--- projects/perf/trunk/etc/perf.xml	2007-05-04 12:49:14 UTC (rev 2652)
+++ projects/perf/trunk/etc/perf.xml	2007-05-04 15:57:37 UTC (rev 2653)
@@ -7,7 +7,7 @@
 
    <!-- benchmark-wide test defaults -->
 
-   <default-executor-url>rmi://localhost:7777/remote</default-executor-url>
+   <default-executor-name>REMOTE</default-executor-name>
    <destination>/queue/testQueue</destination>
    <connection-factory>/ConnectionFactory</connection-factory>
    <acknowledgment-mode>AUTO_ACKNOWLEDGE</acknowledgment-mode>
@@ -56,6 +56,9 @@
       
       <provider name="QPid">
          <factory>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</factory>
+         <jndi-property name="connectionfactory./ConnectionFactory">amqp://guest:guest@/test?brokerlist='localhost'</jndi-property>
+         <jndi-property name="queue./queue/testQueue">testQueue</jndi-property>
+         <jndi-property name="queue./queue/simpleQueue">simpleQueue</jndi-property>
 
          <executor name="REMOTE" url="rmi://localhost:7777/remote-qpid"/>
          <executor name="REMOTE2" url="rmi://localhost:7777/remote-qpid2"/>
@@ -85,6 +88,7 @@
       </performance-test>
       -->
     
+      <!--
       <performance-test name="Ping Remote Only" loops="1">
          <ping executor="REMOTE"/>
          <ping executor="REMOTE2"/>
@@ -97,18 +101,23 @@
          <execution provider="ActiveMQ"/>
          <execution provider="QPid"/>
       </performance-test>
+      -->
 
       <!--
       <performance-test name="Single Burst" loops="10">
          <destination>/queue/simpleQueue</destination>
          <message-size>0</message-size>
          <messages>30000</messages>
-         <drain executor="COLOCATED"/>
+         <drain executor="REMOTE"/>
          <send rate="10000" executor="REMOTE"/>
          <execution provider="JBossMessaging"/>
+         <execution provider="JBossMQ"/>
+         <execution provider="ActiveMQ"/>
+         <execution provider="QPid"/>
       </performance-test>
       -->
 
+      <!--
       <performance-test name="Throughput O KB Message Non-Persistent Non-Transactional, 1 sender, 1 receiver">
 
          <graph>
@@ -165,8 +174,8 @@
          <execution provider="JBossMQ"/>
 
       </performance-test>
+      -->
       
-      <!--
       <performance-test name="Throughput-Remote">
 
          <graph>
@@ -272,11 +281,12 @@
 
          <drain/>
 
+         <execution provider="JBossMQ"/>
          <execution provider="JBossMessaging"/>
-         <execution provider="JBossMQ"/>
+         <execution provider="ActiveMQ"/>
+         <!-- <execution provider="QPid"/> -->
+      </performance-test>
 
-      </performance-test>
-      -->
       <!--
       <performance-test name="Throughput-INVM">
 

Modified: projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/Configuration.java
===================================================================
--- projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/Configuration.java	2007-05-04 12:49:14 UTC (rev 2652)
+++ projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/Configuration.java	2007-05-04 15:57:37 UTC (rev 2653)
@@ -100,7 +100,7 @@
    private String dbURL;
    private String reportDirectory;
    private boolean startExecutors;
-   private String defaultExecutorURL;
+   private String defaultExecutorName;
    int colorStep;
    private List performanceTests;
 
@@ -142,9 +142,9 @@
       return startExecutors;
    }
 
-   public String getDefaultExecutorURL()
+   public String getDefaultExecutorName()
    {
-      return defaultExecutorURL;
+      return defaultExecutorName;
    }
 
    public int getColorStep()
@@ -220,9 +220,9 @@
                {
                   startExecutors = toBoolean(n.getTextContent());
                }
-               else if ("default-executor-url".equals(name))
+               else if ("default-executor-name".equals(name))
                {
-                  defaultExecutorURL = n.getTextContent();
+                  defaultExecutorName = n.getTextContent();
                }
                else if ("color-step".equals(name))
                {

Modified: projects/perf/trunk/src/main/org/jboss/jms/perf/framework/data/PerformanceTest.java
===================================================================
--- projects/perf/trunk/src/main/org/jboss/jms/perf/framework/data/PerformanceTest.java	2007-05-04 12:49:14 UTC (rev 2652)
+++ projects/perf/trunk/src/main/org/jboss/jms/perf/framework/data/PerformanceTest.java	2007-05-04 15:57:37 UTC (rev 2653)
@@ -363,16 +363,14 @@
       if (executorName == null)
       {
          // use the default executor
-         executorURL = config.getDefaultExecutorURL();
+         executorName = config.getDefaultExecutorName();
       }
-      else
+      
+      executorURL = provider.getExecutorURL(executorName);
+      if (executorURL == null)
       {
-         executorURL = provider.getExecutorURL(executorName);
-         if (executorURL == null)
-         {
-            throw new Exception("Provider " + providerName +
-               " doesn't know to map executor " + executorName);
-         }
+         throw new Exception("Provider " + providerName +
+            " doesn't know to map executor " + executorName);
       }
 
       j.setJNDIProperties(jndiProperties);