[servicemix-scm] [1051] trunk/servicemix-core/src/main/java/org/servicemix/jbi/container: Removed unnecessary dependency on GeronimoWorkManager.

Thu, 08 Dec 2005 14:07:40 -0800

Title: [1051] trunk/servicemix-core/src/main/java/org/servicemix/jbi/container: Removed unnecessary dependency on GeronimoWorkManager.
Revision
1051
Author
gastaldi
Date
2005-12-08 17:08:19 -0500 (Thu, 08 Dec 2005)

Log Message

Removed unnecessary dependency on GeronimoWorkManager.

Modified Paths

Diff

Modified: trunk/servicemix-core/src/main/java/org/servicemix/jbi/container/JBIContainer.java (1050 => 1051)

--- trunk/servicemix-core/src/main/java/org/servicemix/jbi/container/JBIContainer.java	2005-12-08 17:00:35 UTC (rev 1050)
+++ trunk/servicemix-core/src/main/java/org/servicemix/jbi/container/JBIContainer.java	2005-12-08 22:08:19 UTC (rev 1051)
@@ -19,13 +19,36 @@
 
 package org.servicemix.jbi.container;
 
-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+import java.io.File;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.MissingResourceException;
+import java.util.logging.Logger;
 
+import javax.jbi.JBIException;
+import javax.jbi.component.Component;
+import javax.jbi.component.ComponentLifeCycle;
+import javax.jbi.component.ServiceUnitManager;
+import javax.jbi.management.DeploymentException;
+import javax.jbi.management.LifeCycleMBean;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.servicedesc.ServiceEndpoint;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.resource.spi.work.WorkManager;
+import javax.transaction.TransactionManager;
+import javax.xml.namespace.QName;
+
 import org.activemq.util.IdGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
 import org.jencks.factory.WorkManagerFactoryBean;
 import org.servicemix.JbiConstants;
 import org.servicemix.MessageExchangeListener;
@@ -50,33 +73,9 @@
 import org.servicemix.jbi.nmr.flow.Flow;
 import org.w3c.dom.DocumentFragment;
 
-import javax.jbi.JBIException;
-import javax.jbi.component.Component;
-import javax.jbi.component.ComponentLifeCycle;
-import javax.jbi.component.ServiceUnitManager;
-import javax.jbi.management.DeploymentException;
-import javax.jbi.management.LifeCycleMBean;
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
-import javax.jbi.servicedesc.ServiceEndpoint;
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.resource.spi.work.WorkManager;
-import javax.transaction.TransactionManager;
-import javax.xml.namespace.QName;
+import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
+import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
-import java.io.File;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.logging.Logger;
-
 /**
  * The main container
  *
@@ -952,8 +951,7 @@
     protected WorkManager createWorkManager() throws JBIException {
         WorkManagerFactoryBean factory = new WorkManagerFactoryBean();
         try {
-            GeronimoWorkManager workManager = factory.getWorkManager();
-            return workManager;
+            return factory.getWorkManager();
         }
         catch (Exception e) {
             throw new JBIException("Failed to start WorkManager: " + e, e);

Modified: trunk/servicemix-core/src/main/java/org/servicemix/jbi/container/SpringJBIContainer.java (1050 => 1051)

--- trunk/servicemix-core/src/main/java/org/servicemix/jbi/container/SpringJBIContainer.java	2005-12-08 17:00:35 UTC (rev 1050)
+++ trunk/servicemix-core/src/main/java/org/servicemix/jbi/container/SpringJBIContainer.java	2005-12-08 22:08:19 UTC (rev 1051)
@@ -1,6 +1,9 @@
 package org.servicemix.jbi.container;
 
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
+import javax.jbi.JBIException;
+import javax.jbi.component.ServiceUnitManager;
+import javax.resource.spi.work.WorkManager;
+
 import org.jencks.factory.WorkManagerFactoryBean;
 import org.servicemix.components.util.ComponentAdaptor;
 import org.springframework.beans.BeansException;
@@ -11,11 +14,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-import javax.jbi.JBIException;
-import javax.jbi.component.ServiceUnitManager;
-import javax.resource.spi.work.WorkManager;
 
-
 /**
  * An enhanced JBI container which adds some Spring helper methods for
  * easier configuration through spring's XML configuration file.
@@ -157,8 +156,7 @@
         WorkManagerFactoryBean factory = new WorkManagerFactoryBean();
         factory.setApplicationContext(applicationContext);
         try {
-            GeronimoWorkManager workManager = factory.getWorkManager();
-            return workManager;
+            return factory.getWorkManager();
         }
         catch (Exception e) {
             throw new JBIException("Failed to start WorkManager: " + e, e);

Reply via email to