[jboss-cvs] JBoss Messaging SVN: r2211 - in branches/Branch_1_0_1_SP: src/main/org/jboss/jms/server/endpoint and 1 other directories.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-02-08 16:28:30 -0500 (Thu, 08 Feb 2007)
New Revision: 2211

Modified:
   branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/ServerPeer.java
   branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
   branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
   branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/JCAWrapperTest.java
   branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/XATest.java
Log:
minor reformatting, getting rid of unused imports, etc

Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/ServerPeer.java	2007-02-08 20:45:08 UTC (rev 2210)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/ServerPeer.java	2007-02-08 21:28:30 UTC (rev 2211)
@@ -722,6 +722,8 @@
 
    private void initializeRemoting(MBeanServer mbeanServer) throws Exception
    {
+      log.trace("using " + mbeanServer);
+
       // We explicitly associate the datatype "jms" with the java SerializationManager
       // This is vital for performance reasons.
       SerializationStreamFactory.setManagerClassName(

Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-02-08 20:45:08 UTC (rev 2210)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-02-08 21:28:30 UTC (rev 2211)
@@ -30,7 +30,6 @@
 import javax.jms.Destination;
 import javax.jms.IllegalStateException;
 import javax.jms.JMSException;
-import javax.jms.InvalidClientIDException;
 import javax.transaction.xa.Xid;
 
 import org.jboss.aop.AspectManager;
@@ -42,7 +41,6 @@
 import org.jboss.jms.server.ConnectionManager;
 import org.jboss.jms.server.SecurityManager;
 import org.jboss.jms.server.ServerPeer;
-import org.jboss.jms.server.endpoint.advised.ConsumerAdvised;
 import org.jboss.jms.server.endpoint.advised.SessionAdvised;
 import org.jboss.jms.server.plugin.contract.ChannelMapper;
 import org.jboss.jms.server.remoting.JMSDispatcher;

Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2007-02-08 20:45:08 UTC (rev 2210)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2007-02-08 21:28:30 UTC (rev 2211)
@@ -28,7 +28,6 @@
 import org.jboss.jms.delegate.ConnectionDelegate;
 import org.jboss.jms.server.ServerPeer;
 import org.jboss.jms.server.connectionfactory.JNDIBindings;
-import org.jboss.jms.server.endpoint.advised.BrowserAdvised;
 import org.jboss.jms.server.endpoint.advised.ConnectionAdvised;
 import org.jboss.jms.server.remoting.JMSDispatcher;
 import org.jboss.jms.util.ExceptionUtil;

Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-02-08 20:45:08 UTC (rev 2210)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-02-08 21:28:30 UTC (rev 2211)
@@ -44,7 +44,6 @@
 import org.jboss.jms.message.JBossMessage;
 import org.jboss.jms.server.ServerPeer;
 import org.jboss.jms.server.endpoint.advised.BrowserAdvised;
-import org.jboss.jms.server.endpoint.advised.ConnectionFactoryAdvised;
 import org.jboss.jms.server.endpoint.advised.ConsumerAdvised;
 import org.jboss.jms.server.plugin.contract.ChannelMapper;
 import org.jboss.jms.server.remoting.JMSDispatcher;

Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/JCAWrapperTest.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/JCAWrapperTest.java	2007-02-08 20:45:08 UTC (rev 2210)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/JCAWrapperTest.java	2007-02-08 21:28:30 UTC (rev 2211)
@@ -28,12 +28,9 @@
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
-import javax.jms.DeliveryMode;
-import javax.jms.MessageConsumer;
 import javax.naming.InitialContext;
 import javax.transaction.Transaction;
 import javax.transaction.UserTransaction;
-import javax.management.ObjectName;
 
 import org.jboss.test.messaging.MessagingTestCase;
 import org.jboss.test.messaging.tools.ServerManagement;

Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/XATest.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/XATest.java	2007-02-08 20:45:08 UTC (rev 2210)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/XATest.java	2007-02-08 21:28:30 UTC (rev 2211)
@@ -326,19 +326,19 @@
          Transaction tx = tm.getTransaction();
          tx.enlistResource(res);
          
-         //This should cause the work done previously to be converted into work done in the xa transaction
-         //this is what an MDB does
-         //There is a difficulty in transactional delivery with an MDB.
-         //The message is received from the destination and then sent to the mdb container so
-         //it can call onMessage.
-         //For transactional delivery the receipt of the message should be in a transaction but by the time
-         //the mdb container is invoked the message has already been received it is too late - the message
-         //has already been received and passed on (see page 199 (chapter 5 JMS and Transactions, section "Application Server Integration"
-         //of Mark Little's book Java Transaction processing
-         //for a discussion of how different app serves deal with this)
-         //The way jboss messaging (and jboss mq) deals with this is to convert any work done
-         //prior to when the xasession is enlisted in the tx, into work done in the xa tx
-         
+         // This should cause the work done previously to be converted into work done in the XA
+          // transaction. This is what an MDB does. There is a difficulty in transactional delivery
+          // with an MDB. The message is received from the destination and then sent to the MDB
+          // container so it can call onMessage().
+          // For transactional delivery the receipt of the message should be in a transaction but by
+          // the time the MDB container is invoked the message has already been received it is too
+          // late - the message has already been received and passed on (see page 199 (chapter 5 JMS
+          // and Transactions, section "Application Server Integration" of Mark Little's book Java
+          // Transaction processing for a discussion of how different app serves deal with this).
+          // The way JBoss Messaging (and JBossMQ) deals with this is to convert any work done prior
+          // to when the XASession is enlisted in the transaction, into work done in the XA
+          // transaction
+
          tx.delistResource(res, XAResource.TMSUCCESS);
          
          //Now rollback the tx - this should cause redelivery of the two messages