Index: /trunk/objectmq/src/omq/client/proxy/Proxymq.java =================================================================== --- /trunk/objectmq/src/omq/client/proxy/Proxymq.java (revision 18) +++ /trunk/objectmq/src/omq/client/proxy/Proxymq.java (revision 19) @@ -121,12 +121,14 @@ // Publish the request if (request.isAsync()) { + System.out.println("Publish async request ->" + request.getId()); publishAsyncRequest(request); return null; } else { + System.out.println("Publish sync request ->" + request.getId()); return publishSyncRequest(request, method.getReturnType()); } } - - private void publishMessage(Request request, String replyQueueName) throws IOException, SerializerException{ + + private void publishMessage(Request request, String replyQueueName) throws IOException, SerializerException { String corrId = request.getId(); @@ -139,7 +141,7 @@ // Publish the message - byte[] bytesRequest = Serializer.serialize(request); + byte[] bytesRequest = Serializer.serialize(request); channel.basicPublish(exchange, routingkey, props, bytesRequest); - Log.saveLog("Client-Serialize", bytesRequest); + Log.saveLog("Client-Serialize", bytesRequest); } @@ -167,9 +169,9 @@ } catch (TimeoutException te) { System.out.println("Timeout exception catched " + te); + te.printStackTrace(); } i++; } throw new RetryException(retries, timeout); - } Index: /trunk/objectmq/src/omq/client/remote/response/ResponseListener.java =================================================================== --- /trunk/objectmq/src/omq/client/remote/response/ResponseListener.java (revision 18) +++ /trunk/objectmq/src/omq/client/remote/response/ResponseListener.java (revision 19) @@ -60,4 +60,5 @@ // Get the response with its uid uid_request = delivery.getProperties().getCorrelationId(); + System.out.println("Response reveived -> " + uid_request); // Stores the new response Index: /trunk/objectmq/src/omq/common/event/EventDispatcher.java =================================================================== --- /trunk/objectmq/src/omq/common/event/EventDispatcher.java (revision 18) +++ /trunk/objectmq/src/omq/common/event/EventDispatcher.java (revision 19) @@ -95,14 +95,20 @@ event = Serializer.deserializeEvent(delivery.getBody()); + System.out.println("Event received -> Topic: " + event.getTopic() + "CorrId: " + event.getCorrId()); + // Dispatch it dispatch(event.getTopic(), event); } catch (InterruptedException i) { System.out.println("InterruptedException e: " + i); + i.printStackTrace(); } catch (ShutdownSignalException e) { System.out.println("ShutdownSignalException e: " + e); + e.printStackTrace(); } catch (ConsumerCancelledException e) { System.out.println("ConsumerCancelledException e: " + e); + e.printStackTrace(); } catch (Exception e) { System.out.println("Exception e: " + e); + e.printStackTrace(); } } Index: /trunk/objectmq/src/omq/common/util/ParameterQueue.java =================================================================== --- /trunk/objectmq/src/omq/common/util/ParameterQueue.java (revision 18) +++ /trunk/objectmq/src/omq/common/util/ParameterQueue.java (revision 19) @@ -47,5 +47,5 @@ * Time in milis */ - public static long DEFAULT_TIMEOUT = 5 * 1000 * 60; + public static long DEFAULT_TIMEOUT = 1 * 1000 * 60; } Index: /trunk/objectmq/src/omq/common/util/Serializer.java =================================================================== --- /trunk/objectmq/src/omq/common/util/Serializer.java (revision 18) +++ /trunk/objectmq/src/omq/common/util/Serializer.java (revision 19) @@ -26,4 +26,5 @@ enableCompression = Boolean.valueOf(env.getProperty(ParameterQueue.ENABLECOMPRESSION, "false")); } catch (EnvironmentException e) { + e.printStackTrace(); } @@ -40,5 +41,5 @@ throw new ClassNotFoundException("Class name is null or empty."); } - + serializer = (ISerializer) Class.forName(className).newInstance(); } catch (Exception ex) { Index: /trunk/objectmq/src/omq/server/remote/request/InvocationThread.java =================================================================== --- /trunk/objectmq/src/omq/server/remote/request/InvocationThread.java (revision 18) +++ /trunk/objectmq/src/omq/server/remote/request/InvocationThread.java (revision 19) @@ -38,4 +38,6 @@ Log.saveLog("Server-Deserialize", delivery.getBody()); + System.out.println("Invoke method: " + request.getMethod() + " CorrID: " + request.getId()); + // Invoke the method Object result = obj.invokeMethod(request.getMethod(), request.getArguments()); @@ -48,6 +50,5 @@ BasicProperties props = delivery.getProperties(); - BasicProperties replyProps = new BasicProperties.Builder().appId(obj.getRef()) - .correlationId(props.getCorrelationId()).build(); + BasicProperties replyProps = new BasicProperties.Builder().appId(obj.getRef()).correlationId(props.getCorrelationId()).build(); byte[] bytesResponse = Serializer.serialize(resp); @@ -58,4 +59,5 @@ } catch (InterruptedException i) { + i.printStackTrace(); killed = true; } catch (Exception e) { Index: unk/objectmq/src/omq/ztest/calculator/CalculatorTest.java =================================================================== --- /trunk/objectmq/src/omq/ztest/calculator/CalculatorTest.java (revision 18) +++ (revision ) @@ -1,92 +1,0 @@ -package omq.ztest.calculator; - -import static org.junit.Assert.assertEquals; - -import java.util.Properties; - -import omq.common.broker.Broker; -import omq.common.util.ParameterQueue; - -import org.junit.BeforeClass; -import org.junit.Test; - -public class CalculatorTest { - private static Calculator remoteCalc; - private static Calculator remoteCalc2; - - @BeforeClass - public static void startClient() throws Exception { - Properties env = new Properties(); - env.setProperty(ParameterQueue.USER_NAME, "guest"); - env.setProperty(ParameterQueue.USER_PASS, "guest"); - - // Set host info of rabbimq (where it is) - env.setProperty(ParameterQueue.SERVER_HOST, "10.30.239.228"); - env.setProperty(ParameterQueue.SERVER_PORT, "5672"); - // env.setProperty(ParameterQueue.SERIALIZERNAME, - // "omq.common.util.Serializers.KryoImp"); - env.setProperty(ParameterQueue.SERIALIZERNAME, "omq.common.util.Serializers.GsonImp"); - env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false"); - - // Set info about where the message will be sent - env.setProperty(ParameterQueue.RPC_EXCHANGE, "rpc_exchange"); - env.setProperty(ParameterQueue.DEBUGFILE, "c:\\middlewareDebug"); - - // Set info about the queue & the exchange where the ResponseListener - // will listen to. - env.setProperty(ParameterQueue.RPC_REPLY_QUEUE, "reply_queue"); - env.setProperty(ParameterQueue.EVENT_REPLY_QUEUE, "event_queue"); - - Broker.initBroker(env); - remoteCalc = (Calculator) Broker.lookup("calculator1", Calculator.class); - remoteCalc2 = (Calculator) Broker.lookup("calculator2", Calculator.class); - } - - @Test - public void add() throws Exception { - int x = 10; - int y = 20; - - int sync = remoteCalc.add(x, y); - int sum = x + y; - - assertEquals(sum, sync); - } - - @Test - public void add2() throws Exception { - int x = 10; - int y = 20; - - int sync = remoteCalc2.add(x, y); - int sum = x + y; - - assertEquals(sum, sync); - } - - @Test - public void mult() throws Exception { - int x = 5; - int y = 15; - - remoteCalc.mult(x, y); - Thread.sleep(200); - } - - @Test - public void notifyEvent() throws Exception { - ZeroListener zL = new ZeroListener("zero-event"); - - remoteCalc.addListener(zL); - - remoteCalc.divideByZero(); - - Thread.sleep(200); - } - - @Test - public void sendMessage() throws Exception { - Message m = new Message(2334, "Hello objectmq"); - remoteCalc.sendMessage(m); - } -} Index: /trunk/objectmq/src/omq/ztest/calculator/ClientTest.java =================================================================== --- /trunk/objectmq/src/omq/ztest/calculator/ClientTest.java (revision 19) +++ /trunk/objectmq/src/omq/ztest/calculator/ClientTest.java (revision 19) @@ -0,0 +1,92 @@ +package omq.ztest.calculator; + +import static org.junit.Assert.assertEquals; + +import java.util.Properties; + +import omq.common.broker.Broker; +import omq.common.util.ParameterQueue; + +import org.junit.BeforeClass; +import org.junit.Test; + +public class ClientTest { + private static Calculator remoteCalc; + private static Calculator remoteCalc2; + + @BeforeClass + public static void startClient() throws Exception { + Properties env = new Properties(); + env.setProperty(ParameterQueue.USER_NAME, "guest"); + env.setProperty(ParameterQueue.USER_PASS, "guest"); + + // Set host info of rabbimq (where it is) + env.setProperty(ParameterQueue.SERVER_HOST, "10.30.239.228"); + env.setProperty(ParameterQueue.SERVER_PORT, "5672"); + // env.setProperty(ParameterQueue.SERIALIZERNAME, + // "omq.common.util.Serializers.KryoImp"); + env.setProperty(ParameterQueue.SERIALIZERNAME, "omq.common.util.Serializers.GsonImp"); + env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false"); + + // Set info about where the message will be sent + env.setProperty(ParameterQueue.RPC_EXCHANGE, "rpc_exchange"); + env.setProperty(ParameterQueue.DEBUGFILE, "c:\\middlewareDebug"); + + // Set info about the queue & the exchange where the ResponseListener + // will listen to. + env.setProperty(ParameterQueue.RPC_REPLY_QUEUE, "reply_queue"); + env.setProperty(ParameterQueue.EVENT_REPLY_QUEUE, "event_queue"); + + Broker.initBroker(env); + remoteCalc = (Calculator) Broker.lookup("calculator1", Calculator.class); + remoteCalc2 = (Calculator) Broker.lookup("calculator2", Calculator.class); + } + + @Test + public void add() throws Exception { + int x = 10; + int y = 20; + + int sync = remoteCalc.add(x, y); + int sum = x + y; + + assertEquals(sum, sync); + } + + @Test + public void add2() throws Exception { + int x = 10; + int y = 20; + + int sync = remoteCalc2.add(x, y); + int sum = x + y; + + assertEquals(sum, sync); + } + + @Test + public void mult() throws Exception { + int x = 5; + int y = 15; + + remoteCalc.mult(x, y); + Thread.sleep(200); + } + + @Test + public void notifyEvent() throws Exception { + ZeroListener zL = new ZeroListener("zero-event"); + + remoteCalc.addListener(zL); + + remoteCalc.divideByZero(); + + Thread.sleep(200); + } + + @Test + public void sendMessage() throws Exception { + Message m = new Message(2334, "Hello objectmq"); + remoteCalc.sendMessage(m); + } +}