svn commit: r429628 - in /incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi: deployment/impl/JbiElementProcessor.java framework/ComponentMBeanImpl.java nmr/flow/seda/SedaFlow.java nmr/flow/seda/SedaQueue.java

[gn...@apache.org]

Author: gnodet
Date: Tue Aug  8 03:39:40 2006
New Revision: 429628

URL: http://svn.apache.org/viewvc?rev=429628&view=rev
Log:
Format and remove unused imports

Modified:
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java?rev=429628&r1=429627&r2=429628&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/impl/JbiElementProcessor.java Tue Aug  8 03:39:40 2006
@@ -48,7 +48,7 @@
 
         // lets remove the default namespace just in case
         beans.removeAttribute("xmlns");
-
+        
         String version = beans.getAttribute("version");
         if (version != null && version.length() != 0) {
             addPropertyElement(bean, "version", version);

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java?rev=429628&r1=429627&r2=429628&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java Tue Aug  8 03:39:40 2006
@@ -35,7 +35,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.container.ActivationSpec;
 import org.apache.servicemix.jbi.container.JBIContainer;
-import org.apache.servicemix.jbi.deployment.SharedLibraryList;
 import org.apache.servicemix.jbi.event.ComponentEvent;
 import org.apache.servicemix.jbi.event.ComponentListener;
 import org.apache.servicemix.jbi.management.AttributeInfoHelper;

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java?rev=429628&r1=429627&r2=429628&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaFlow.java Tue Aug  8 03:39:40 2006
@@ -159,15 +159,15 @@
      * @throws JBIException
      */
     protected void doSend(MessageExchangeImpl me) throws JBIException {
-        // If the message has been sent synchronously, do not use seda
-        // as it would consume threads from the work manager in a useless
-        // way.  This could lead to deadlocks.
         if (me.getDestinationId() == null) {
             me.setDestinationId(((AbstractServiceEndpoint) me.getEndpoint()).getComponentNameSpace());
         }
         if (isTransacted(me)) {
             me.setTxState(MessageExchangeImpl.TX_STATE_CONVEYED);
         }
+        // If the message has been sent synchronously, do not use seda
+        // as it would consume threads from the work manager in a useless
+        // way.  This could lead to deadlocks.
         suspendTx(me);
         enqueuePacket(me);
     }

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java?rev=429628&r1=429627&r2=429628&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/seda/SedaQueue.java Tue Aug  8 03:39:40 2006
@@ -34,8 +34,6 @@
 import javax.management.ObjectName;
 import javax.resource.spi.work.Work;
 import javax.resource.spi.work.WorkException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
 
 /**
  * A simple Straight through flow
@@ -43,7 +41,9 @@
  * @version $Revision$
  */
 public class SedaQueue extends BaseLifeCycle implements Work {
+    
     private static final Log log = LogFactory.getLog(SedaQueue.class);
+    
     protected SedaFlow flow;
     protected ComponentNameSpace name;
     protected BoundedLinkedQueue queue;