[jboss-cvs] JBoss Messaging SVN: r6962 - in trunk/examples/core/perf: server0 and 1 other directory.

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

Author: ataylor
Date: 2009-05-21 08:21:46 -0400 (Thu, 21 May 2009)
New Revision: 6962

Modified:
   trunk/examples/core/perf/build.xml
   trunk/examples/core/perf/server0/jbm-jboss-beans.xml
Log:
fixed perf runServer target

Modified: trunk/examples/core/perf/build.xml
===================================================================
--- trunk/examples/core/perf/build.xml	2009-05-21 11:50:03 UTC (rev 6961)
+++ trunk/examples/core/perf/build.xml	2009-05-21 12:21:46 UTC (rev 6962)
@@ -31,10 +31,17 @@
 <project name="JBoss Messaging Perf Example">
 
    <import file="../../common/build.xml"/>
-   
+
+    <path id="extra.classpath">
+      <!--<fileset dir=".">
+         <include name="server0"/>
+      </fileset>-->
+       <path location="server0"/>
+   </path>
+
    <target name="runSender">
       <java classname="org.jboss.core.example.PerfSender" fork="true" resultproperty="example-result">
-		   <jvmarg value="-Xms512M"/>      
+		   <jvmarg value="-Xms512M"/>
 		   <jvmarg value="-Xmx512M"/>
          <jvmarg value="-XX:+UseParallelGC"/>
          <jvmarg value="-XX:+AggressiveOpts"/>
@@ -42,10 +49,10 @@
          <classpath refid="runtime.classpath"/>
       </java>
    </target>
-   
+
    <target name="runListener">
       <java classname="org.jboss.core.example.PerfSender" fork="true" resultproperty="example-result">
-         <jvmarg value="-Xms512M"/>      
+         <jvmarg value="-Xms512M"/>
 		   <jvmarg value="-Xmx512M"/>
          <jvmarg value="-XX:+UseParallelGC"/>
          <jvmarg value="-XX:+AggressiveOpts"/>
@@ -54,15 +61,16 @@
       </java>
    </target>
 
-   <target name="runServer">
-      <java classname="org.jboss.core.example.SpawnedJBMServer" fork="true" resultproperty="example-result">
-         <jvmarg value="-Xms512M"/>      
+   <target name="runServer" depends="compile">
+      <java classname="org.jboss.common.example.SpawnedJBMServer" fork="true" resultproperty="example-result">
+         <jvmarg value="-Xms512M"/>
 		   <jvmarg value="-Xmx512M"/>
          <jvmarg value="-XX:+UseParallelGC"/>
          <jvmarg value="-XX:+AggressiveOpts"/>
 		   <jvmarg value="-XX:+UseFastAccessorMethods"/>
+         <arg line="jbm-jboss-beans.xml"/>
          <classpath refid="runtime.classpath"/>
       </java>
    </target>
-   
+
 </project>
\ No newline at end of file

Modified: trunk/examples/core/perf/server0/jbm-jboss-beans.xml
===================================================================
--- trunk/examples/core/perf/server0/jbm-jboss-beans.xml	2009-05-21 11:50:03 UTC (rev 6961)
+++ trunk/examples/core/perf/server0/jbm-jboss-beans.xml	2009-05-21 12:21:46 UTC (rev 6962)
@@ -1,17 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
-      
+
+
+    <!-- MBean server -->
+   <bean name="MBeanServer" class="javax.management.MBeanServer">
+      <constructor factoryClass="java.lang.management.ManagementFactory"
+                   factoryMethod="getPlatformMBeanServer"/>
+   </bean>
+
    <!-- The core configuration -->
    <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
 
+   <!-- The security manager -->
+   <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+      <start ignored="true"/>
+      <stop ignored="true"/>
+   </bean>
+
    <!-- The core server -->
-   <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl"> 
+   <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+      <start ignored="true"/>
+      <stop ignored="true"/>
       <constructor>
          <parameter>
             <inject bean="Configuration"/>
-         </parameter>                    
-      </constructor>         
+         </parameter>
+         <parameter>
+            <inject bean="MBeanServer"/>
+         </parameter>
+         <parameter>
+            <inject bean="JBMSecurityManager"/>
+         </parameter>
+      </constructor>
    </bean>
-   
+
+   <!-- The JMS server -->
+   <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+      <constructor>
+         <parameter>
+            <inject bean="MessagingServer"/>
+         </parameter>
+      </constructor>
+   </bean>
+
+
 </deployment>