[jboss-svn-commits] JBL Code SVN: r34038 - in labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007: submission and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jul 19 13:11:06 EDT 2010


Author: whitingjr
Date: 2010-07-19 13:11:05 -0400 (Mon, 19 Jul 2010)
New Revision: 34038

Modified:
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
   labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/submission/submission.xml
Log:
Automated the creation of the runtime values into the submission xml.

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-19 17:02:18 UTC (rev 34037)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/scripts/build-api.xml	2010-07-19 17:11:05 UTC (rev 34038)
@@ -75,12 +75,10 @@
          command="/root/apache-ant-1.7.1/bin/ant -buildfile /root/java/batch-execution-SPEC-jms2007/scripts/server-controller/server-commands.xml stop"/>
    </target>
    
-
    <target name="gather-configuration" depends="clean">
       <echo>Gathering configuration located on EAP server.</echo>
-
-      <scp remotefile="root at hornetq:/jboss-5.1.0.Branch/bin/run.conf" localTodir="${spec.install.dir}/config/run.conf" failonerror="true" password="${r_p}"/>
-      
+      <scp remotefile="root at hornetq:${server.deployment.dir}/bin/run.conf" localTodir="${spec.install.dir}/config/run.conf" failonerror="true" password="${r_p}"/>
+      <scp remotefile="root at hornetq:${server.deployment.dir}/server/production/deploy/hornetq/hornetq-configuration.xml" localTodir="${spec.install.dir}/config/hornetq-configuration.xml" failonerror="true" password="${r_p}"/>
    </target>
 
    <target name="start-benchmark">
@@ -145,13 +143,51 @@
       <echo>Status of check is: ${log-collection.isValid}</echo>
    </target>
    
-   
    <target name="submission-preparation">
-      <message echo="Preparing the submission files with values used during the benchmark run."/>
-      
+      <echo message="Preparing the submission files with values used during the benchmark run."/>
+      <loadfile property="hornetq.configuration.xml" srcfile="${spec.install.dir}/output/${org.spec.internal.runId}/config/hornetq-configuration.xml" />
+      <loadfile property="horizontal.properties.configuration" srcfile="${spec.install.dir}/output/${org.spec.internal.runId}/config/horizontal.properties"/>
+      <loadproperties srcFile="${spec.install.dir}/output/${org.spec.internal.runId}/config/run.conf">
+         <filterchain>
+            <striplinecomments>
+               <comment value="#"/>
+               <comment value="if"/>
+            </striplinecomments>
+            <tokenfilter>
+                <replacestring from="   " to=""/>
+            </tokenfilter>
+            <linecontains>
+              <contains value="JAVA_OPTS"/>
+            </linecontains>
+            <prefixlines prefix="HORNETQ_OPTIONS."/>
+         </filterchain>
+      </loadproperties>
+      <loadproperties srcFile="${spec.install.dir}/output/${org.spec.internal.runId}/config/agent.properties">
+         <filterchain>
+            <striplinecomments>
+               <comment value="#"/>
+            </striplinecomments>
+            <prefixlines prefix="AGENT_OPTIONS."/>
+         </filterchain>
+
+      </loadproperties>
+      <copy file="${spec.install.dir}/output/${org.spec.internal.runId}/config/agent.properties" todir="/tmp">
+         <filterchain>
+            <striplinecomments>
+               <comment value="#"/>
+            </striplinecomments>
+            <prefixlines prefix="AGENT_OPTIONS."/>
+         </filterchain>
+      </copy>
+      <!-- Use property expansion to fill in the gaps in the template submission document. -->
+      <copy file="../submission/submission.xml" todir="${spec.install.dir}/submission">
+         <filterchain>
+            <expandproperties />
+         </filterchain>
+      </copy>
    </target>
 
-   <target name="generate-submission">
+   <target name="generate-submission" depends="submission-preparation">
       <echo>Checking success of the benchmark run.</echo>
       
       <xmltask source="${spec.install.dir}/output/${org.spec.internal.runId}/specjms-result.xml">

Modified: labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/submission/submission.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/submission/submission.xml	2010-07-19 17:02:18 UTC (rev 34037)
+++ labs/jbosstm/workspace/whitingjr/sandbox/batch-execution-SPEC-jms2007/submission/submission.xml	2010-07-19 17:11:05 UTC (rev 34038)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
 
   <info type="benchmark-info">
