svn commit: r530838 - in /incubator/qpid/branches/M2/java: broker/src/main/java/org/apache/qpid/server/Main.java systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java

[ritchiem]

Author: ritchiem
Date: Fri Apr 20 09:03:10 2007
New Revision: 530838

URL: http://svn.apache.org/viewvc?view=rev&rev=530838
Log:
Added addition log when broker is ready to process.
Updated HeapExhaustion - to use system.out.println so you can set 
amqj.logging.level=warn to speed up test.

Modified:
    
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java
    
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java

Modified: 
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java?view=diff&rev=530838&r1=530837&r2=530838
==============================================================================
--- 
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java
 (original)
+++ 
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/Main.java
 Fri Apr 20 09:03:10 2007
@@ -373,6 +373,7 @@
                 }
 
                 acceptor.bind(bindAddress, handler, sconfig);
+                //fixme  qpid.AMQP should be using qpidproperties to get value
                 _brokerLogger.info("Qpid.AMQP listening on non-SSL address " + 
bindAddress);
             }
 
@@ -381,14 +382,21 @@
                 AMQPFastProtocolHandler handler = new 
AMQPProtocolProvider().getHandler();
                 try
                 {
-                    acceptor.bind(new 
InetSocketAddress(connectorConfig.sslPort), handler, sconfig);
+
+                   acceptor.bind(new 
InetSocketAddress(connectorConfig.sslPort), handler, sconfig);
+                    //fixme  qpid.AMQP should be using qpidproperties to get 
value
                     _brokerLogger.info("Qpid.AMQP listening on SSL port " + 
connectorConfig.sslPort);
+
                 }
                 catch (IOException e)
                 {
                     _brokerLogger.error("Unable to listen on SSL port: " + e, 
e);
                 }
             }
+
+            //fixme  qpid.AMQP should be using qpidproperties to get value     
       
+            _brokerLogger.info("Qpid Broker Ready :" + 
QpidProperties.getReleaseVersion()
+                               + " build: " + 
QpidProperties.getBuildVersion());
         }
         catch (Exception e)
         {

Modified: 
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java?view=diff&rev=530838&r1=530837&r2=530838
==============================================================================
--- 
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
 (original)
+++ 
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/failure/HeapExhaustion.java
 Fri Apr 20 09:03:10 2007
@@ -16,7 +16,7 @@
 {
     private static final Logger _logger = 
Logger.getLogger(HeapExhaustion.class);
 
-    protected QpidClientConnection conn;
+    protected QpidClientConnection conn;                         
     protected final String BROKER = "localhost";
     protected final String vhost = "/test";
     protected final String queue = "direct://amq.direct//queue";
@@ -65,7 +65,7 @@
             conn.put(queue, payload, 1);
             copies++;
             total += size;
-            _logger.info("put copy " + copies + " OK for total bytes: " + 
total);
+            System.out.println("put copy " + copies + " OK for total bytes: " 
+ total);
         }
     }
 
@@ -85,7 +85,7 @@
             conn.put(queue, payload, 1);
             copies++;
             total += size;
-            _logger.debug("put copy " + copies + " OK for total bytes: " + 
total);
+            System.out.println("put copy " + copies + " OK for total bytes: " 
+ total);
             Thread.sleep(200);
         }
     }