Changeset 74 for trunk

Timestamp:

07/01/13 12:47:42 (11 years ago)

Author:

stoda

Message:

WorkspaceTest?

Location:

trunk/src

Files:

• main/java/omq/common/broker/Broker.java (modified) (1 diff)
• main/java/omq/server/RemoteObject.java (modified) (3 diffs)
• test/java/omq/test/workspace (added)
• test/java/omq/test/workspace/Info.java (added)
• test/java/omq/test/workspace/RemoteWorkspace.java (added)
• test/java/omq/test/workspace/RemoteWorkspaceImpl.java (added)
• test/java/omq/test/workspace/WorkspaceTest.java (added)

trunk/src/main/java/omq/common/broker/Broker.java

@@ -162 +162 @@
 
         public void bind(String reference, RemoteObject remote) throws RemoteException {
-                try {
-                        remote.startRemoteObject(reference, this);
-                        remoteObjs.put(reference, remote);
-                } catch (Exception e) {
-                        throw new RemoteException(e);
-                }
-        }
-
-        public void startTriggerEvent(String reference, RemoteObject remote) throws RemoteException {
-                try {
-                        remote.startTriggerEvent(reference, this);
+                bind(reference, remote, environment);
+        }
+
+        public void bind(String reference, RemoteObject remote, Properties env) throws RemoteException {
+                try {
+                        remote.startRemoteObject(reference, this, env);
                         remoteObjs.put(reference, remote);
                 } catch (Exception e) {

trunk/src/main/java/omq/server/RemoteObject.java

@@ -58 +58 @@
         }
 
-        public void startRemoteObject(String reference, Broker broker) throws Exception {
+        public void startRemoteObject(String reference, Broker broker, Properties env) throws Exception {
                 this.broker = broker;
-                UID = reference;
-                multiQueue = UID + System.currentTimeMillis();
-                env = broker.getEnvironment();
-
-                params = new HashMap<String, List<Class<?>>>();
+                this.UID = reference;
+                this.multiQueue = UID + System.currentTimeMillis();
+                this.env = env;
+
+                this.params = new HashMap<String, List<Class<?>>>();
                 for (Method m : this.getClass().getMethods()) {
                         List<Class<?>> list = new ArrayList<Class<?>>();
@@ -70 +70 @@
                                 list.add(clazz);
                         }
-                        params.put(m.getName(), list);
+                        this.params.put(m.getName(), list);
                 }
 
                 // Get num threads to use
                 int numThreads = Integer.parseInt(env.getProperty(ParameterQueue.NUM_THREADS, "1"));
-                remoteWrapper = new RemoteWrapper(this, numThreads, broker.getSerializer());
+                this.remoteWrapper = new RemoteWrapper(this, numThreads, broker.getSerializer());
 
                 startQueues();
@@ -227 +227 @@
 
                 // Declares and bindings
-                logger.info("RemoteObject: " + UID + " declaring direct exchange: " + exchange + ", Queue: " + queue);
+                logger.info("RemoteObject: " + UID + " declaring direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable);
                 channel.exchangeDeclare(exchange, "direct");
                 channel.queueDeclare(queue, durable, false, false, null);
                 channel.queueBind(queue, exchange, routingKey);
 
+                logger.info("RemoteObject: " + UID + " declaring fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + durable);
                 channel.exchangeDeclare(multiExchange, "fanout");
                 channel.queueDeclare(multiQueue, durable, false, false, null);
                 channel.queueBind(multiQueue, multiExchange, "");
-
-                // Declare the event topic fanout
-                logger.info("RemoteObject: " + UID + " declaring fanout exchange: " + UID);
-                channel.exchangeDeclare(UID, "fanout");
 
                 // Declare a new consumer