From 9649d42f5da546a6665e779ff87efa58caccc175 Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Tue, 11 Sep 2012 10:54:38 +0000 Subject: [PATCH] BIS-142 move ISessionProvider from generic.shared.authorization -> generic.shared SVN: 26585 --- .../generic/server/authorization/AuthorizationAdvisor.java | 2 +- .../systemsx/cisd/openbis/generic/shared/IETLLIMSService.java | 1 - .../java/ch/systemsx/cisd/openbis/generic/shared/IServer.java | 1 - .../generic/shared/{authorization => }/ISessionProvider.java | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/{authorization => }/ISessionProvider.java (94%) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java index 64fe8f8951e..8db1d0ac5cb 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java @@ -40,7 +40,7 @@ import ch.systemsx.cisd.common.utilities.AnnotationUtils; import ch.systemsx.cisd.common.utilities.AnnotationUtils.Parameter; import ch.systemsx.cisd.common.utilities.MethodUtils; import ch.systemsx.cisd.openbis.generic.server.util.MethodInvocationUtils; -import ch.systemsx.cisd.openbis.generic.shared.authorization.ISessionProvider; +import ch.systemsx.cisd.openbis.generic.shared.ISessionProvider; import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.AuthorizationGuard; import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.RolesAllowed; import ch.systemsx.cisd.openbis.generic.shared.dto.IAuthSession; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java index 5090be09adf..f8ac2b910a1 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java @@ -25,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional; import ch.systemsx.cisd.common.conversation.IConversationalRmiServer; import ch.systemsx.cisd.common.exceptions.UserFailureException; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria; -import ch.systemsx.cisd.openbis.generic.shared.authorization.ISessionProvider; import ch.systemsx.cisd.openbis.generic.shared.basic.EntityOperationsState; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ArchiverDataSetCriteria; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java index fd984d2611f..6773de2c783 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java @@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional; import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException; import ch.systemsx.cisd.common.exceptions.InvalidSessionException; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.shared.authorization.ISessionProvider; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/ISessionProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionProvider.java similarity index 94% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/ISessionProvider.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionProvider.java index 1973b64bfe1..c38e9a0ed13 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/ISessionProvider.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.shared.authorization; +package ch.systemsx.cisd.openbis.generic.shared; import ch.systemsx.cisd.common.exceptions.UserFailureException; import ch.systemsx.cisd.openbis.generic.shared.dto.IAuthSession; -- GitLab