Changeset 92 for branches/supervisor/src/main/java/omq/common/broker/Broker.java

Timestamp:

10/01/13 12:02:41 (11 years ago)

Author:

stoda

Message:

TODO: delete in supervisor
check the code

File:

• branches/supervisor/src/main/java/omq/common/broker/Broker.java (modified) (4 diffs)

branches/supervisor/src/main/java/omq/common/broker/Broker.java

@@ -20 +20 @@
 import omq.exception.RemoteException;
 import omq.server.RemoteObject;
+import omq.supervisor.Supervisor;
 
 import org.apache.log4j.Logger;
@@ -49 +50 @@
         private boolean connectionClosed = false;
         private Properties environment = null;
-        private RemoteBrokerImpl remoteBrokerImpl;
         private Map<String, RemoteObject> remoteObjs;
         private Map<String, Object> proxies = new Hashtable<String, Object>();
         private Map<String, Object> multiProxies = new Hashtable<String, Object>();
+
+        // Supervisor
+        private Supervisor supervisor;
 
         public Broker(Properties env) throws Exception {
@@ -358 +361 @@
         }
 
-        public void setSupervisor(String brokerSet, String brokerName) throws Exception {
-                remoteBrokerImpl = new RemoteBrokerImpl();
-                remoteBrokerImpl.startRemoteBroker(brokerSet, brokerName, this, getEnvironment());
-        }
-
         public Properties getEnvironment() {
                 return environment;
@@ -379 +377 @@
         }
 
+        /*
+         * Supervisor
+         */
+        public void setSupervisor(String supervisorName, String brokerName) throws Exception {
+                // Create a RemoteBrokerImpl
+                bind(brokerName, new RemoteBrokerImpl());
+                // Subscribe broker
+                supervisor = lookup(supervisorName, Supervisor.class);
+                supervisor.subscribe(brokerName);
+                logger.info("Supervisor set: " + supervisorName + ", BrokerName: " + brokerName);
+        }
+
+        public Supervisor getSupervisor() {
+                return supervisor;
+        }
 }