From 01a4a51abf65904e0bde1cc9928e7011c7f19096 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Thu, 13 Dec 2012 18:44:57 -0800 Subject: [PATCH] Refactor and finalize framework IPC java package structure --- .../AsyncCallbackDispatcher.java | 3 +- .../AsyncCallbackDriver.java | 3 +- .../AsyncCallbackHandler.java | 2 +- .../AsyncCompletionCallback.java | 2 +- .../InplaceAsyncCallbackDriver.java | 3 +- .../framework/{messaging => async}/Void.java | 2 +- .../client/ClientEventBus.java | 6 +-- .../client/ClientTransportEndpoint.java | 4 +- .../client/ClientTransportProvider.java | 10 ++-- .../{messaging => eventbus}/EventBus.java | 4 +- .../{messaging => eventbus}/EventBusBase.java | 4 +- .../EventBusEndpoint.java | 3 +- .../EventDispatcher.java | 3 +- .../{messaging => eventbus}/EventHandler.java | 2 +- .../{messaging => eventbus}/PublishScope.java | 2 +- .../{messaging => eventbus}/Subscriber.java | 2 +- .../{messaging => rpc}/RpcCallRequestPdu.java | 4 +- .../RpcCallResponsePdu.java | 4 +- .../RpcCallbackDispatcher.java | 3 +- .../RpcCallbackHandler.java | 2 +- .../RpcCallbackListener.java | 3 +- .../{messaging => rpc}/RpcClientCall.java | 3 +- .../{messaging => rpc}/RpcClientCallImpl.java | 3 +- .../{messaging => rpc}/RpcException.java | 2 +- .../{messaging => rpc}/RpcIOException.java | 3 +- .../{messaging => rpc}/RpcProvider.java | 6 ++- .../{messaging => rpc}/RpcProviderImpl.java | 9 +++- .../{messaging => rpc}/RpcServerCall.java | 2 +- .../{messaging => rpc}/RpcServerCallImpl.java | 3 +- .../RpcServiceDispatcher.java | 3 +- .../RpcServiceEndpoint.java | 3 +- .../{messaging => rpc}/RpcServiceHandler.java | 2 +- .../RpcTimeoutException.java | 3 +- .../JsonMessageSerializer.java | 3 +- .../MessageSerializer.java | 2 +- .../OnwireClassRegistry.java | 3 +- .../{messaging => serializer}/OnwireName.java | 2 +- .../server/ServerEventBus.java | 6 +-- .../server/ServerTransportProvider.java | 16 +++---- .../TransportAddress.java | 2 +- .../TransportAddressMapper.java | 2 +- .../TransportDataPdu.java | 4 +- .../TransportEndpoint.java | 2 +- .../TransportEndpointSite.java | 2 +- .../TransportMultiplexier.java | 2 +- .../TransportPdu.java | 2 +- .../TransportProvider.java | 4 +- .../AsyncSampleCallee.java | 8 ++-- .../AsyncSampleEventDrivenStyleCaller.java | 12 +++-- .../AsyncSampleListenerStyleCaller.java | 10 ++-- .../ClientOnlyEventDrivenStyle.java | 15 ++++-- .../ClientOnlyListenerStyle.java | 19 +++++--- .../framework/messaging/SampleComponent.java | 47 ------------------- .../framework/messaging/TestCommand.java | 25 ---------- .../messaging/TestCommandAnswer.java | 23 --------- .../framework/messaging/TestVolume.java | 5 -- .../SampleManagementServer.java | 2 +- .../SampleManagementServerApp.java | 2 +- .../SampleManagerComponent.java | 20 ++++---- .../SampleManagerComponent2.java | 16 +++---- .../SampleStoragePrepareAnswer.java | 4 +- .../SampleStoragePrepareCommand.java | 4 +- .../SampleManagementServerAppContext.xml | 12 ++--- 63 files changed, 175 insertions(+), 214 deletions(-) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => async}/AsyncCallbackDispatcher.java (98%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => async}/AsyncCallbackDriver.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => async}/AsyncCallbackHandler.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => async}/AsyncCompletionCallback.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => async}/InplaceAsyncCallbackDriver.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => async}/Void.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => }/client/ClientEventBus.java (85%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => }/client/ClientTransportEndpoint.java (91%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => }/client/ClientTransportProvider.java (84%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => eventbus}/EventBus.java (90%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => eventbus}/EventBusBase.java (98%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => eventbus}/EventBusEndpoint.java (96%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => eventbus}/EventDispatcher.java (98%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => eventbus}/EventHandler.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => eventbus}/PublishScope.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => eventbus}/Subscriber.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcCallRequestPdu.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcCallResponsePdu.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcCallbackDispatcher.java (98%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcCallbackHandler.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcCallbackListener.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcClientCall.java (96%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcClientCallImpl.java (99%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcException.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcIOException.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcProvider.java (85%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcProviderImpl.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcServerCall.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcServerCallImpl.java (97%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcServiceDispatcher.java (98%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcServiceEndpoint.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcServiceHandler.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => rpc}/RpcTimeoutException.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => serializer}/JsonMessageSerializer.java (98%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => serializer}/MessageSerializer.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => serializer}/OnwireClassRegistry.java (99%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => serializer}/OnwireName.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => }/server/ServerEventBus.java (85%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => }/server/ServerTransportProvider.java (90%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => transport}/TransportAddress.java (98%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => transport}/TransportAddressMapper.java (94%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => transport}/TransportDataPdu.java (91%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => transport}/TransportEndpoint.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => transport}/TransportEndpointSite.java (98%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => transport}/TransportMultiplexier.java (95%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => transport}/TransportPdu.java (96%) rename framework/ipc/src/org/apache/cloudstack/framework/{messaging => transport}/TransportProvider.java (91%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging => codestyle}/AsyncSampleCallee.java (84%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging => codestyle}/AsyncSampleEventDrivenStyleCaller.java (79%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging => codestyle}/AsyncSampleListenerStyleCaller.java (81%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging => codestyle}/ClientOnlyEventDrivenStyle.java (70%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging => codestyle}/ClientOnlyListenerStyle.java (69%) delete mode 100644 framework/ipc/test/org/apache/cloudstack/framework/messaging/SampleComponent.java delete mode 100644 framework/ipc/test/org/apache/cloudstack/framework/messaging/TestCommand.java delete mode 100644 framework/ipc/test/org/apache/cloudstack/framework/messaging/TestCommandAnswer.java delete mode 100644 framework/ipc/test/org/apache/cloudstack/framework/messaging/TestVolume.java rename framework/ipc/test/org/apache/cloudstack/framework/{messaging/server => sampleserver}/SampleManagementServer.java (94%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging/server => sampleserver}/SampleManagementServerApp.java (97%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging/server => sampleserver}/SampleManagerComponent.java (79%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging/server => sampleserver}/SampleManagerComponent2.java (80%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging/server => sampleserver}/SampleStoragePrepareAnswer.java (90%) rename framework/ipc/test/org/apache/cloudstack/framework/{messaging/server => sampleserver}/SampleStoragePrepareCommand.java (91%) diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackDispatcher.java b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java similarity index 98% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackDispatcher.java rename to framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java index 089a5d84490..72bf9d20aad 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackDispatcher.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDispatcher.java @@ -17,13 +17,14 @@ * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.async; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; + @SuppressWarnings("rawtypes") public class AsyncCallbackDispatcher implements AsyncCompletionCallback { private static Map, Map> s_handlerCache = new HashMap, Map>(); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackDriver.java b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDriver.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackDriver.java rename to framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDriver.java index d00aad65999..d14f1a7a5fc 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackDriver.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackDriver.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.async; + public interface AsyncCallbackDriver { public void performCompletionCallback(AsyncCallbackDispatcher dispatcher); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackHandler.java b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackHandler.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackHandler.java rename to framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackHandler.java index 0df02d846e7..40b3bddbf92 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCallbackHandler.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCallbackHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.async; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCompletionCallback.java b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCompletionCallback.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCompletionCallback.java rename to framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCompletionCallback.java index 9099594b808..7cdf5fed468 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/AsyncCompletionCallback.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/async/AsyncCompletionCallback.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.async; public interface AsyncCompletionCallback { void complete(T resultObject); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/InplaceAsyncCallbackDriver.java b/framework/ipc/src/org/apache/cloudstack/framework/async/InplaceAsyncCallbackDriver.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/InplaceAsyncCallbackDriver.java rename to framework/ipc/src/org/apache/cloudstack/framework/async/InplaceAsyncCallbackDriver.java index 424f7df09f0..ece9121f28a 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/InplaceAsyncCallbackDriver.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/async/InplaceAsyncCallbackDriver.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.async; + public class InplaceAsyncCallbackDriver implements AsyncCallbackDriver { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/Void.java b/framework/ipc/src/org/apache/cloudstack/framework/async/Void.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/Void.java rename to framework/ipc/src/org/apache/cloudstack/framework/async/Void.java index 8eb4dff2204..b4c6d4a173c 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/Void.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/async/Void.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.async; /** * This is place-holder class to help AsyncMethod to indicate void return value diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientEventBus.java b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java similarity index 85% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientEventBus.java rename to framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java index c06934ec3fd..7930bf2fea0 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientEventBus.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.client; +package org.apache.cloudstack.framework.client; -import org.apache.cloudstack.framework.messaging.EventBusBase; -import org.apache.cloudstack.framework.messaging.TransportMultiplexier; +import org.apache.cloudstack.framework.eventbus.EventBusBase; +import org.apache.cloudstack.framework.transport.TransportMultiplexier; public class ClientEventBus extends EventBusBase implements TransportMultiplexier { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientTransportEndpoint.java b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportEndpoint.java similarity index 91% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientTransportEndpoint.java rename to framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportEndpoint.java index 44c8060a990..37fe5af41de 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientTransportEndpoint.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportEndpoint.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.client; +package org.apache.cloudstack.framework.client; -import org.apache.cloudstack.framework.messaging.TransportEndpoint; +import org.apache.cloudstack.framework.transport.TransportEndpoint; public class ClientTransportEndpoint implements TransportEndpoint { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientTransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java similarity index 84% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientTransportProvider.java rename to framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java index fb522c2e54f..3d76e3b41d0 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/client/ClientTransportProvider.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.client; +package org.apache.cloudstack.framework.client; -import org.apache.cloudstack.framework.messaging.MessageSerializer; -import org.apache.cloudstack.framework.messaging.TransportEndpoint; -import org.apache.cloudstack.framework.messaging.TransportEndpointSite; -import org.apache.cloudstack.framework.messaging.TransportProvider; +import org.apache.cloudstack.framework.serializer.MessageSerializer; +import org.apache.cloudstack.framework.transport.TransportEndpoint; +import org.apache.cloudstack.framework.transport.TransportEndpointSite; +import org.apache.cloudstack.framework.transport.TransportProvider; public class ClientTransportProvider implements TransportProvider { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBus.java b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBus.java similarity index 90% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBus.java rename to framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBus.java index f46ee25ed54..200715c396f 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBus.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBus.java @@ -17,7 +17,9 @@ * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.eventbus; + +import org.apache.cloudstack.framework.serializer.MessageSerializer; public interface EventBus { void setMessageSerializer(MessageSerializer messageSerializer); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBusBase.java b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusBase.java similarity index 98% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBusBase.java rename to framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusBase.java index 65868901abc..30a847f0f9a 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBusBase.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusBase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.eventbus; import java.util.ArrayList; import java.util.Arrays; @@ -26,6 +26,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.cloudstack.framework.serializer.MessageSerializer; + public class EventBusBase implements EventBus { private Gate _gate; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBusEndpoint.java b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusEndpoint.java similarity index 96% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBusEndpoint.java rename to framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusEndpoint.java index b51fb6d524c..19a9b03dad9 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventBusEndpoint.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusEndpoint.java @@ -17,7 +17,8 @@ * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.eventbus; + public class EventBusEndpoint { private EventBus _eventBus; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventDispatcher.java b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventDispatcher.java similarity index 98% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/EventDispatcher.java rename to framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventDispatcher.java index debc9931988..336a994a6cc 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventDispatcher.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventDispatcher.java @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.eventbus; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; + public class EventDispatcher implements Subscriber { private static Map, Method> s_handlerCache = new HashMap, Method>(); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventHandler.java b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventHandler.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/EventHandler.java rename to framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventHandler.java index 5ec03f198ae..1ed3a00b96f 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/EventHandler.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.eventbus; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/PublishScope.java b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/PublishScope.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/PublishScope.java rename to framework/ipc/src/org/apache/cloudstack/framework/eventbus/PublishScope.java index 97833738186..539a242a55f 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/PublishScope.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/PublishScope.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.eventbus; public enum PublishScope { LOCAL, GLOBAL diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/Subscriber.java b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/Subscriber.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/Subscriber.java rename to framework/ipc/src/org/apache/cloudstack/framework/eventbus/Subscriber.java index d4fe69ce2c2..28b86de050e 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/Subscriber.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/eventbus/Subscriber.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.eventbus; public interface Subscriber { void onPublishEvent(String senderAddress, String subject, Object args); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallRequestPdu.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallRequestPdu.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallRequestPdu.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallRequestPdu.java index 0992116091d..b85316e8158 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallRequestPdu.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallRequestPdu.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + +import org.apache.cloudstack.framework.serializer.OnwireName; @OnwireName(name="RpcRequest") public class RpcCallRequestPdu { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallResponsePdu.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallResponsePdu.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallResponsePdu.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallResponsePdu.java index ca882e9e95b..f6cd0a0f23d 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallResponsePdu.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallResponsePdu.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + +import org.apache.cloudstack.framework.serializer.OnwireName; @OnwireName(name="RpcResponse") public class RpcCallResponsePdu { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackDispatcher.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackDispatcher.java similarity index 98% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackDispatcher.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackDispatcher.java index 16f68224fbc..c787e6a4da0 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackDispatcher.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackDispatcher.java @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; + public class RpcCallbackDispatcher { private static Map, Map> s_handlerCache = new HashMap, Map>(); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackHandler.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackHandler.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackHandler.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackHandler.java index 61a214102e3..86dfceb5c78 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackHandler.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackListener.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackListener.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackListener.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackListener.java index 729c41d7e93..0ab94ac2fb5 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcCallbackListener.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcCallbackListener.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + public interface RpcCallbackListener { void onSuccess(T result); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcClientCall.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java similarity index 96% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcClientCall.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java index 0a2bfe4a5b5..7a7e45ca78a 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcClientCall.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCall.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + public interface RpcClientCall { final static int DEFAULT_RPC_TIMEOUT = 10000; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcClientCallImpl.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java similarity index 99% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcClientCallImpl.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java index 90c56d6eced..1db878d8f1f 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcClientCallImpl.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + public class RpcClientCallImpl implements RpcClientCall { private String _command; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcException.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcException.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcException.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcException.java index e42f0060621..618e6ab2448 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcException.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; public class RpcException extends RuntimeException { private static final long serialVersionUID = -3164514701087423787L; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcIOException.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcIOException.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcIOException.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcIOException.java index c69e0a81972..8479e38554b 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcIOException.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcIOException.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + public class RpcIOException extends RpcException { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProvider.java similarity index 85% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcProvider.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProvider.java index 27096a50998..fb4f04bad2f 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcProvider.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProvider.java @@ -16,7 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + +import org.apache.cloudstack.framework.serializer.MessageSerializer; +import org.apache.cloudstack.framework.transport.TransportAddressMapper; +import org.apache.cloudstack.framework.transport.TransportMultiplexier; public interface RpcProvider extends TransportMultiplexier { final static String RPC_MULTIPLEXIER = "rpc"; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcProviderImpl.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcProviderImpl.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java index 9e23a2a05c3..7f73e605b1f 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcProviderImpl.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java @@ -16,13 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.cloudstack.framework.serializer.MessageSerializer; +import org.apache.cloudstack.framework.transport.TransportAddress; +import org.apache.cloudstack.framework.transport.TransportAddressMapper; +import org.apache.cloudstack.framework.transport.TransportEndpoint; +import org.apache.cloudstack.framework.transport.TransportEndpointSite; +import org.apache.cloudstack.framework.transport.TransportProvider; + public class RpcProviderImpl implements RpcProvider { public static final String RPC_MULTIPLEXIER = "rpc"; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServerCall.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCall.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServerCall.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCall.java index 4df851d9cf0..a102503e14b 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServerCall.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCall.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; public interface RpcServerCall { String getCommand(); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServerCallImpl.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java similarity index 97% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServerCallImpl.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java index 613669a652e..d1ac7a99d69 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServerCallImpl.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + public class RpcServerCallImpl implements RpcServerCall { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceDispatcher.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceDispatcher.java similarity index 98% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceDispatcher.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceDispatcher.java index 84d979a8600..c0d1566ba81 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceDispatcher.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceDispatcher.java @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; + public class RpcServiceDispatcher implements RpcServiceEndpoint { private static Map, Map> s_handlerCache = new HashMap, Map>(); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceEndpoint.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceEndpoint.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java index 8820139c6ec..31dc0831cb0 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceEndpoint.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceEndpoint.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + public interface RpcServiceEndpoint { /* diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceHandler.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceHandler.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceHandler.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceHandler.java index 435f841c75b..6a77f930815 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcServiceHandler.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServiceHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcTimeoutException.java b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcTimeoutException.java rename to framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java index d3b3779f40b..5c876c7fb97 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/RpcTimeoutException.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.rpc; + public class RpcTimeoutException extends RpcException { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/JsonMessageSerializer.java b/framework/ipc/src/org/apache/cloudstack/framework/serializer/JsonMessageSerializer.java similarity index 98% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/JsonMessageSerializer.java rename to framework/ipc/src/org/apache/cloudstack/framework/serializer/JsonMessageSerializer.java index 3fed85703be..2fcab54fddb 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/JsonMessageSerializer.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/serializer/JsonMessageSerializer.java @@ -16,7 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.serializer; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/MessageSerializer.java b/framework/ipc/src/org/apache/cloudstack/framework/serializer/MessageSerializer.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/MessageSerializer.java rename to framework/ipc/src/org/apache/cloudstack/framework/serializer/MessageSerializer.java index d07a3add483..65d818e9c9d 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/MessageSerializer.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/serializer/MessageSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.serializer; public interface MessageSerializer { String serializeTo(Class clz, T object); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/OnwireClassRegistry.java b/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java similarity index 99% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/OnwireClassRegistry.java rename to framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java index 7ac64bb2317..ac9c6bc5699 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/OnwireClassRegistry.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.serializer; import java.io.File; import java.io.FileInputStream; @@ -32,6 +32,7 @@ import java.util.Set; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; + // // Finding classes in a given package code is taken and modified from // Credit: http://internna.blogspot.com/2007/11/java-5-retrieving-all-classes-from.html diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/OnwireName.java b/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireName.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/OnwireName.java rename to framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireName.java index 0d1581aa100..ac195d0ef89 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/OnwireName.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireName.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.serializer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/server/ServerEventBus.java b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerEventBus.java similarity index 85% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/server/ServerEventBus.java rename to framework/ipc/src/org/apache/cloudstack/framework/server/ServerEventBus.java index ff02cb876ac..11bc428a42b 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/server/ServerEventBus.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerEventBus.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.server; +package org.apache.cloudstack.framework.server; -import org.apache.cloudstack.framework.messaging.EventBusBase; -import org.apache.cloudstack.framework.messaging.TransportMultiplexier; +import org.apache.cloudstack.framework.eventbus.EventBusBase; +import org.apache.cloudstack.framework.transport.TransportMultiplexier; public class ServerEventBus extends EventBusBase implements TransportMultiplexier { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/server/ServerTransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java similarity index 90% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/server/ServerTransportProvider.java rename to framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java index 98177d62a5f..d5dae2ed20d 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/server/ServerTransportProvider.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerTransportProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.server; +package org.apache.cloudstack.framework.server; import java.util.HashMap; import java.util.Map; @@ -24,13 +24,13 @@ import java.util.Random; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.apache.cloudstack.framework.messaging.MessageSerializer; -import org.apache.cloudstack.framework.messaging.TransportAddress; -import org.apache.cloudstack.framework.messaging.TransportDataPdu; -import org.apache.cloudstack.framework.messaging.TransportEndpoint; -import org.apache.cloudstack.framework.messaging.TransportEndpointSite; -import org.apache.cloudstack.framework.messaging.TransportPdu; -import org.apache.cloudstack.framework.messaging.TransportProvider; +import org.apache.cloudstack.framework.serializer.MessageSerializer; +import org.apache.cloudstack.framework.transport.TransportAddress; +import org.apache.cloudstack.framework.transport.TransportDataPdu; +import org.apache.cloudstack.framework.transport.TransportEndpoint; +import org.apache.cloudstack.framework.transport.TransportEndpointSite; +import org.apache.cloudstack.framework.transport.TransportPdu; +import org.apache.cloudstack.framework.transport.TransportProvider; import org.apache.log4j.Logger; import com.cloud.utils.concurrency.NamedThreadFactory; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportAddress.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java similarity index 98% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportAddress.java rename to framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java index 49a45156962..4a5ad794089 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportAddress.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddress.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.transport; import java.util.Random; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportAddressMapper.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddressMapper.java similarity index 94% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportAddressMapper.java rename to framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddressMapper.java index 11b43660d14..6edb7880733 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportAddressMapper.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportAddressMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.transport; public interface TransportAddressMapper { String getAddress(); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportDataPdu.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportDataPdu.java similarity index 91% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportDataPdu.java rename to framework/ipc/src/org/apache/cloudstack/framework/transport/TransportDataPdu.java index 1e6b323766f..ac9e06ddcfe 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportDataPdu.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportDataPdu.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.transport; + +import org.apache.cloudstack.framework.serializer.OnwireName; @OnwireName(name="TransportDataPdu") public class TransportDataPdu extends TransportPdu { diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportEndpoint.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpoint.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportEndpoint.java rename to framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpoint.java index fedfb353b91..7767c35ca4f 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportEndpoint.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpoint.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.transport; public interface TransportEndpoint extends TransportMultiplexier { void onAttachConfirm(boolean bSuccess, String endpointAddress); diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportEndpointSite.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpointSite.java similarity index 98% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportEndpointSite.java rename to framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpointSite.java index 82ed9f5f2ad..e82d702a411 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportEndpointSite.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportEndpointSite.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.transport; import java.util.ArrayList; import java.util.HashMap; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportMultiplexier.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportMultiplexier.java similarity index 95% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportMultiplexier.java rename to framework/ipc/src/org/apache/cloudstack/framework/transport/TransportMultiplexier.java index 2e8e570b8d3..b1019297638 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportMultiplexier.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportMultiplexier.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.transport; public interface TransportMultiplexier { public void onTransportMessage(String senderEndpointAddress, String targetEndpointAddress, diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportPdu.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportPdu.java similarity index 96% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportPdu.java rename to framework/ipc/src/org/apache/cloudstack/framework/transport/TransportPdu.java index 1bfb367bf0a..74238a45705 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportPdu.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportPdu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.transport; public class TransportPdu { protected String _sourceAddress; diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportProvider.java similarity index 91% rename from framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportProvider.java rename to framework/ipc/src/org/apache/cloudstack/framework/transport/TransportProvider.java index 71db3120434..12838115921 100644 --- a/framework/ipc/src/org/apache/cloudstack/framework/messaging/TransportProvider.java +++ b/framework/ipc/src/org/apache/cloudstack/framework/transport/TransportProvider.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.transport; + +import org.apache.cloudstack.framework.serializer.MessageSerializer; public interface TransportProvider { void setMessageSerializer(MessageSerializer messageSerializer); diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleCallee.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleCallee.java similarity index 84% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleCallee.java rename to framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleCallee.java index 62d03f87bdb..71afd10a696 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleCallee.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleCallee.java @@ -16,17 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.codestyle; + +import org.apache.cloudstack.framework.async.AsyncCompletionCallback; public class AsyncSampleCallee { AsyncSampleCallee _driver; - public void createVolume(Object realParam, AsyncCompletionCallback callback) { + public void createVolume(Object realParam, AsyncCompletionCallback callback) { // async executed logic { - TestVolume resultObject = new TestVolume(); + String resultObject = new String(); callback.complete(resultObject); } diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleEventDrivenStyleCaller.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java similarity index 79% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleEventDrivenStyleCaller.java rename to framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java index c0818dbfe94..4ce86c6d1b3 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleEventDrivenStyleCaller.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleEventDrivenStyleCaller.java @@ -16,14 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.codestyle; + +import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; +import org.apache.cloudstack.framework.async.AsyncCallbackDriver; +import org.apache.cloudstack.framework.async.AsyncCallbackHandler; public class AsyncSampleEventDrivenStyleCaller { AsyncSampleCallee _ds = new AsyncSampleCallee(); AsyncCallbackDriver _callbackDriver; public void MethodThatWillCallAsyncMethod() { - TestVolume vol = new TestVolume(); + Object vol = new Object(); _ds.createVolume(vol, new AsyncCallbackDispatcher(this) .setOperationName("volume.create") @@ -33,9 +37,9 @@ public class AsyncSampleEventDrivenStyleCaller { @AsyncCallbackHandler(operationName="volume.create") public void HandleVolumeCreateAsyncCallback(AsyncCallbackDispatcher callback) { - TestVolume origVol = callback.getContextParam("origVolume"); + Object origVol = callback.getContextParam("origVolume"); - TestVolume resultVol = callback.getResult(); + Object resultVol = callback.getResult(); } public static void main(String[] args) { diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleListenerStyleCaller.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java similarity index 81% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleListenerStyleCaller.java rename to framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java index ec3d9b13ac7..e4e7af8e6e2 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/AsyncSampleListenerStyleCaller.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/AsyncSampleListenerStyleCaller.java @@ -16,18 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.codestyle; + +import org.apache.cloudstack.framework.async.AsyncCompletionCallback; public class AsyncSampleListenerStyleCaller { AsyncSampleCallee _ds; public void MethodThatWillCallAsyncMethod() { - TestVolume vol = new TestVolume(); + String vol = new String(); _ds.createVolume(vol, - new AsyncCompletionCallback() { + new AsyncCompletionCallback() { @Override - public void complete(TestVolume resultObject) { + public void complete(String resultObject) { // TODO Auto-generated method stub } diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/ClientOnlyEventDrivenStyle.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java similarity index 70% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/ClientOnlyEventDrivenStyle.java rename to framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java index 37c78ba14af..a6c8105c8b0 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/ClientOnlyEventDrivenStyle.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyEventDrivenStyle.java @@ -16,13 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.codestyle; + +import org.apache.cloudstack.framework.rpc.RpcCallbackHandler; +import org.apache.cloudstack.framework.rpc.RpcClientCall; +import org.apache.cloudstack.framework.rpc.RpcException; +import org.apache.cloudstack.framework.rpc.RpcIOException; +import org.apache.cloudstack.framework.rpc.RpcProvider; +import org.apache.cloudstack.framework.rpc.RpcTimeoutException; public class ClientOnlyEventDrivenStyle { RpcProvider _rpcProvider; public void AsyncCallRpcService() { - TestCommand cmd = new TestCommand(); + String cmd = new String(); _rpcProvider.newCall("host-2").setCommand("TestCommand").setCommandArg(cmd).setTimeout(10000) .setCallbackDispatcherTarget(this) .setContextParam("origCmd", cmd) // save context object for callback handler @@ -32,9 +39,9 @@ public class ClientOnlyEventDrivenStyle { @RpcCallbackHandler(command="TestCommand") public void OnAsyncCallRpcServiceCallback(RpcClientCall call) { try { - TestCommand origCmd = call.getContextParam("origCmd"); // restore calling context at callback handler + String origCmd = call.getContextParam("origCmd"); // restore calling context at callback handler - TestCommandAnswer answer = call.get(); + String answer = call.get(); } catch(RpcTimeoutException e) { diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/ClientOnlyListenerStyle.java b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyListenerStyle.java similarity index 69% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/ClientOnlyListenerStyle.java rename to framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyListenerStyle.java index b1f91663064..2d795554c74 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/ClientOnlyListenerStyle.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/codestyle/ClientOnlyListenerStyle.java @@ -16,18 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging; +package org.apache.cloudstack.framework.codestyle; + +import org.apache.cloudstack.framework.rpc.RpcCallbackListener; +import org.apache.cloudstack.framework.rpc.RpcClientCall; +import org.apache.cloudstack.framework.rpc.RpcException; +import org.apache.cloudstack.framework.rpc.RpcIOException; +import org.apache.cloudstack.framework.rpc.RpcProvider; +import org.apache.cloudstack.framework.rpc.RpcTimeoutException; public class ClientOnlyListenerStyle { RpcProvider _rpcProvider; public void AsyncCallRpcService() { - TestCommand cmd = new TestCommand(); + String cmd = new String(); _rpcProvider.newCall("host-2").setCommand("TestCommand").setCommandArg(cmd).setTimeout(10000) - .addCallbackListener(new RpcCallbackListener() { + .addCallbackListener(new RpcCallbackListener() { @Override - public void onSuccess(TestCommandAnswer result) { + public void onSuccess(String result) { } @Override @@ -37,11 +44,11 @@ public class ClientOnlyListenerStyle { } public void SyncCallRpcService() { - TestCommand cmd = new TestCommand(); + String cmd = new String(); RpcClientCall call = _rpcProvider.newCall("host-2").setCommand("TestCommand").setCommandArg(cmd).setTimeout(10000).apply(); try { - TestCommandAnswer answer = call.get(); + String answer = call.get(); } catch (RpcTimeoutException e) { } catch (RpcIOException e) { diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/SampleComponent.java b/framework/ipc/test/org/apache/cloudstack/framework/messaging/SampleComponent.java deleted file mode 100644 index 25d3452e6be..00000000000 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/SampleComponent.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.messaging; - -public class SampleComponent { - - RpcProvider _rpcProvider; - EventBus _eventBus; - - public SampleComponent() { - } - - public void init() { - - _rpcProvider.registerRpcServiceEndpoint( - RpcServiceDispatcher.getDispatcher(this)); - - // subscribe to all network events (for example) - _eventBus.subscribe("network", - EventDispatcher.getDispatcher(this)); - } - - @RpcServiceHandler(command="StartCommand") - void onStartCommand(RpcServerCall call) { - call.completeCall("Call response"); - } - - @EventHandler(topic="network.prepare") - void onPrepareNetwork(String sender, String topic, Object args) { - } -} diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestCommand.java b/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestCommand.java deleted file mode 100644 index abceb4efc5d..00000000000 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestCommand.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.messaging; - -@OnwireName(name="TestCommand") -public class TestCommand { - public TestCommand() { - } -} diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestCommandAnswer.java b/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestCommandAnswer.java deleted file mode 100644 index 550333b6261..00000000000 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestCommandAnswer.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.messaging; - -@OnwireName(name="TestCommandAnswer") -public class TestCommandAnswer { -} diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestVolume.java b/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestVolume.java deleted file mode 100644 index 3001ee592d0..00000000000 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/TestVolume.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.apache.cloudstack.framework.messaging; - -public class TestVolume { - -} diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagementServer.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java similarity index 94% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagementServer.java rename to framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java index aeb3b1cff9c..2a168ac7cd7 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagementServer.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.server; +package org.apache.cloudstack.framework.sampleserver; import org.springframework.stereotype.Component; diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagementServerApp.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServerApp.java similarity index 97% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagementServerApp.java rename to framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServerApp.java index 2748e7f4d8e..a9479f309ee 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagementServerApp.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServerApp.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.server; +package org.apache.cloudstack.framework.sampleserver; import java.io.File; import java.net.URISyntaxException; diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagerComponent.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java similarity index 79% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagerComponent.java rename to framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java index 8600a4da6c7..7b0a2eca192 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagerComponent.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.server; +package org.apache.cloudstack.framework.sampleserver; import java.util.Timer; import java.util.TimerTask; @@ -24,15 +24,15 @@ import java.util.TimerTask; import javax.annotation.PostConstruct; import javax.inject.Inject; -import org.apache.cloudstack.framework.messaging.EventBus; -import org.apache.cloudstack.framework.messaging.EventDispatcher; -import org.apache.cloudstack.framework.messaging.EventHandler; -import org.apache.cloudstack.framework.messaging.RpcCallbackListener; -import org.apache.cloudstack.framework.messaging.RpcException; -import org.apache.cloudstack.framework.messaging.RpcProvider; -import org.apache.cloudstack.framework.messaging.RpcServerCall; -import org.apache.cloudstack.framework.messaging.RpcServiceDispatcher; -import org.apache.cloudstack.framework.messaging.RpcServiceHandler; +import org.apache.cloudstack.framework.eventbus.EventBus; +import org.apache.cloudstack.framework.eventbus.EventDispatcher; +import org.apache.cloudstack.framework.eventbus.EventHandler; +import org.apache.cloudstack.framework.rpc.RpcCallbackListener; +import org.apache.cloudstack.framework.rpc.RpcException; +import org.apache.cloudstack.framework.rpc.RpcProvider; +import org.apache.cloudstack.framework.rpc.RpcServerCall; +import org.apache.cloudstack.framework.rpc.RpcServiceDispatcher; +import org.apache.cloudstack.framework.rpc.RpcServiceHandler; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagerComponent2.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java similarity index 80% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagerComponent2.java rename to framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java index e2259d3b358..9fa06f51251 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleManagerComponent2.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.server; +package org.apache.cloudstack.framework.sampleserver; import javax.annotation.PostConstruct; import javax.inject.Inject; -import org.apache.cloudstack.framework.messaging.EventBus; -import org.apache.cloudstack.framework.messaging.EventDispatcher; -import org.apache.cloudstack.framework.messaging.EventHandler; -import org.apache.cloudstack.framework.messaging.RpcProvider; -import org.apache.cloudstack.framework.messaging.RpcServerCall; -import org.apache.cloudstack.framework.messaging.RpcServiceDispatcher; -import org.apache.cloudstack.framework.messaging.RpcServiceHandler; +import org.apache.cloudstack.framework.eventbus.EventBus; +import org.apache.cloudstack.framework.eventbus.EventDispatcher; +import org.apache.cloudstack.framework.eventbus.EventHandler; +import org.apache.cloudstack.framework.rpc.RpcProvider; +import org.apache.cloudstack.framework.rpc.RpcServerCall; +import org.apache.cloudstack.framework.rpc.RpcServiceDispatcher; +import org.apache.cloudstack.framework.rpc.RpcServiceHandler; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleStoragePrepareAnswer.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareAnswer.java similarity index 90% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleStoragePrepareAnswer.java rename to framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareAnswer.java index ccc1cbedb5f..19a39e1368d 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleStoragePrepareAnswer.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareAnswer.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.server; +package org.apache.cloudstack.framework.sampleserver; -import org.apache.cloudstack.framework.messaging.OnwireName; +import org.apache.cloudstack.framework.serializer.OnwireName; @OnwireName(name="SampleStoragePrepareAnswer") public class SampleStoragePrepareAnswer { diff --git a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleStoragePrepareCommand.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareCommand.java similarity index 91% rename from framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleStoragePrepareCommand.java rename to framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareCommand.java index c7ce1cd339d..841352215f1 100644 --- a/framework/ipc/test/org/apache/cloudstack/framework/messaging/server/SampleStoragePrepareCommand.java +++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleStoragePrepareCommand.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.cloudstack.framework.messaging.server; +package org.apache.cloudstack.framework.sampleserver; -import org.apache.cloudstack.framework.messaging.OnwireName; +import org.apache.cloudstack.framework.serializer.OnwireName; @OnwireName(name="SampleStoragePrepareCommand") public class SampleStoragePrepareCommand { diff --git a/framework/ipc/test/resources/SampleManagementServerAppContext.xml b/framework/ipc/test/resources/SampleManagementServerAppContext.xml index 9709f2f85b7..4d5e0449f5b 100644 --- a/framework/ipc/test/resources/SampleManagementServerAppContext.xml +++ b/framework/ipc/test/resources/SampleManagementServerAppContext.xml @@ -16,30 +16,30 @@ - - org.apache.cloudstack.framework.messaging + org.apache.cloudstack.framework - + - + - + - +