Index: /trunk/src/main/java/omq/server/RemoteObject.java =================================================================== --- /trunk/src/main/java/omq/server/RemoteObject.java (revision 66) +++ /trunk/src/main/java/omq/server/RemoteObject.java (revision 67) @@ -93,4 +93,5 @@ this.broker = broker; UID = reference; + serializer = broker.getSerializer(); if (channel == null || !channel.isOpen()) { channel = broker.getChannel(); @@ -142,8 +143,11 @@ @Override public void notifyEvent(Event event) throws IOException, SerializerException { + String corrID = java.util.UUID.randomUUID().toString(); event.setTopic(UID); + event.setCorrId(corrID); EventWrapper wrapper = new EventWrapper(event); channel.exchangeDeclare(UID, "fanout"); channel.basicPublish(UID, "", null, serializer.serialize(wrapper)); + logger.debug("Sending event-> topic: " + UID + ", corrID: " + corrID); } Index: /trunk/src/test/java/omq/test/event/EventTest.java =================================================================== --- /trunk/src/test/java/omq/test/event/EventTest.java (revision 67) +++ /trunk/src/test/java/omq/test/event/EventTest.java (revision 67) @@ -0,0 +1,77 @@ +package omq.test.event; + +import static org.junit.Assert.assertEquals; + +import java.util.Properties; + +import omq.common.broker.Broker; +import omq.common.util.ParameterQueue; +import omq.common.util.Serializer; + +import org.junit.BeforeClass; +import org.junit.Test; + +public class EventTest { + private static EventTriggerImpl trigger; + + @BeforeClass + public static void server() throws Exception { + Properties env = new Properties(); + env.setProperty(ParameterQueue.USER_NAME, "guest"); + env.setProperty(ParameterQueue.USER_PASS, "guest"); + + // Get host info of rabbimq (where it is) + env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1"); + env.setProperty(ParameterQueue.SERVER_PORT, "5672"); + env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false"); + + // Set info about where the message will be sent + env.setProperty(ParameterQueue.RPC_EXCHANGE, "rpc_exchange"); + env.setProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000"); + + trigger = new EventTriggerImpl(); + Broker broker = new Broker(env); + + broker.startTriggerEvent("trigger", trigger); + + System.out.println("Server started"); + } + + @Test + public void eventTest() throws Exception { + String expected = "This is an event"; + String actual = null; + + 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, "127.0.0.1"); + env.setProperty(ParameterQueue.SERVER_PORT, "5672"); + env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.JAVA); + 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 broker = new Broker(env); + EventTrigger et = broker.lookup("trigger", EventTrigger.class); + + MessageListener ms = new MessageListener(); + et.addListener(ms); + trigger.triggerEvent(expected); + Thread.sleep(500); + actual = ms.getMessage(); + + assertEquals(expected, actual); + } +} Index: /trunk/src/test/java/omq/test/event/EventTrigger.java =================================================================== --- /trunk/src/test/java/omq/test/event/EventTrigger.java (revision 66) +++ /trunk/src/test/java/omq/test/event/EventTrigger.java (revision 67) @@ -1,9 +1,14 @@ package omq.test.event; +import java.io.IOException; + import omq.Remote; +import omq.client.annotation.AsyncMethod; import omq.client.annotation.RemoteInterface; +import omq.exception.SerializerException; @RemoteInterface public interface EventTrigger extends Remote { - + @AsyncMethod + public void triggerEvent(String message) throws IOException, SerializerException; } Index: /trunk/src/test/java/omq/test/event/EventTriggerImpl.java =================================================================== --- /trunk/src/test/java/omq/test/event/EventTriggerImpl.java (revision 66) +++ /trunk/src/test/java/omq/test/event/EventTriggerImpl.java (revision 67) @@ -1,4 +1,7 @@ package omq.test.event; +import java.io.IOException; + +import omq.exception.SerializerException; import omq.server.RemoteObject; @@ -9,4 +12,9 @@ */ private static final long serialVersionUID = 1L; + + public void triggerEvent(String message) throws IOException, SerializerException { + MessageEvent event = new MessageEvent(message); + this.notifyEvent(event); + } } Index: /trunk/src/test/java/omq/test/event/MessageEvent.java =================================================================== --- /trunk/src/test/java/omq/test/event/MessageEvent.java (revision 67) +++ /trunk/src/test/java/omq/test/event/MessageEvent.java (revision 67) @@ -0,0 +1,28 @@ +package omq.test.event; + +import omq.common.event.Event; + +public class MessageEvent extends Event { + /** + * + */ + private static final long serialVersionUID = 1L; + + private String message; + + public MessageEvent() { + } + + public MessageEvent(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} Index: /trunk/src/test/java/omq/test/event/MessageListener.java =================================================================== --- /trunk/src/test/java/omq/test/event/MessageListener.java (revision 67) +++ /trunk/src/test/java/omq/test/event/MessageListener.java (revision 67) @@ -0,0 +1,20 @@ +package omq.test.event; + +import omq.common.event.EventListener; + +public class MessageListener extends EventListener { + private String message; + + @Override + public void notifyEvent(MessageEvent event) { + message = event.getMessage(); + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} Index: unk/src/test/java/omq/test/event/ZeroEvent.java =================================================================== --- /trunk/src/test/java/omq/test/event/ZeroEvent.java (revision 66) +++ (revision ) @@ -1,22 +1,0 @@ -package omq.test.event; - -import omq.common.event.Event; - -public class ZeroEvent extends Event { - /** - * - */ - private static final long serialVersionUID = 1L; - - public ZeroEvent() { - } - - public ZeroEvent(String corrId, String topic) { - super(corrId, topic); - } - - public String getZeroMessage() { - return "divition by 0"; - } - -} Index: unk/src/test/java/omq/test/event/ZeroListener.java =================================================================== --- /trunk/src/test/java/omq/test/event/ZeroListener.java (revision 66) +++ (revision ) @@ -1,15 +1,0 @@ -package omq.test.event; - -import omq.common.event.EventListener; - -public class ZeroListener extends EventListener { - - public ZeroListener(String topic) { - super(topic); - } - - @Override - public void notifyEvent(ZeroEvent event) { - System.out.println(event.getZeroMessage()); - } -} Index: unk/target/classes/log4j.xml =================================================================== --- /trunk/target/classes/log4j.xml (revision 66) +++ (revision ) @@ -1,37 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -