Renamed package,

universAAL/platform#42
universAAL · Jun 23, 2017 · 12ddb10 · 12ddb10
1 parent bd1a62f
commit 12ddb10
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/ri.gateway.multitenant/src/main/java/org/universAAL/ri/gateway/Gateway.java b/ri.gateway.multitenant/src/main/java/org/universAAL/ri/gateway/Gateway.java
@@ -27,10 +27,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.universAAL.ioc.dependencies.DependencyProxy;
-import org.universAAL.ioc.dependencies.impl.PassiveDependencyProxy;
-import org.universAAL.ioc.dependencies.impl.WaitingDependencyProxy;
-import org.universAAL.log.LoggerFactory;
 import org.universAAL.middleware.container.ModuleActivator;
 import org.universAAL.middleware.container.ModuleContext;
 import org.universAAL.middleware.container.utils.LogUtils;
@@ -42,7 +38,11 @@
 import org.universAAL.ri.gateway.configuration.Configuration;
 import org.universAAL.ri.gateway.configuration.Configuration.ConnectionMode;
 import org.universAAL.ri.gateway.configuration.ConfigurationFile;
+import org.universAAL.ri.gateway.log.LoggerFactory;
 import org.universAAL.ri.gateway.proxies.ProxyPool;
+import org.universAAL.utilities.ioc.dependencies.DependencyProxy;
+import org.universAAL.utilities.ioc.dependencies.impl.PassiveDependencyProxy;
+import org.universAAL.utilities.ioc.dependencies.impl.WaitingDependencyProxy;
 
 /**
  * Main Class for the AALSpace Gateway. It is in charge of managing

diff --git a/ri.gateway.multitenant/src/main/java/org/universAAL/ri/gateway/Session.java b/ri.gateway.multitenant/src/main/java/org/universAAL/ri/gateway/Session.java
@@ -23,15 +23,15 @@
 import java.util.HashSet;
 import java.util.concurrent.TimeoutException;
 
-import org.universAAL.log.Logger;
-import org.universAAL.log.LoggerFactory;
 import org.universAAL.middleware.container.utils.LogUtils;
 import org.universAAL.ri.gateway.communication.cipher.Cipher;
 import org.universAAL.ri.gateway.communicator.service.impl.AbstractSocketCommunicationHandler;
 import org.universAAL.ri.gateway.communicator.service.impl.ClientSocketCommunicationHandler;
 import org.universAAL.ri.gateway.communicator.service.impl.ServerSocketCommunicationHandler;
 import org.universAAL.ri.gateway.configuration.Configuration;
 import org.universAAL.ri.gateway.configuration.Configuration.ConnectionMode;
+import org.universAAL.ri.gateway.log.Logger;
+import org.universAAL.ri.gateway.log.LoggerFactory;
 import org.universAAL.ri.gateway.operations.MessageOperationChain;
 import org.universAAL.ri.gateway.operations.OperationChainManager;
 import org.universAAL.ri.gateway.operations.ParameterCheckOpertaionChain;

diff --git a/...rc/main/java/org/universAAL/ri/gateway/communicator/service/impl/AbstractLinkHandler.java b/...rc/main/java/org/universAAL/ri/gateway/communicator/service/impl/AbstractLinkHandler.java
@@ -26,12 +26,12 @@
 import java.net.Socket;
 import java.util.UUID;
 
-import org.universAAL.log.Logger;
-import org.universAAL.log.LoggerFactory;
 import org.universAAL.middleware.managers.api.SpaceManager;
 import org.universAAL.ri.gateway.Gateway;
 import org.universAAL.ri.gateway.communication.cipher.Cipher;
 import org.universAAL.ri.gateway.communicator.service.CommunicationHelper;
+import org.universAAL.ri.gateway.log.Logger;
+import org.universAAL.ri.gateway.log.LoggerFactory;
 import org.universAAL.ri.gateway.protocol.LinkMessage;
 import org.universAAL.ri.gateway.protocol.LinkMessage.LinkMessageType;
 import org.universAAL.ri.gateway.protocol.Message;

diff --git a/...g/universAAL/ri/gateway/communicator/service/impl/AbstractSocketCommunicationHandler.java b/...g/universAAL/ri/gateway/communicator/service/impl/AbstractSocketCommunicationHandler.java
@@ -32,12 +32,12 @@
 import java.util.List;
 import java.util.UUID;
 
-import org.universAAL.log.Logger;
-import org.universAAL.log.LoggerFactory;
 import org.universAAL.ri.gateway.Gateway;
 import org.universAAL.ri.gateway.communication.cipher.Cipher;
 import org.universAAL.ri.gateway.communicator.service.CommunicationHandler;
 import org.universAAL.ri.gateway.communicator.service.CommunicationHelper;
+import org.universAAL.ri.gateway.log.Logger;
+import org.universAAL.ri.gateway.log.LoggerFactory;
 import org.universAAL.ri.gateway.protocol.Message;
 
 /**

diff --git a/...org/universAAL/ri/gateway/communicator/service/impl/ClientSocketCommunicationHandler.java b/...org/universAAL/ri/gateway/communicator/service/impl/ClientSocketCommunicationHandler.java
@@ -34,13 +34,13 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
-import org.universAAL.log.Logger;
-import org.universAAL.log.LoggerFactory;
 import org.universAAL.middleware.managers.api.SpaceManager;
 import org.universAAL.ri.gateway.Gateway;
 import org.universAAL.ri.gateway.Session;
 import org.universAAL.ri.gateway.SessionEvent;
 import org.universAAL.ri.gateway.configuration.Configuration;
+import org.universAAL.ri.gateway.log.Logger;
+import org.universAAL.ri.gateway.log.LoggerFactory;
 import org.universAAL.ri.gateway.protocol.LinkMessage;
 import org.universAAL.ri.gateway.protocol.LinkMessage.LinkMessageType;
 import org.universAAL.ri.gateway.protocol.Message;

diff --git a/...org/universAAL/ri/gateway/communicator/service/impl/ServerSocketCommunicationHandler.java b/...org/universAAL/ri/gateway/communicator/service/impl/ServerSocketCommunicationHandler.java
@@ -37,15 +37,15 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.universAAL.log.Logger;
-import org.universAAL.log.LoggerFactory;
 import org.universAAL.middleware.managers.api.SpaceManager;
 import org.universAAL.ri.gateway.Gateway;
 import org.universAAL.ri.gateway.ProxyMessageReceiver;
 import org.universAAL.ri.gateway.Session;
 import org.universAAL.ri.gateway.SessionEvent;
 import org.universAAL.ri.gateway.communicator.service.CommunicationHelper;
 import org.universAAL.ri.gateway.configuration.Configuration;
+import org.universAAL.ri.gateway.log.Logger;
+import org.universAAL.ri.gateway.log.LoggerFactory;
 import org.universAAL.ri.gateway.protocol.LinkMessage;
 import org.universAAL.ri.gateway.protocol.LinkMessage.LinkMessageType;
 import org.universAAL.ri.gateway.protocol.Message;

diff --git a/...ant/src/main/java/org/universAAL/ri/gateway/communicator/service/impl/SessionManager.java b/...ant/src/main/java/org/universAAL/ri/gateway/communicator/service/impl/SessionManager.java
@@ -33,10 +33,10 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.universAAL.log.Logger;
-import org.universAAL.log.LoggerFactory;
 import org.universAAL.middleware.managers.api.TenantManager;
 import org.universAAL.ri.gateway.Gateway;
+import org.universAAL.ri.gateway.log.Logger;
+import org.universAAL.ri.gateway.log.LoggerFactory;
 
 /**
  *

diff --git a/.../main/java/org/universAAL/log/Logger.java → ...org/universAAL/ri/gateway/log/Logger.java b/.../main/java/org/universAAL/log/Logger.java → ...org/universAAL/ri/gateway/log/Logger.java
@@ -22,7 +22,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
  */
-package org.universAAL.log;
+package org.universAAL.ri.gateway.log;
 
 /**
  *

diff --git a/...ava/org/universAAL/log/LoggerFactory.java → ...versAAL/ri/gateway/log/LoggerFactory.java b/...ava/org/universAAL/log/LoggerFactory.java → ...versAAL/ri/gateway/log/LoggerFactory.java
@@ -22,7 +22,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
  */
-package org.universAAL.log;
+package org.universAAL.ri.gateway.log;
 
 import java.util.Collection;
 import java.util.HashMap;