@@ -94,67 +95,13 @@
       <entry key="os.available">30 March 2010</entry>
       <entry key="systems.num">1</entry>
       <entry key="notes">
-      available
       <![CDATA[
  -----------------------------
 | hornetq-configuration.xml  |
  -----------------------------
+${hornetq.configuration.xml}  
 
-<configuration xmlns="urn:hornetq"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd">
 
-   <connectors>
-      <connector name="netty">
-         <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:hornetq}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </connector>
-   </connectors>
- <acceptors>
-      <acceptor name="netty">
-         <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
-         <param key="host"  value="${hornetq.remoting.netty.host:hornetq}"/>
-         <param key="port"  value="${hornetq.remoting.netty.port:5445}"/>
-      </acceptor>
-   </acceptors>
-
-   <security-settings>
-      <security-setting match="#">
-         <permission type="createTempQueue" roles="guest"/>
-         <permission type="deleteTempQueue" roles="guest"/>
-         <permission type="createDurableQueue" roles="guest"/>
-         <permission type="deleteDurableQueue" roles="guest"/>
-         <permission type="consume" roles="guest"/>
-         <permission type="send" roles="guest"/>
-      </security-setting>
-   </security-settings>
-
-   <address-settings>
-      <!--default for catch all-->
-      <address-setting match="#">
-         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
-         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
-         <redelivery-delay>0</redelivery-delay>
-         <max-size-bytes>-1</max-size-bytes>
-         <page-size-bytes>10485760</page-size-bytes>
-         <message-counter-history-day-limit>10</message-counter-history-day-limit>
-      </address-setting>
-   </address-settings>
-
-   <persistence-enabled>true</persistence-enabled>
-   <security-enabled>false</security-enabled>
-   <paging-directory>../data/paging</paging-directory>
-   <bindings-directory>../data/bindings</bindings-directory>
-   <journal-directory>/perf1/journal</journal-directory>
-   <journal-min-files>400</journal-min-files>
-   <large-messages-directory>../data/large-messages</large-messages-directory>
-
-
-</configuration>
-
-
-
     ]]></entry>
     </properties>
 
