svn commit: r1364990 - in /ofbiz/trunk/framework/service/src/org/ofbiz/service: ServiceDispatcher.java jms/AbstractJmsListener.java jms/JmsListenerFactory.java jms/JmsQueueListener.java jms/JmsTopicListener.java

[jacopoc]

Author: jacopoc
Date: Tue Jul 24 11:47:12 2012
New Revision: 1364990

URL: http://svn.apache.org/viewvc?rev=1364990&view=rev
Log:
Refactored all JMS service related code to not depend on the ServiceDispatcher.

Modified:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsQueueListener.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsTopicListener.java

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=1364990&r1=1364989&r2=1364990&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Tue Jul 24 11:47:12 2012
@@ -113,7 +113,7 @@ public class ServiceDispatcher {
 
         // make sure we haven't disabled these features from running
         if (enableJMS) {
-            this.jlf = JmsListenerFactory.getInstance(this);
+            this.jlf = JmsListenerFactory.getInstance(delegator);
         }
 
         if (enableSvcs) {

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java?rev=1364990&r1=1364989&r2=1364990&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/AbstractJmsListener.java Tue Jul 24 11:47:12 2012
@@ -28,6 +28,7 @@ import javax.jms.Message;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.ObjectType;
 import org.ofbiz.base.util.UtilGenerics;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.serialize.XmlSerializer;
 import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.LocalDispatcher;
@@ -49,8 +50,8 @@ public abstract class AbstractJmsListene
      * Initializes the LocalDispatcher for this service listener.
      * @param serviceDispatcher the service dispatcher
      */
-    protected AbstractJmsListener(ServiceDispatcher serviceDispatcher) {
-        this.dispatcher = ServiceContainer.getLocalDispatcher("JMSDispatcher", serviceDispatcher.getDelegator());
+    protected AbstractJmsListener(Delegator delegator) {
+        this.dispatcher = ServiceContainer.getLocalDispatcher("JMSDispatcher", delegator);
     }
 
     /**

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java?rev=1364990&r1=1364989&r2=1364990&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsListenerFactory.java Tue Jul 24 11:47:12 2012
@@ -28,8 +28,8 @@ import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
+import org.ofbiz.entity.Delegator;
 import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.service.ServiceDispatcher;
 import org.ofbiz.service.config.ServiceConfigUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -49,18 +49,18 @@ public class JmsListenerFactory implemen
 
     protected static JmsListenerFactory jlf = null;
 
-    protected ServiceDispatcher dispatcher;
+    protected Delegator delegator;
     protected boolean firstPass = true;
     protected int  loadable = 0;
     protected int connected = 0;
     protected Thread thread;
 
 
-    public static JmsListenerFactory getInstance(ServiceDispatcher dispatcher){
+    public static JmsListenerFactory getInstance(Delegator delegator){
         if (jlf == null) {
             synchronized (JmsListenerFactory.class) {
                 if (jlf == null) {
-                    jlf = new JmsListenerFactory(dispatcher);
+                    jlf = new JmsListenerFactory(delegator);
                 }
             }
         }
@@ -68,8 +68,8 @@ public class JmsListenerFactory implemen
         return jlf;
     }
 
-    public JmsListenerFactory(ServiceDispatcher dispatcher) {
-        this.dispatcher = dispatcher;
+    public JmsListenerFactory(Delegator delegator) {
+        this.delegator = delegator;
         thread = new Thread(this, this.toString());
         thread.setDaemon(false);
         thread.start();
@@ -158,9 +158,9 @@ public class JmsListenerFactory implemen
 
                     try {
                         Class<?> c = cl.loadClass(className);
-                        Constructor<GenericMessageListener> cn = UtilGenerics.cast(c.getConstructor(ServiceDispatcher.class, String.class, String.class, String.class, String.class, String.class));
+                        Constructor<GenericMessageListener> cn = UtilGenerics.cast(c.getConstructor(Delegator.class, String.class, String.class, String.class, String.class, String.class));
 
-                        listener = cn.newInstance(dispatcher, serverName, jndiName, queueName, userName, password);
+                        listener = cn.newInstance(delegator, serverName, jndiName, queueName, userName, password);
                     } catch (Exception e) {
                         throw new GenericServiceException(e.getMessage(), e);
                     }

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsQueueListener.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsQueueListener.java?rev=1364990&r1=1364989&r2=1364990&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsQueueListener.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsQueueListener.java Tue Jul 24 11:47:12 2012
@@ -29,10 +29,10 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.service.ServiceDispatcher;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.JNDIContextFactory;
+import org.ofbiz.entity.Delegator;
 
 /**
  * JmsQueueListener - Queue (P2P) Message Listener.
@@ -50,8 +50,8 @@ public class JmsQueueListener extends Ab
     /**
      * Creates a new JmsQueueListener - Should only be called by the JmsListenerFactory.
      */
-    public JmsQueueListener(ServiceDispatcher dispatcher, String jndiServer, String jndiName, String queueName, String userName, String password) {
-        super(dispatcher);
+    public JmsQueueListener(Delegator delegator, String jndiServer, String jndiName, String queueName, String userName, String password) {
+        super(delegator);
         this.jndiServer = jndiServer;
         this.jndiName = jndiName;
         this.queueName = queueName;

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsTopicListener.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsTopicListener.java?rev=1364990&r1=1364989&r2=1364990&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsTopicListener.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/jms/JmsTopicListener.java Tue Jul 24 11:47:12 2012
@@ -33,6 +33,7 @@ import org.ofbiz.service.ServiceDispatch
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.JNDIContextFactory;
+import org.ofbiz.entity.Delegator;
 
 /**
  * JmsTopicListener - Topic (Pub/Sub) Message Listener.
@@ -50,8 +51,8 @@ public class JmsTopicListener extends Ab
     /**
      * Creates a new JmsTopicListener - Should only be called by the JmsListenerFactory.
      */
-    public JmsTopicListener(ServiceDispatcher dispatcher, String jndiServer, String jndiName, String topicName, String userName, String password) {
-        super(dispatcher);
+    public JmsTopicListener(Delegator delegator, String jndiServer, String jndiName, String topicName, String userName, String password) {
+        super(delegator);
         this.jndiServer = jndiServer;
         this.jndiName = jndiName;
         this.topicName = topicName;