[jboss-cvs] JBoss Messaging SVN: r2651 - in projects/perf/trunk: lib and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 4 08:45:19 EDT 2007
Author: sergeypk
Date: 2007-05-04 08:45:19 -0400 (Fri, 04 May 2007)
New Revision: 2651
Added:
projects/perf/trunk/lib/providers/
Modified:
projects/perf/trunk/build-perf.xml
projects/perf/trunk/build-thirdparty.xml
Log:
Added a directory to contain provider jars (lib/providers/<provider-name>).
Modified the build to run a separate set of remote executors for each providers, with appropriate classpaths.
Updated project dependencies - removed messaging and oswego-concurrent, added remoting instead.
Modified: projects/perf/trunk/build-perf.xml
===================================================================
--- projects/perf/trunk/build-perf.xml 2007-05-04 12:42:03 UTC (rev 2650)
+++ projects/perf/trunk/build-perf.xml 2007-05-04 12:45:19 UTC (rev 2651)
@@ -51,7 +51,19 @@
<property name="jbossmq.config.name" value="jbossmq"/>
<property name="perf.config.file" value="perf.xml"/>
+ <!-- foreach task -->
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+
<!--
+ JMS implementations used in the benchmark.
+
+ Place JARs for each implementation under lib/providers/<implementation-name> directory.
+ Each implementation will have its remote executors named 'remote-<implementation-name>'
+ and 'remote-<implementation-name>2'
+ -->
+ <property name="providers" value="jbossmq messaging activemq qpid" />
+
+ <!--
Project paths.
-->
@@ -106,13 +118,9 @@
<path id="external.dependencies.classpath">
<path refid="apache.log4j.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
<path refid="jfreechart.jfreechart.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="hsqldb.hsqldb.classpath"/>
- <path refid="javassist.javassist.classpath"/>
- <path refid="trove.trove.classpath"/>
-
</path>
<!--
@@ -122,9 +130,6 @@
<path id="jboss.dependencies.classpath">
<path refid="jboss.common.classpath"/>
<path refid="jboss.remoting.classpath"/>
- <path refid="jboss.serialization.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.messaging.classpath"/>
</path>
<!--
@@ -159,9 +164,6 @@
<path refid="external.dependencies.classpath"/>
<path refid="jboss.dependencies.classpath"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${ENV.JBOSS_HOME}/client/jnp-client.jar"/>
- <pathelement location="${ENV.JBOSS_HOME}/client/jbossmq-client.jar"/>
-
</path>
<!-- ======================================================================================== -->
@@ -360,16 +362,18 @@
<target name="start-rmi-executors">
<antcall target="start-rmi-registry"/>
<sleep seconds="1"/>
- <antcall target="start-standalone-rmi-executor">
+ <foreach list="${providers}" delimiter=" " param="provider.name"
+ target="start-standalone-rmi-executor">
<param name="registry.host" value="localhost"/>
<param name="registry.port" value="7777"/>
- <param name="executor.name" value="remote"/>
- </antcall>
- <antcall target="start-standalone-rmi-executor">
+ <param name="executor.suffix" value=""/>
+ </foreach>
+ <foreach list="${providers}" delimiter=" " param="provider.name"
+ target="start-standalone-rmi-executor">
<param name="registry.host" value="localhost"/>
<param name="registry.port" value="7777"/>
- <param name="executor.name" value="remote2"/>
- </antcall>
+ <param name="executor.suffix" value="2"/>
+ </foreach>
<!-- deploy colocated executors; port values hardcoded for the time being -->
<copy file="${project.output}/lib/rmi-executor-scoped.sar" todir="${ENV.JBOSS_HOME}/server/${messaging.config.name}/deploy"/>
<copy file="${project.output}/lib/rmi-executor.sar" todir="${ENV.JBOSS_HOME}/server/${jbossmq.config.name}/deploy"/>
@@ -390,17 +394,20 @@
<!-- undeploy colocated executors -->
<delete file="${ENV.JBOSS_HOME}/server/${messaging.config.name}/deploy/rmi-executor-scoped.sar"/>
<delete file="${ENV.JBOSS_HOME}/server/${jbossmq.config.name}/deploy/rmi-executor.sar"/>
+
<!-- and kill the standalone VMs -->
- <antcall target="kill-rmi-executor">
+ <foreach list="${providers}" delimiter=" " param="provider.name"
+ target="kill-rmi-executor">
<param name="registry.host" value="localhost"/>
<param name="registry.port" value="7777"/>
- <param name="executor.name" value="remote"/>
- </antcall>
- <antcall target="kill-rmi-executor">
+ <param name="executor.suffix" value=""/>
+ </foreach>
+ <foreach list="${providers}" delimiter=" " param="provider.name"
+ target="kill-rmi-executor">
<param name="registry.host" value="localhost"/>
<param name="registry.port" value="7777"/>
- <param name="executor.name" value="remote2"/>
- </antcall>
+ <param name="executor.suffix" value="2"/>
+ </foreach>
<!-- allow some time for service undeployment -->
<sleep seconds="3"/>
<antcall target="kill-rmi-registry"/>
@@ -416,11 +423,17 @@
<!--
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=executor"/>
-->
- <classpath refid="perf.classpath"/>
+ <classpath>
+ <path refid="perf.classpath" />
+ <fileset dir="${project.root}/lib/providers/${provider.name}">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
</java>
</target>
<target name="start-standalone-rmi-executor" description="Start a standalone (its own VM) RMI executor">
+ <property name="executor.name" value="remote-${provider.name}${executor.suffix}"/>
<echo message="Starting standalone RMI executor rmi://${registry.host}:${registry.port}/${executor.name}"/>
<java classname="org.jboss.jms.perf.framework.remoting.rmi.RMIExecutor" fork="true" spawn="true">
<arg value="${executor.name}"/>
@@ -431,7 +444,12 @@
<!--
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=executor"/>
-->
- <classpath refid="perf.classpath"/>
+ <classpath>
+ <path refid="perf.classpath" />
+ <fileset dir="${project.root}/lib/providers/${provider.name}">
+ <include name="**/*.jar" />
+ </fileset>
+ </classpath>
</java>
</target>
@@ -474,6 +492,7 @@
</target>
<target name="kill-rmi-executor" description="Kill a RMI executor (co-located or standalone)">
+ <property name="executor.name" value="remote-${provider.name}${executor.suffix}"/>
<echo message="Killing RMI executor rmi://${registry.host}:${registry.port}/${executor.name}"/>
<java classname="org.jboss.jms.perf.framework.remoting.rmi.ExecutorKiller" fork="true">
<arg value="${executor.name}"/>
Modified: projects/perf/trunk/build-thirdparty.xml
===================================================================
--- projects/perf/trunk/build-thirdparty.xml 2007-05-04 12:42:03 UTC (rev 2650)
+++ projects/perf/trunk/build-thirdparty.xml 2007-05-04 12:45:19 UTC (rev 2651)
@@ -80,13 +80,11 @@
Dependencies required to build the project.
-->
<componentref name="apache-log4j" version="1.2.8"/>
- <componentref name="oswego-concurrent" version="1.3.4"/>
<componentref name="junit" version="3.8.1"/>
<componentref name="jfreechart" version="1.0.2"/>
<componentref name="jboss/common" version="1.0.2"/>
- <componentref name="jboss/messaging" version="1.2.0.GA"/>
<componentref name="hsqldb" version="1.8.0.2"/>
-
+ <componentref name="jboss/remoting" version="2.2.0.SP3"/>
</build>
<synchronizeinfo/>
Property changes on: projects/perf/trunk/lib/providers
___________________________________________________________________
Name: svn:ignore
+ *
More information about the jboss-cvs-commits
mailing list