@@ -178,280 +125,10 @@
       <entry key="os.name">RHEL 5.5</entry>
       <entry key="systems.num">1</entry>
       <entry key="notes"><![CDATA[
-
-# --------------------------------------------------------------------------------- #
-# SPECjms2007 Horizontal topology properties                                        #
-# --------------------------------------------------------------------------------- #
-
-org.spec.jms.configuration = horizontal
-
-# This is the BASE scaling property for horizontal tests. Although the value can be
-# lower, the transaction mix will be incorrect for values under 5.
-# It is current synonymous with org.spec.jms.sm.count
-org.spec.jms.horizontal.BASE = 340
-
-
-# ALL PROPERTIES BELOW ARE OPTIONAL
-
-# Agents will be assigned to the given list of Nodes in a round-robin allocation.
-# >> Leaving this blank runs the test locally.
-# >> Adding the same node-name more than once will double the number of Agents
-# put on that Node.
-# >> Ordering of node-names is respected.
-#org.spec.jms.dc.nodes = client1
-#org.spec.jms.sm.nodes = client1
-#org.spec.jms.sp.nodes = client1
-#org.spec.jms.hq.nodes = client1
-
-org.spec.jms.dc.nodes = 
-org.spec.jms.sm.nodes = 
-org.spec.jms.sp.nodes = 
-org.spec.jms.hq.nodes =
-
-# In freeform configuration, there is no checking that you are specifying a sensible
-# set of values, it is therefore (easily) possible to create a broken scenario.
-
-# Number of Agents representing a single logical Location. These will be represented
-# as Location "4-1", "4-2".
-org.spec.jms.dc.agents_per_location = 1
-org.spec.jms.sm.agents_per_location = 1
-org.spec.jms.sp.agents_per_location = 1
-org.spec.jms.hq.agents_per_location = 1
-
-# exclude-agents provide a list of Agents (e.g. "4a") that will NOT run
-# during the benchmark.
-# This provides debuggers/profilers with a means to attach to individual JVMs by
-# starting them manually at the correct time. The SPECjmsSatelliteDriver will
-# print the required invocation to STDOUT (not including details of the
-# current environment or classpath)
-org.spec.jms.debug.dc.exclude_agents =
-org.spec.jms.debug.sm.exclude_agents =
-org.spec.jms.debug.sp.exclude_agents =
-org.spec.jms.debug.hq.exclude_agents =
-
-# Limits the number of Client JVMs running on a single Node. Agents will be
-# round-robin distributed amongst these JVMs.
-# 0 or unset implies no limit and each Agent has its own JVM.
-org.spec.jms.dc.jvms_per_node = 3
-org.spec.jms.sm.jvms_per_node = 3
-org.spec.jms.sp.jvms_per_node = 3
-org.spec.jms.hq.jvms_per_node = 3
-
-# Agent JVM tuning. These will appended to the JAVA property of
-# default.env on the Satellite.
-org.spec.jms.sp.jvmOptions = -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms2G -Xmx2G -XX:PermSize=1G
-org.spec.jms.sm.jvmOptions = -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms2G -Xmx2G -XX:PermSize=1G
-org.spec.jms.dc.jvmOptions = -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms2G -Xmx2G -XX:PermSize=1G
-org.spec.jms.hq.jvmOptions = -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms2G -Xmx2G -XX:PermSize=1G
-
-# Limits the number of javax.jms.Connection objects shared amongst
-# Event Handler classes within a single Agent. EHs will be round-robin
-# distributed amongst these connections.
-# 0 or unset implies that each EH has its own connection.
-org.spec.jms.dc.max_connections_per_agent = 1
-org.spec.jms.sm.max_connections_per_agent = 1
-org.spec.jms.sp.max_connections_per_agent = 1
-org.spec.jms.hq.max_connections_per_agent = 1
-
-# Defines if DC Event Handlers with 2 javax.jms.Session objects will use the same
-# connection. If false, the sessions are allocated connections independantly.
-org.spec.jms.dc.sessions_share_connection = true
-
-
-# Number of Event Handlers in a DCAgent (do not rename without editting DCControlThread)
-org.spec.jms.dc.DC_OrderEH.count = 1
-org.spec.jms.dc.DC_POrderConfEH.count = 1
-org.spec.jms.dc.DC_PShipArrEH.count = 1
-org.spec.jms.dc.DC_ShipConfEH.count = 1
-org.spec.jms.dc.DC_ShipDepEH.count = 1
-org.spec.jms.dc.DC_IncomingOffersEH.count = 1
-
-# Number of Event Handlers in an HQAgent (do not rename without editting HQControlThread)
-org.spec.jms.hq.HQ_InvoiceEH.count = 1
-org.spec.jms.hq.HQ_OrderDCStatsEH.count = 1
-org.spec.jms.hq.HQ_ShipDCStatsEH.count = 1
-org.spec.jms.hq.HQ_SMStatsEH.count = 1
-
-# Number of Event Handlers in an SPAgent (do not rename without editting SPControlThread)
-org.spec.jms.sp.SP_POrderEH.count = 1
-org.spec.jms.sp.SP_PShipConfEH.count = 1
-org.spec.jms.sp.SP_CallForOffersEH.count = 1 
-
-# Number of Event Handlers in an SMAgent (do not rename without editting SMControlThread)
-org.spec.jms.sm.SM_OrderConfEH.count = 1
-org.spec.jms.sm.SM_InvMovementEH.count = 1
-org.spec.jms.sm.SM_ShipArrEH.count = 1
-
-# Number of Driver instances
-org.spec.jms.sm.SM_Interaction1DR.count = 1
-org.spec.jms.dc.DC_Interaction2DR.count = 1
-org.spec.jms.hq.HQ_Interaction3DR.count = 1
-org.spec.jms.sm.SM_Interaction4DR.count = 1
-org.spec.jms.sm.SM_Interaction5DR.count = 1
-org.spec.jms.hq.HQ_Interaction6DR.count = 1
-org.spec.jms.hq.HQ_Interaction7DR.count = 1
-
-# JNDI Connection factory names. If specified, these will override the
-# default given in the <vendor>.properties file.
-# NB. If specified, the benchmarkSetup program *will* attempt to create
-# each of these.
-org.spec.jms.dc.DC_OrderEH.cf =
-org.spec.jms.dc.DC_POrderConfEH.cf =
-org.spec.jms.dc.DC_PShipArrEH.cf =
-org.spec.jms.dc.DC_ShipConfEH.cf =
-org.spec.jms.dc.DC_ShipDepEH.cf =
-org.spec.jms.dc.DC_Interaction2DR.cf =
-org.spec.jms.dc.DC_IncomingOffersEH.cf
-
-org.spec.jms.hq.HQ_InvoiceEH.cf =
-org.spec.jms.hq.HQ_OrderDCStatsEH.cf =
-org.spec.jms.hq.HQ_ShipDCStatsEH.cf =
-org.spec.jms.hq.HQ_SMStatsEH.cf =
-org.spec.jms.hq.HQ_Interaction3DR.cf =
-org.spec.jms.hq.HQ_Interaction6DR.cf =
-org.spec.jms.hq.HQ_Interaction7DR.cf =
-
-org.spec.jms.sp.SP_POrderEH.cf =
-org.spec.jms.sp.SP_PShipConfEH.cf =
-org.spec.jms.sp.SP_CallForOffersEH.cf =
-
-org.spec.jms.sm.SM_CreditCardHLEH.cf =
-org.spec.jms.sm.SM_OrderConfEH.cf =
-org.spec.jms.sm.SM_PriceUpdateEH.cf =
-org.spec.jms.sm.SM_ProductAnnouncementEH.cf =
-org.spec.jms.sm.SM_InvMovementEH.cf =
-org.spec.jms.sm.SM_ShipArrEH.cf =
-org.spec.jms.sm.SM_Interaction1DR.cf =
-org.spec.jms.sm.SM_Interaction4DR.cf =
-org.spec.jms.sm.SM_Interaction5DR.cf =
-
-
-# --------------------------------------------------------------------------------- #
-# CONSTANTS - these can be changed by the user but will invalidate a submittable    #
-# run if done so. Where properties are internally calculated they are shown with    #
-# a ### comment. If set, these will override the calculation and can easily lead    #
-# to impossible scenarios.                                                          #
-# --------------------------------------------------------------------------------- #
-
-# Properties with an _X are scales against the BASE upon which those values are calculated.
-# Properties with a ### are calculated internally unless specified here.
-
-# The number of logical Locations being represented in this run.
-###org.spec.jms.dc.count = 1
-###org.spec.jms.sm.count = 1
-###org.spec.jms.sp.count = 1
-###org.spec.jms.hq.count = 1
-
-# Rate per Location (msg per sec., 0 ==> no messaging, <blank> ==> unthrottled)
-org.spec.jms.sm.SM_Interaction1DR.rate	=	1.539201540
-org.spec.jms.dc.DC_Interaction2DR.rate	=	2.133333334
-org.spec.jms.hq.HQ_Interaction3DR.rate	=	6.000000000
-org.spec.jms.sm.SM_Interaction4DR.rate	=	3.378378378
-org.spec.jms.sm.SM_Interaction5DR.rate	=	11.544011544
-org.spec.jms.hq.HQ_Interaction6DR.rate	=	11.385199240
-org.spec.jms.hq.HQ_Interaction7DR.rate	=	9.230769230
-
-# Total number of messages per Driver instance (mg=0 ==> unlimited)
-org.spec.jms.sm.SM_Interaction1DR.msg.count = 0
-org.spec.jms.dc.DC_Interaction2DR.msg.count = 0
-org.spec.jms.hq.HQ_Interaction3DR.msg.count = 0
-org.spec.jms.sm.SM_Interaction4DR.msg.count = 0
-org.spec.jms.sm.SM_Interaction5DR.msg.count = 0
-org.spec.jms.hq.HQ_Interaction6DR.msg.count = 0
-org.spec.jms.hq.HQ_Interaction7DR.msg.count = 0
-
-# Defines whether data is cached when creating messages
-org.spec.jms.sm.SM_Interaction1DR.cache.active = true
-org.spec.jms.dc.DC_Interaction2DR.cache.active = true
-org.spec.jms.sm.SM_Interaction4DR.cache.active = true
-org.spec.jms.sm.SM_Interaction5DR.cache.active = true
-org.spec.jms.hq.HQ_Interaction7DR.cache.active = true
-
-# Number of cache entries available for message creation
-org.spec.jms.sm.SM_Interaction1DR.cache.size = 100
-org.spec.jms.dc.DC_Interaction2DR.cache.size = 100
-org.spec.jms.sm.SM_Interaction4DR.cache.size = 100
-org.spec.jms.sm.SM_Interaction5DR.cache.size = 100
-org.spec.jms.hq.HQ_Interaction7DR.cache.size = 100
-
-
-# Message size distributions
-# >> Probabilities must add up to 100
-# >> Sizes are NOT in kB, each is interpreted specially to that
-# interaction.  For sizes in kByte use the Excel Sheet.
-org.spec.jms.sm.SM_Interaction1DR.msg.prob.1 	=	95
-org.spec.jms.sm.SM_Interaction1DR.msg.size.1 	=	5
-org.spec.jms.sm.SM_Interaction1DR.msg.prob.2 	=	4
-org.spec.jms.sm.SM_Interaction1DR.msg.size.2 	=	100
-org.spec.jms.sm.SM_Interaction1DR.msg.prob.3 	=	1
-org.spec.jms.sm.SM_Interaction1DR.msg.size.3 	=	700
-
-org.spec.jms.dc.DC_Interaction2DR.msg.prob.1	=	95
-org.spec.jms.dc.DC_Interaction2DR.msg.size.1	=	3
-org.spec.jms.dc.DC_Interaction2DR.msg.prob.2	=	4
-org.spec.jms.dc.DC_Interaction2DR.msg.size.2	=	35
-org.spec.jms.dc.DC_Interaction2DR.msg.prob.3 	=	1
-org.spec.jms.dc.DC_Interaction2DR.msg.size.3	=	200
-
-# Note, interaction 3 uses a fixed size
-
-org.spec.jms.sm.SM_Interaction4DR.msg.prob.1 	=	95
-org.spec.jms.sm.SM_Interaction4DR.msg.size.1	=	10
-org.spec.jms.sm.SM_Interaction4DR.msg.prob.2	=	4
-org.spec.jms.sm.SM_Interaction4DR.msg.size.2	=	100
-org.spec.jms.sm.SM_Interaction4DR.msg.prob.3	=	1
-org.spec.jms.sm.SM_Interaction4DR.msg.size.3	=	500
-
-# Interaction 5 is a special case.
-# The size also defined via the numbers of CashDesk per SM.
-org.spec.jms.sm.cashdesks_per_sm = 5
-org.spec.jms.sm.SM_Interaction5DR.msg.prob.1	=	95
-org.spec.jms.sm.SM_Interaction5DR.msg.size.1 	=	2
-org.spec.jms.sm.SM_Interaction5DR.msg.prob.2 	=	4
-org.spec.jms.sm.SM_Interaction5DR.msg.size.2	=	7
-org.spec.jms.sm.SM_Interaction5DR.msg.prob.3 	=	1
-org.spec.jms.sm.SM_Interaction5DR.msg.size.3	=	13
-
-org.spec.jms.hq.HQ_Interaction6DR.msg.prob.1	=	95
-org.spec.jms.hq.HQ_Interaction6DR.msg.size.1	=	100
-org.spec.jms.hq.HQ_Interaction6DR.msg.prob.2	=	4
-org.spec.jms.hq.HQ_Interaction6DR.msg.size.2	=	10
-org.spec.jms.hq.HQ_Interaction6DR.msg.prob.3	=	1
-org.spec.jms.hq.HQ_Interaction6DR.msg.size.3	=	1000
-
-org.spec.jms.hq.HQ_Interaction7DR.msg.prob.1	=	95
-org.spec.jms.hq.HQ_Interaction7DR.msg.size.1 	=	50
-org.spec.jms.hq.HQ_Interaction7DR.msg.prob.2	=	4
-org.spec.jms.hq.HQ_Interaction7DR.msg.size.2	=	500
-org.spec.jms.hq.HQ_Interaction7DR.msg.prob.3	=	1
-org.spec.jms.hq.HQ_Interaction7DR.msg.size.3	=	3000
-
-
-# Global
-
-SM.count_X = 1
-SP.count_X = 0.4
-HQ.count_X = 0.1
-SMs_per_DC = 5
-ProductFamily_count_X = 1
-
-# This property defines, how many product families a supplier subscribes to (as a fixed value).
-ProductFamilies_per_SP = 5
-
-# ProductFamily Count specifies, how many topics exist for the product families (one topic per ProductFamily).
-### org.spec.jms.ProductFamily_count = 4
-
-# Defines, how many product family topics a single SP subscribes to (as a percent).
-# E.g. 100 Product Families, ProductFamilies_per_SP_percent = 40 % ==> Every SP subscribes to 40 topics. 
-### org.spec.jms.ProductFamilies_per_SP_percent = 100
-
-# If AutoAck = true (standard), AUTO_ACKNOWLEDGE is used in Interaction 7.
-# If AutoAck = false ==> DUPS_OK is used.
-org.spec.jms.Interaction7.autoAck = true
-
-# How often (in messages) each JMS Producer will invoke an CRC (Adler32) of the
-# transmitted bytes.
-org.spec.jms.crcFrequency = 1000
+ -----------------------------
+| horizontal.properties      |
+ -----------------------------
+${horizontal.properties.configuration} 
     ]]></entry>
     </properties>
 
