[jboss-cvs] JBoss Messaging SVN: r7067 - in trunk/examples/core/perf: src/org/jboss/core/example and 1 other directory.

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

Author: timfox
Date: 2009-05-27 08:05:59 -0400 (Wed, 27 May 2009)
New Revision: 7067

Modified:
   trunk/examples/core/perf/build.xml
   trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java
   trunk/examples/core/perf/src/org/jboss/core/example/PerfListener.java
   trunk/examples/core/perf/src/org/jboss/core/example/PerfSender.java
Log:
support configurable perf.properties

Modified: trunk/examples/core/perf/build.xml
===================================================================
--- trunk/examples/core/perf/build.xml	2009-05-27 11:42:24 UTC (rev 7066)
+++ trunk/examples/core/perf/build.xml	2009-05-27 12:05:59 UTC (rev 7067)
@@ -32,12 +32,11 @@
 
    <import file="../../common/build.xml"/>
 
-    <path id="extra.classpath">
-      <!--<fileset dir=".">
-         <include name="server0"/>
-      </fileset>-->
+   <path id="extra.classpath">
        <path location="server0"/>
    </path>
+   
+   <property name="perf.properties.file.name" value="perf.properties" />
 
    <target name="runSender" depends="compile">
       <java classname="org.jboss.core.example.PerfSender" fork="true" resultproperty="example-result">
@@ -45,18 +44,20 @@
 		   <jvmarg value="-Xmx512M"/>
          <jvmarg value="-XX:+UseParallelGC"/>
          <jvmarg value="-XX:+AggressiveOpts"/>
-		   <jvmarg value="-XX:+UseFastAccessorMethods"/>               
+		   <jvmarg value="-XX:+UseFastAccessorMethods"/>             
+         <arg line="${perf.properties.file.name}"/>
          <classpath refid="client.classpath"/>
       </java>
    </target>
 
    <target name="runListener" depends="compile">
-      <java classname="org.jboss.core.example.PerfListener" fork="true" resultproperty="example-result">
+      <java classname="org.jboss.core.example.PerfListener" fork="true" resultproperty="example-result">         
          <jvmarg value="-Xms512M"/>
 		   <jvmarg value="-Xmx512M"/>
          <jvmarg value="-XX:+UseParallelGC"/>
          <jvmarg value="-XX:+AggressiveOpts"/>
-		   <jvmarg value="-XX:+UseFastAccessorMethods"/>         
+		   <jvmarg value="-XX:+UseFastAccessorMethods"/>   
+         <arg line="${perf.properties.file.name}"/>
          <classpath refid="client.classpath"/>
       </java>
    </target>
@@ -66,7 +67,7 @@
          <jvmarg value="-Xms2048M"/>
 		   <jvmarg value="-Xmx2048M"/>
          <jvmarg value="-XX:+UseParallelGC"/> 
-      	 <sysproperty key="java.library.path" value="${java.library.path}${path.separator}${aio.library.path}"/>
+      	<sysproperty key="java.library.path" value="${java.library.path}${path.separator}${aio.library.path}"/>
          <jvmarg value="-XX:+AggressiveOpts"/>
 		   <jvmarg value="-XX:+UseFastAccessorMethods"/>         
          <arg line="jbm-jboss-beans.xml"/>

Modified: trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java
===================================================================
--- trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java	2009-05-27 11:42:24 UTC (rev 7066)
+++ trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java	2009-05-27 12:05:59 UTC (rev 7067)
@@ -54,8 +54,28 @@
 public abstract class PerfBase
 {
    private static final Logger log = Logger.getLogger(PerfSender.class.getName());
+   
+   private static final String DEFAULT_PERF_PROPERTIES_FILE_NAME = "perf.properties";
+   
+   protected static String getPerfFileName(String[] args)
+   {
+      String fileName;
+      
+      if (args.length > 0)
+      {
+         fileName = args[0];
+      }
+      else
+      {
+         fileName = DEFAULT_PERF_PROPERTIES_FILE_NAME;
+      }
+      
+      log.info("Using file name " + fileName);
+      
+      return fileName;
+   }
 
-   protected static PerfParams getParams() throws Exception
+   protected static PerfParams getParams(final String fileName) throws Exception
    {
       Properties props = null;
 
@@ -63,7 +83,7 @@
 
       try
       {
-         is = new FileInputStream("perf.properties");
+         is = new FileInputStream(fileName);
 
          props = new Properties();
 

Modified: trunk/examples/core/perf/src/org/jboss/core/example/PerfListener.java
===================================================================
--- trunk/examples/core/perf/src/org/jboss/core/example/PerfListener.java	2009-05-27 11:42:24 UTC (rev 7066)
+++ trunk/examples/core/perf/src/org/jboss/core/example/PerfListener.java	2009-05-27 12:05:59 UTC (rev 7067)
@@ -34,12 +34,14 @@
 public class PerfListener extends PerfBase
 {
    private static final Logger log = Logger.getLogger(PerfListener.class.getName());
-
+      
    public static void main(String[] args)
    {
       try
       {
-         PerfParams params = getParams();
+         String fileName = PerfBase.getPerfFileName(args);
+         
+         PerfParams params = getParams(fileName);
 
          new PerfListener(params).run();
       }

Modified: trunk/examples/core/perf/src/org/jboss/core/example/PerfSender.java
===================================================================
--- trunk/examples/core/perf/src/org/jboss/core/example/PerfSender.java	2009-05-27 11:42:24 UTC (rev 7066)
+++ trunk/examples/core/perf/src/org/jboss/core/example/PerfSender.java	2009-05-27 12:05:59 UTC (rev 7067)
@@ -39,8 +39,10 @@
    {
       try
       {
-         PerfParams params = getParams();
-
+         String fileName = PerfBase.getPerfFileName(args);
+         
+         PerfParams params = getParams(fileName);
+         
          new PerfSender(params).run();
       }
       catch (Exception e)