[jboss-cvs] JBoss Messaging SVN: r6498 - in trunk/examples/jms: paging and 2 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2009-04-20 11:30:50 -0400 (Mon, 20 Apr 2009)
New Revision: 6498

Modified:
   trunk/examples/jms/large-message/src/org/jboss/jms/example/LargeMessageExample.java
   trunk/examples/jms/paging/build.xml
   trunk/examples/jms/paging/server0/jbm-configuration.xml
   trunk/examples/jms/paging/server0/jbm-queues.xml
   trunk/examples/jms/paging/src/org/jboss/jms/example/PagingExample.java
Log:
tweaks on Paging

Modified: trunk/examples/jms/large-message/src/org/jboss/jms/example/LargeMessageExample.java
===================================================================
--- trunk/examples/jms/large-message/src/org/jboss/jms/example/LargeMessageExample.java	2009-04-20 13:18:30 UTC (rev 6497)
+++ trunk/examples/jms/large-message/src/org/jboss/jms/example/LargeMessageExample.java	2009-04-20 15:30:50 UTC (rev 6498)
@@ -49,17 +49,17 @@
    public static void main(String[] args)
    {
       // We limit the server to running in only 50MB of RAM
-      String[] serverJMXArgs = new String[] {"-Xms50M",
-                                             "-Xmx50M",
-                                             "-XX:+UseParallelGC",
-                                             "-XX:+AggressiveOpts",
-                                             "-XX:+UseFastAccessorMethods"};
+      String[] serverArgs = new String[] { "-Xms50M",
+                                          "-Xmx50M",
+                                          "-XX:+UseParallelGC",
+                                          "-XX:+AggressiveOpts",
+                                          "-XX:+UseFastAccessorMethods" };
 
-      new LargeMessageExample().run(serverJMXArgs, args);
+      new LargeMessageExample().run(serverArgs, args);
    }
 
-   //The message we will send is size 256MB, even though we are only running in 50MB of RAM on both client and server.
-   //JBoss Messaging will support much larger message sizes, but we use 512MB so the example runs in reasonable time.
+   // The message we will send is size 256MB, even though we are only running in 50MB of RAM on both client and server.
+   // JBoss Messaging will support much larger message sizes, but we use 512MB so the example runs in reasonable time.
    private final long FILE_SIZE = 256 * 1024 * 1024;
 
    public boolean runExample() throws Exception
@@ -109,7 +109,7 @@
          // file, however we could use any InputStream not just a FileInputStream.
          FileInputStream fileInputStream = new FileInputStream(fileInput);
          BufferedInputStream bufferedInput = new BufferedInputStream(fileInputStream);
-         
+
          message.setObjectProperty("JMS_JBM_InputStream", bufferedInput);
 
          System.out.println("Sending the huge message.");

Modified: trunk/examples/jms/paging/build.xml
===================================================================
--- trunk/examples/jms/paging/build.xml	2009-04-20 13:18:30 UTC (rev 6497)
+++ trunk/examples/jms/paging/build.xml	2009-04-20 15:30:50 UTC (rev 6498)
@@ -35,6 +35,10 @@
    <target name="run">
       <antcall target="runExample">
          <param name="example.classname" value="org.jboss.jms.example.PagingExample"/>
+
+        <!-- We limit the client to running in only 50MB of RAM -->
+    	   <param name="java-min-memory" value="50M"/>
+    	   <param name="java-max-memory" value="50M"/>
       </antcall>
    </target>
 

Modified: trunk/examples/jms/paging/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-configuration.xml	2009-04-20 13:18:30 UTC (rev 6497)
+++ trunk/examples/jms/paging/server0/jbm-configuration.xml	2009-04-20 15:30:50 UTC (rev 6498)
@@ -23,6 +23,10 @@
       <!-- Other config -->
 
       <journal-min-files>2</journal-min-files>
+      
+      <paging-max-global-size-bytes>20485760</paging-max-global-size-bytes>
+      <paging-global-watermark-size>1048576</paging-global-watermark-size>
+      
 
    </configuration>
 

Modified: trunk/examples/jms/paging/server0/jbm-queues.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-queues.xml	2009-04-20 13:18:30 UTC (rev 6497)
+++ trunk/examples/jms/paging/server0/jbm-queues.xml	2009-04-20 15:30:50 UTC (rev 6498)
@@ -26,4 +26,8 @@
       <page-size-bytes>20000</page-size-bytes>
    </address-settings>
 
+   <address-settings match="jms.queue.exampleQueue">
+      <page-size-bytes>1048576</page-size-bytes>
+   </address-settings>
+
 </settings>

Modified: trunk/examples/jms/paging/src/org/jboss/jms/example/PagingExample.java
===================================================================
--- trunk/examples/jms/paging/src/org/jboss/jms/example/PagingExample.java	2009-04-20 13:18:30 UTC (rev 6497)
+++ trunk/examples/jms/paging/src/org/jboss/jms/example/PagingExample.java	2009-04-20 15:30:50 UTC (rev 6498)
@@ -40,7 +40,13 @@
 {
    public static void main(String[] args)
    {
-      new PagingExample().run(args);
+      String[] serverArgs = new String[] { "-Xms50M",
+                                          "-Xmx50M",
+                                          "-XX:+UseParallelGC",
+                                          "-XX:+AggressiveOpts",
+                                          "-XX:+UseFastAccessorMethods" };
+
+    new PagingExample().run(serverArgs, args);
    }
 
    public boolean runExample() throws Exception
@@ -112,17 +118,18 @@
          
          for (int i = 0; i < 30000; i++)
          {
-            message = (BytesMessage)messageConsumer.receive(1000);
+            message = (BytesMessage)messageConsumer.receive(3000);
 
             if (i % 1000 == 0)
             {
                System.out.println("Received " + i + " messages");
-               
                message.acknowledge();
             }
          }
          
+         message.acknowledge();
          
+         
          // Step 18. Receive the messages from the Queue names pageQueue. Create the proper consumer for that
          messageConsumer.close();
          messageConsumer = session.createConsumer(pageQueue);