@@ -461,10 +138,10 @@
   <info type="product-info">
     <properties name="jms-product">
       <entry key="id">jms-product-1</entry>
-      <entry key="name">JBoss HornetQ 2.0.0.GA</entry>
+      <entry key="name">JBoss EAP 5.1</entry>
       <entry key="vendor">Red Hat, Inc.</entry>
       <entry key="os">RHEL 5.5</entry>
-      <entry key="avail"></entry>
+      <entry key="avail">August 2010</entry>
     </properties>
 
     <properties name="jvm-product">
@@ -477,15 +154,13 @@
     <properties name="jvm-product">
       <entry key="id">jvm-product-2</entry>
       <entry key="name">OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode)/OpenJDK Runtime Environment (IcedTea6 1.6) (rhel-1.11.b16.el5-x86_64)</entry>
-      <entry key="vendor"></entry>
+      <entry key="vendor">OpenJDK</entry>
       <entry key="os">RHEL 5.5 (2.6.18-194.el5)</entry>
       <entry key="avail"></entry>
     </properties>
 
-
   </info>
 
-
   <info type="node-info">
     <properties name="jms-server-node">
       <entry key="id">sw-jms-server-1</entry>
@@ -495,7 +170,10 @@
       <entry key="hw.id">hw-jms-server-1</entry>
       <entry key="instances">1</entry>
       <entry key="notes"><![CDATA[
-  -server  -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms20G -Xmx20G
+ ----------------------------
+| HornetQ jvm options       |
+ ----------------------------
+JAVA_OPTS=${HORNETQ_OPTIONS.JAVA_OPTS}  
       ]]></entry>
     </properties>
 
