[jboss-cvs] JBoss Messaging SVN: r1402 - in trunk: src/main/org/jboss/jms/server/endpoint src/main/org/jboss/messaging/core tests/src/org/jboss/test/messaging/jms

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-09-29 17:04:19 -0400 (Fri, 29 Sep 2006)
New Revision: 1402

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
   trunk/tests/src/org/jboss/test/messaging/jms/ManualClusteringTest.java
Log:
minor logging changes

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2006-09-29 15:35:46 UTC (rev 1401)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2006-09-29 21:04:19 UTC (rev 1402)
@@ -688,7 +688,7 @@
    
    public void unsubscribe(String subscriptionName) throws JMSException
    {
-      log.info("unsubscribing: " + subscriptionName);
+      log.debug(this + " unsubscribing " + subscriptionName);
       
       try
       {
@@ -718,11 +718,10 @@
                                                   subscriptionName + " to unsubscribe");
          }
          
-         //Section 6.11. JMS 1.1. spec:
-         // "It is erroneous for a client to delete a
-         //durable subscription while it has an active TopicSubscriber for it or while a
-         //message received by it is part of a current transaction or has not been
-         //acknowledged in the session."
+         // Section 6.11. JMS 1.1.
+         // "It is erroneous for a client to delete a durable subscription while it has an active
+         // TopicSubscriber for it or while a message received by it is part of a current
+         // transaction or has not been acknowledged in the session."
          
          Queue sub = binding.getQueue();
          

Modified: trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-09-29 15:35:46 UTC (rev 1401)
+++ trunk/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-09-29 21:04:19 UTC (rev 1402)
@@ -346,7 +346,7 @@
     */
    public void removeAllReferences() throws Throwable
    {
-      log.info(this + " remnoving all references");
+      log.debug(this + " remnoving all references");
       
       synchronized (refLock)
       {

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ManualClusteringTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ManualClusteringTest.java	2006-09-29 15:35:46 UTC (rev 1401)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ManualClusteringTest.java	2006-09-29 21:04:19 UTC (rev 1402)
@@ -88,7 +88,7 @@
       Properties props1 = new Properties();
       
       props1.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
-      props1.put(Context.PROVIDER_URL, "jnp://localhost:1199");
+      props1.put(Context.PROVIDER_URL, "jnp://localhost:1099");
       props1.put(Context.URL_PKG_PREFIXES, "org.jnp.interfaces");
       
       ic1 = new InitialContext(props1);
@@ -96,7 +96,7 @@
       Properties props2 = new Properties();
       
       props2.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
-      props2.put(Context.PROVIDER_URL, "jnp://localhost:1299");
+      props2.put(Context.PROVIDER_URL, "jnp://localhost:1199");
       props2.put(Context.URL_PKG_PREFIXES, "org.jnp.interfaces");
       
       ic2 = new InitialContext(props2);
@@ -126,6 +126,8 @@
       cf2 = (ConnectionFactory)ic2.lookup("/ConnectionFactory");
       
       //cf3 = (ConnectionFactory)ic3.lookup("/ConnectionFactory");
+
+      log.info("setup done");
    }
 
    protected void tearDown() throws Exception
@@ -142,6 +144,8 @@
     */
    public void testClusteredQueueLocalConsumerNonPersistent() throws Exception
    {
+      log.info("starting test");
+
       Connection conn1 = null;
       
       Connection conn2 = null;