From bfe1e48d6deac9f2bda203e3892ada84465cc512 Mon Sep 17 00:00:00 2001 From: "Alejandro M. Medrano Gil" Date: Fri, 23 Jun 2017 14:47:11 +0200 Subject: [PATCH] Adaptation to package utilities.ioc rename, https://github.com/universAAL/platform/issues/42 --- .../universAAL/security/anonymization/AnonServiceCallee.java | 2 +- .../java/org/universAAL/security/anonymization/URIsTest.java | 2 +- .../authorisator/delegation/DelegationServieCallee.java | 2 +- .../universAAL/security/authorisator/AuthorisatorCallee.java | 2 +- .../org/universAAL/security/authorisator/CHeQuerrier.java | 4 ++-- .../security/cryptographic/services/ProjectActivator.java | 2 +- .../security/cryptographic/services/CommonTest.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/security.anonymization/src/main/java/org/universAAL/security/anonymization/AnonServiceCallee.java b/security.anonymization/src/main/java/org/universAAL/security/anonymization/AnonServiceCallee.java index 3874fe1..657004e 100644 --- a/security.anonymization/src/main/java/org/universAAL/security/anonymization/AnonServiceCallee.java +++ b/security.anonymization/src/main/java/org/universAAL/security/anonymization/AnonServiceCallee.java @@ -20,7 +20,6 @@ import java.net.URLEncoder; import java.util.Enumeration; -import org.universAAL.ioc.dependencies.impl.PassiveDependencyProxy; import org.universAAL.middleware.container.ModuleContext; import org.universAAL.middleware.container.utils.LogUtils; import org.universAAL.middleware.owl.MergedRestriction; @@ -39,6 +38,7 @@ import org.universAAL.ontology.cryptographic.EncryptionService; import org.universAAL.ontology.cryptographic.MultidestinationEncryptedResource; import org.universAAL.ontology.cryptographic.symmetric.AES; +import org.universAAL.utilities.ioc.dependencies.impl.PassiveDependencyProxy; /** * @author amedrano diff --git a/security.anonymization/src/test/java/org/universAAL/security/anonymization/URIsTest.java b/security.anonymization/src/test/java/org/universAAL/security/anonymization/URIsTest.java index 0cc2f32..404cf92 100644 --- a/security.anonymization/src/test/java/org/universAAL/security/anonymization/URIsTest.java +++ b/security.anonymization/src/test/java/org/universAAL/security/anonymization/URIsTest.java @@ -20,7 +20,6 @@ import junit.framework.TestCase; -import org.universAAL.ioc.dependencies.impl.PassiveDependencyProxy; import org.universAAL.middleware.container.ModuleContext; import org.universAAL.middleware.container.JUnit.JUnitModuleContext; import org.universAAL.middleware.owl.DataRepOntology; @@ -38,6 +37,7 @@ import org.universAAL.ontology.space.SpaceOntology; import org.universAAL.ontology.vcard.VCardOntology; import org.universAAL.security.anonymization.AnonServiceCallee; +import org.universAAL.utilities.ioc.dependencies.impl.PassiveDependencyProxy; /** * @author amedrano diff --git a/security.authorisator.delegation/src/main/java/org/universAAL/security/authorisator/delegation/DelegationServieCallee.java b/security.authorisator.delegation/src/main/java/org/universAAL/security/authorisator/delegation/DelegationServieCallee.java index 2a87297..18ffe25 100644 --- a/security.authorisator.delegation/src/main/java/org/universAAL/security/authorisator/delegation/DelegationServieCallee.java +++ b/security.authorisator.delegation/src/main/java/org/universAAL/security/authorisator/delegation/DelegationServieCallee.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.UUID; -import org.universAAL.ioc.dependencies.impl.PassiveDependencyProxy; import org.universAAL.middleware.container.ModuleContext; import org.universAAL.middleware.container.utils.LogUtils; import org.universAAL.middleware.owl.MergedRestriction; @@ -44,6 +43,7 @@ import org.universAAL.security.authorisator.AuthorisatorCallee; import org.universAAL.security.authorisator.CHeQuerrier; import org.universAAL.security.authorisator.ProjectActivator; +import org.universAAL.utilities.ioc.dependencies.impl.PassiveDependencyProxy; /** * @author amedrano diff --git a/security.authorisator/src/main/java/org/universAAL/security/authorisator/AuthorisatorCallee.java b/security.authorisator/src/main/java/org/universAAL/security/authorisator/AuthorisatorCallee.java index 1b7fecd..0c2b4d1 100644 --- a/security.authorisator/src/main/java/org/universAAL/security/authorisator/AuthorisatorCallee.java +++ b/security.authorisator/src/main/java/org/universAAL/security/authorisator/AuthorisatorCallee.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; -import org.universAAL.ioc.dependencies.impl.PassiveDependencyProxy; import org.universAAL.middleware.container.ModuleContext; import org.universAAL.middleware.container.utils.LogUtils; import org.universAAL.middleware.owl.ManagedIndividual; @@ -43,6 +42,7 @@ import org.universAAL.security.authorisator.access_checkers.CheckUserRoles; import org.universAAL.security.authorisator.interfaces.AccessChecker; import org.universAAL.security.authorisator.profiles.AuthorisationServiceProfile; +import org.universAAL.utilities.ioc.dependencies.impl.PassiveDependencyProxy; /** * @author amedrano diff --git a/security.authorisator/src/main/java/org/universAAL/security/authorisator/CHeQuerrier.java b/security.authorisator/src/main/java/org/universAAL/security/authorisator/CHeQuerrier.java index f772f74..d52cc79 100644 --- a/security.authorisator/src/main/java/org/universAAL/security/authorisator/CHeQuerrier.java +++ b/security.authorisator/src/main/java/org/universAAL/security/authorisator/CHeQuerrier.java @@ -20,8 +20,6 @@ import java.util.Scanner; import java.util.UUID; -import org.universAAL.ioc.dependencies.DependencyProxy; -import org.universAAL.ioc.dependencies.impl.PassiveDependencyProxy; import org.universAAL.middleware.container.ModuleContext; import org.universAAL.middleware.container.utils.LogUtils; import org.universAAL.middleware.owl.MergedRestriction; @@ -37,6 +35,8 @@ import org.universAAL.middleware.service.owls.process.ProcessOutput; import org.universAAL.ontology.che.ContextHistoryOntology; import org.universAAL.ontology.che.ContextHistoryService; +import org.universAAL.utilities.ioc.dependencies.DependencyProxy; +import org.universAAL.utilities.ioc.dependencies.impl.PassiveDependencyProxy; /** * @author amedrano diff --git a/security.crypto.services/src/main/java/org/universAAL/security/cryptographic/services/ProjectActivator.java b/security.crypto.services/src/main/java/org/universAAL/security/cryptographic/services/ProjectActivator.java index 64bd656..00d8db2 100644 --- a/security.crypto.services/src/main/java/org/universAAL/security/cryptographic/services/ProjectActivator.java +++ b/security.crypto.services/src/main/java/org/universAAL/security/cryptographic/services/ProjectActivator.java @@ -15,11 +15,11 @@ ******************************************************************************/ package org.universAAL.security.cryptographic.services; -import org.universAAL.ioc.dependencies.impl.PassiveDependencyProxy; import org.universAAL.middleware.container.ModuleActivator; import org.universAAL.middleware.container.ModuleContext; import org.universAAL.middleware.container.utils.LogUtils; import org.universAAL.middleware.serialization.MessageContentSerializer; +import org.universAAL.utilities.ioc.dependencies.impl.PassiveDependencyProxy; public class ProjectActivator implements ModuleActivator { diff --git a/security.crypto.services/src/test/java/org/universAAL/security/cryptographic/services/CommonTest.java b/security.crypto.services/src/test/java/org/universAAL/security/cryptographic/services/CommonTest.java index f8feb39..1bcefe3 100644 --- a/security.crypto.services/src/test/java/org/universAAL/security/cryptographic/services/CommonTest.java +++ b/security.crypto.services/src/test/java/org/universAAL/security/cryptographic/services/CommonTest.java @@ -17,7 +17,6 @@ import junit.framework.TestCase; -import org.universAAL.ioc.dependencies.impl.PassiveDependencyProxy; import org.universAAL.middleware.container.ModuleContext; import org.universAAL.middleware.container.JUnit.JUnitModuleContext; import org.universAAL.middleware.owl.DataRepOntology; @@ -26,6 +25,7 @@ import org.universAAL.middleware.serialization.turtle.TurtleSerializer; import org.universAAL.middleware.service.owl.ServiceBusOntology; import org.universAAL.ontology.cryptographic.CryptographicOntology; +import org.universAAL.utilities.ioc.dependencies.impl.PassiveDependencyProxy; /** * @author amedrano