@@ -509,11 +187,54 @@
       <entry key="instances">1</entry>
       <entry key="agents">10</entry>
       <entry key="notes"><![CDATA[
-  -server  -XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms2G -Xmx2G  -XX:PermSize=1G
+ -----------------------------
+| HQ Agent jvm options       | 
+ -----------------------------
+org.spec.jms.hq.jvmOptions=${AGENT_OPTIONS.org.spec.jms.hq.jvmOptions}
+ -----------------------------
+| DC Agent jvm options       |
+ -----------------------------
+org.spec.jms.dc.jvmOptions=${AGENT_OPTIONS.org.spec.jms.dc.jvmOptions}
+ -----------------------------
+| SM Agent jvm options       |
+ -----------------------------
+org.spec.jms.sm.jvmOptions=${AGENT_OPTIONS.org.spec.jms.sm.jvmOptions}
+ -----------------------------
+| SP Agent jvm options       |
+ -----------------------------
+org.spec.jms.sp.jvmOptions=${AGENT_OPTIONS.org.spec.jms.sp.jvmOptions}
       ]]></entry>
     </properties>
 
+   <properties name="client-node">
+      <entry key="id">sw-client-node-2</entry>
+      <entry key="name">Client Node 2 SW Config</entry>
+      <entry key="product.jvm.id">jvm-product-2</entry>
+      <entry key="product.other.id">other-product-1</entry>
+      <entry key="jvm.instances">1</entry>
+      <entry key="hw.id">hw-client-node-2</entry>
+      <entry key="instances">1</entry>
+      <entry key="agents">10</entry>
+      <entry key="notes"><![CDATA[
+ -----------------------------
+| HQ Agent jvm options       | 
+ -----------------------------
+org.spec.jms.hq.jvmOptions=${AGENT_OPTIONS.org.spec.jms.hq.jvmOptions} 
+ -----------------------------
+| DC Agent jvm options       |
+ -----------------------------
+org.spec.jms.dc.jvmOptions=${AGENT_OPTIONS.org.spec.jms.dc.jvmOptions}
+ -----------------------------
+| SM Agent jvm options       |
+ -----------------------------
+org.spec.jms.sm.jvmOptions=${AGENT_OPTIONS.org.spec.jms.sm.jvmOptions}
+ -----------------------------
+| SP Agent jvm options       |
+ -----------------------------
+org.spec.jms.sp.jvmOptions=${AGENT_OPTIONS.org.spec.jms.sp.jvmOptions}
+      ]]></entry>
+    </properties>
+   
   </info>
 
 </configuration>
-



More information about the jboss-svn-commits mailing list