From 6677ca00034bd4165612d192f70409dd973c2578 Mon Sep 17 00:00:00 2001 From: jakubs <jakubs> Date: Mon, 22 Oct 2012 09:44:13 +0000 Subject: [PATCH] SP-334 SWE-14 rename common package to openbis.common in openbis-common project SVN: 27284 --- .../cisd/openbis/generic/client/cli/DataSetLister.java | 2 +- .../cisd/openbis/generic/client/cli/Login.java | 2 +- .../web/server/AttachmentRegistrationHelper.java | 2 +- .../generic/client/web/server/CommonClientService.java | 2 +- .../generic/client/web/server/UploadedFilesBean.java | 4 ++-- .../cisd/openbis/generic/server/AbstractServer.java | 2 +- .../cisd/openbis/generic/server/CommonServer.java | 2 +- .../openbis/generic/server/CommonServerLogger.java | 2 +- .../cisd/openbis/generic/server/ETLService.java | 6 +++--- .../cisd/openbis/generic/server/ETLServiceLogger.java | 2 +- .../cisd/openbis/generic/server/NameServerServlet.java | 4 ++-- .../server/ServiceConversationClientManager.java | 2 +- .../server/ServiceConversationClientManagerServer.java | 2 +- .../server/ServiceConversationServerManager.java | 4 ++-- .../server/ServiceConversationServerManagerServer.java | 2 +- .../cisd/openbis/generic/server/TrackingServer.java | 2 +- .../openbis/generic/server/TrackingServerLogger.java | 2 +- .../api/v1/GeneralInformationChangingService.java | 2 +- .../GeneralInformationChangingServiceJsonServer.java | 2 +- .../v1/GeneralInformationChangingServiceLogger.java | 2 +- .../v1/GeneralInformationChangingServiceServer.java | 2 +- .../server/api/v1/GeneralInformationService.java | 2 +- .../api/v1/GeneralInformationServiceJsonServer.java | 2 +- .../server/api/v1/GeneralInformationServiceLogger.java | 2 +- .../server/api/v1/GeneralInformationServiceServer.java | 2 +- .../server/api/v1/WebInformationServiceJsonServer.java | 2 +- .../server/authorization/predicate/ArrayPredicate.java | 4 ++-- .../predicate/AtomicOperationsPredicate.java | 4 ++-- .../authorization/predicate/CollectionPredicate.java | 4 ++-- .../predicate/DataSetUpdatesCollectionPredicate.java | 4 ++-- .../predicate/SampleUpdatesCollectionPredicate.java | 4 ++-- .../generic/server/batch/BatchOperationExecutor.java | 2 +- .../business/bo/datasetlister/DatasetLister.java | 2 +- .../generic/server/dataaccess/db/DAOFactory.java | 2 +- .../dataaccess/db/EntityValidationInterceptor.java | 4 ++-- .../openbis/generic/shared/AbstractServerLogger.java | 2 +- .../cisd/openbis/generic/shared/IDataStoreService.java | 4 ++-- .../cisd/openbis/generic/shared/IETLLIMSService.java | 4 ++-- .../openbis/generic/shared/OpenBisServiceFactory.java | 4 ++-- .../GenericJsonClassValueToClassObjectsMapping.java | 2 +- .../generic/shared/api/json/GenericObjectMapper.java | 10 +++++----- .../ServiceConversationApplicationServerUrl.java | 8 ++++---- .../conversation/ServiceConversationDataStoreUrl.java | 4 ++-- .../openbis/generic/shared/dto/ExternalDataPE.java | 2 +- .../openbis/generic/shared/dto/NewExternalData.java | 2 +- .../generic/shared/translator/DataSetTranslator.java | 2 +- .../cisd/openbis/plugin/demo/server/DemoServer.java | 2 +- .../openbis/plugin/demo/server/DemoServerLogger.java | 2 +- .../client/web/server/GenericClientService.java | 2 +- .../openbis/plugin/generic/server/GenericServer.java | 2 +- .../plugin/generic/server/GenericServerLogger.java | 2 +- .../plugin/query/client/api/v1/FacadeFactory.java | 2 +- .../cisd/openbis/plugin/query/server/QueryServer.java | 2 +- .../openbis/plugin/query/server/QueryServerLogger.java | 2 +- .../plugin/query/server/api/v1/QueryApiLogger.java | 2 +- .../plugin/query/server/api/v1/QueryApiServer.java | 2 +- .../query/server/api/v1/QueryServiceJsonServer.java | 2 +- .../plugin/query/server/api/v1/QueryServiceServer.java | 2 +- .../openbis/generic/server/AbstractServerTest.java | 2 +- .../openbis/generic/server/business/bo/DataBOTest.java | 2 +- .../generic/server/dataaccess/db/DataDAOTest.java | 2 +- .../shared/translator/DataSetTranslatorTest.java | 2 +- .../GeneralInformationServiceHttpInvokerApiTest.java | 2 +- 63 files changed, 85 insertions(+), 85 deletions(-) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/cli/DataSetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/cli/DataSetLister.java index e5d50a1769b..c971b0d74d6 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/cli/DataSetLister.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/cli/DataSetLister.java @@ -21,7 +21,7 @@ import java.util.List; import jline.ConsoleReader; -import ch.systemsx.cisd.common.api.client.ServiceFinder; +import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder; import ch.systemsx.cisd.common.exception.EnvironmentFailureException; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/cli/Login.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/cli/Login.java index 0ac3d8af844..163070c86cf 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/cli/Login.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/cli/Login.java @@ -35,7 +35,7 @@ import org.apache.log4j.varia.NullAppender; import ch.systemsx.cisd.args4j.Argument; import ch.systemsx.cisd.args4j.CmdLineParser; import ch.systemsx.cisd.args4j.Option; -import ch.systemsx.cisd.common.api.client.ServiceFinder; +import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AttachmentRegistrationHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AttachmentRegistrationHelper.java index 7aa321f1363..47f481c203b 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AttachmentRegistrationHelper.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AttachmentRegistrationHelper.java @@ -11,7 +11,7 @@ import org.apache.commons.io.FileUtils; import ch.systemsx.cisd.common.exception.UserFailureException; import ch.systemsx.cisd.common.filesystem.FileUtilities; -import ch.systemsx.cisd.common.spring.IUncheckedMultipartFile; +import ch.systemsx.cisd.openbis.common.spring.IUncheckedMultipartFile; import ch.systemsx.cisd.openbis.generic.client.web.server.translator.UserFailureExceptionTranslator; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java index 82af3c7a731..a27db3d39ab 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java @@ -42,7 +42,7 @@ import ch.systemsx.cisd.common.parser.IPropertyMapper; import ch.systemsx.cisd.common.parser.ParserException; import ch.systemsx.cisd.common.reflection.BeanUtils; import ch.systemsx.cisd.common.servlet.IRequestContextProvider; -import ch.systemsx.cisd.common.spring.IUncheckedMultipartFile; +import ch.systemsx.cisd.openbis.common.spring.IUncheckedMultipartFile; import ch.systemsx.cisd.common.string.ReflectingStringUnescaper; import ch.systemsx.cisd.common.string.UnicodeUtils; import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientService; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadedFilesBean.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadedFilesBean.java index 461d792bcba..37d717f3429 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadedFilesBean.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadedFilesBean.java @@ -26,8 +26,8 @@ import org.apache.commons.io.FileUtils; import org.springframework.web.multipart.MultipartFile; import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked; -import ch.systemsx.cisd.common.spring.IUncheckedMultipartFile; -import ch.systemsx.cisd.common.spring.MultipartFileAdapter; +import ch.systemsx.cisd.openbis.common.spring.IUncheckedMultipartFile; +import ch.systemsx.cisd.openbis.common.spring.MultipartFileAdapter; /** * A bean that contains the uploaded files. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java index 43176bdd8f3..e69b0872b60 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java @@ -44,7 +44,7 @@ import ch.systemsx.cisd.common.exception.UserFailureException; import ch.systemsx.cisd.common.mail.IMailClient; import ch.systemsx.cisd.common.mail.MailClient; import ch.systemsx.cisd.common.mail.MailClientParameters; -import ch.systemsx.cisd.common.spring.AbstractServiceWithLogger; +import ch.systemsx.cisd.openbis.common.spring.AbstractServiceWithLogger; import ch.systemsx.cisd.common.spring.ExposablePropertyPlaceholderConfigurer; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ReturnValueFilter; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java index 1dfe6db5dc0..aa2fdebc66f 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java @@ -43,7 +43,7 @@ import ch.systemsx.cisd.common.mail.IMailClient; import ch.systemsx.cisd.common.mail.MailClient; import ch.systemsx.cisd.common.properties.PropertyParametersUtil; import ch.systemsx.cisd.common.properties.PropertyParametersUtil.SectionProperties; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext; import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationServiceUtils; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java index 8d574679183..a33a1eb6efe 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.log4j.Level; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.MetaprojectAssignmentsIds; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.metaproject.IMetaprojectId; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java index b25a4601835..2da5b377ec3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java @@ -33,13 +33,13 @@ import ch.systemsx.cisd.authentication.DefaultSessionManager; import ch.systemsx.cisd.authentication.DummyAuthenticationService; import ch.systemsx.cisd.authentication.IAuthenticationService; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.conversation.context.ServiceConversationsThreadContext; -import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener; +import ch.systemsx.cisd.openbis.common.conversation.context.ServiceConversationsThreadContext; +import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener; import ch.systemsx.cisd.common.exception.ConfigurationFailureException; import ch.systemsx.cisd.common.exception.UserFailureException; import ch.systemsx.cisd.common.servlet.IRequestContextProvider; import ch.systemsx.cisd.common.servlet.RequestContextProviderAdapter; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.api.v1.SearchCriteriaToDetailedSearchCriteriaTranslator; import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationServiceUtils; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java index 74ebf7121e7..bd949acf6ec 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java @@ -25,7 +25,7 @@ import org.apache.log4j.Level; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.collection.CollectionUtils; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/NameServerServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/NameServerServlet.java index 10bc1701491..bdec4e3afa7 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/NameServerServlet.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/NameServerServlet.java @@ -22,8 +22,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import ch.systemsx.cisd.common.api.IRpcServiceNameServer; -import ch.systemsx.cisd.common.api.server.AbstractApiServiceExporter; -import ch.systemsx.cisd.common.api.server.RpcServiceNameServer; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.RpcServiceNameServer; /** * A servlet that exports the name server via the HttpInvoker interface. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java index 3d67565abdb..2337a1befa1 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.log4j.Logger; -import ch.systemsx.cisd.common.conversation.manager.BaseServiceConversationClientManager; +import ch.systemsx.cisd.openbis.common.conversation.manager.BaseServiceConversationClientManager; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; import ch.systemsx.cisd.openbis.generic.server.business.IServiceConversationClientManagerLocal; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManagerServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManagerServer.java index 7be503f0a87..4a8965a25a1 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManagerServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManagerServer.java @@ -22,7 +22,7 @@ import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.conversation.manager.IServiceConversationClientManagerRemote; +import ch.systemsx.cisd.openbis.common.conversation.manager.IServiceConversationClientManagerRemote; import ch.systemsx.cisd.openbis.generic.shared.ResourceNames; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java index 827130a75ec..aa0f07b7db4 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java @@ -22,8 +22,8 @@ import java.util.Map; import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.InitializingBean; -import ch.systemsx.cisd.common.conversation.client.ServiceConversationClientDetails; -import ch.systemsx.cisd.common.conversation.manager.BaseServiceConversationServerManager; +import ch.systemsx.cisd.openbis.common.conversation.client.ServiceConversationClientDetails; +import ch.systemsx.cisd.openbis.common.conversation.manager.BaseServiceConversationServerManager; import ch.systemsx.cisd.openbis.generic.server.business.IServiceConversationServerManagerLocal; import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService; import ch.systemsx.cisd.openbis.generic.shared.conversation.ServiceConversationDataStoreClientId; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManagerServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManagerServer.java index 01badd6d32d..fc74486cdd6 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManagerServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManagerServer.java @@ -22,7 +22,7 @@ import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.conversation.manager.IServiceConversationServerManagerRemote; +import ch.systemsx.cisd.openbis.common.conversation.manager.IServiceConversationServerManagerRemote; import ch.systemsx.cisd.openbis.generic.shared.ResourceNames; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java index 9fb8cca8f70..978d5d35ba4 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed; import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager; import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java index a8bc90ddd22..c1dbe1af24d 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java @@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.server; import java.util.List; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.ITrackingServer; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java index 0405ff93b82..819fbb1f6b7 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java @@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.InvalidSessionException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed; import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceJsonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceJsonServer.java index 4d6e2795175..498fb728926 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceJsonServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceJsonServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiJsonServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiJsonServiceExporter; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationChangingService; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java index 5ce162954b0..611dab06bf1 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java @@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.server.api.v1; import java.util.Map; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationChangingService; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.MetaprojectAssignmentsIds; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceServer.java index b5dc8066e9a..78e3c833b4c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiServiceExporter; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationChangingService; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java index 92e7a6034e2..2e64e276dfa 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java @@ -36,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.ComponentNames; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceJsonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceJsonServer.java index 8f42a167ebf..569014e857a 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceJsonServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceJsonServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiJsonServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiJsonServiceExporter; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java index 937db77b7b4..608b0dfb4b8 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Set; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.ControlledVocabularyPropertyType.VocabularyTerm; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceServer.java index 1eda0c6148d..b2b8a63d7b8 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiServiceExporter; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceJsonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceJsonServer.java index d0ab7247d58..b2674a4b03f 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceJsonServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceJsonServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiJsonServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiJsonServiceExporter; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IWebInformationService; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicate.java index c718ec76615..bb53edbc322 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicate.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicate.java @@ -18,8 +18,8 @@ package ch.systemsx.cisd.openbis.generic.server.authorization.predicate; import java.util.List; -import ch.systemsx.cisd.common.conversation.context.ServiceConversationsThreadContext; -import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener; +import ch.systemsx.cisd.openbis.common.conversation.context.ServiceConversationsThreadContext; +import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener; import ch.systemsx.cisd.common.exception.Status; import ch.systemsx.cisd.common.exception.StatusFlag; import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AtomicOperationsPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AtomicOperationsPredicate.java index c304f660a3e..539a44f8e9c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AtomicOperationsPredicate.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AtomicOperationsPredicate.java @@ -18,8 +18,8 @@ package ch.systemsx.cisd.openbis.generic.server.authorization.predicate; import java.util.List; -import ch.systemsx.cisd.common.conversation.context.ServiceConversationsThreadContext; -import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener; +import ch.systemsx.cisd.openbis.common.conversation.context.ServiceConversationsThreadContext; +import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener; import ch.systemsx.cisd.common.exception.Status; import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider; import ch.systemsx.cisd.openbis.generic.server.authorization.RoleWithIdentifier; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicate.java index a3cb3b9438a..9d3255749dd 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicate.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicate.java @@ -19,8 +19,8 @@ package ch.systemsx.cisd.openbis.generic.server.authorization.predicate; import java.util.Collection; import java.util.List; -import ch.systemsx.cisd.common.conversation.context.ServiceConversationsThreadContext; -import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener; +import ch.systemsx.cisd.openbis.common.conversation.context.ServiceConversationsThreadContext; +import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener; import ch.systemsx.cisd.common.exception.Status; import ch.systemsx.cisd.common.exception.StatusFlag; import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.java index 04f2a26880d..31e216a1aa9 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.java @@ -19,8 +19,8 @@ package ch.systemsx.cisd.openbis.generic.server.authorization.predicate; import java.util.ArrayList; import java.util.List; -import ch.systemsx.cisd.common.conversation.context.ServiceConversationsThreadContext; -import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener; +import ch.systemsx.cisd.openbis.common.conversation.context.ServiceConversationsThreadContext; +import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener; import ch.systemsx.cisd.common.exception.Status; import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider; import ch.systemsx.cisd.openbis.generic.server.authorization.RoleWithIdentifier; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.java index 34459b24b14..3e70d7c5e62 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.java @@ -19,8 +19,8 @@ package ch.systemsx.cisd.openbis.generic.server.authorization.predicate; import java.util.ArrayList; import java.util.List; -import ch.systemsx.cisd.common.conversation.context.ServiceConversationsThreadContext; -import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener; +import ch.systemsx.cisd.openbis.common.conversation.context.ServiceConversationsThreadContext; +import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener; import ch.systemsx.cisd.common.exception.Status; import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider; import ch.systemsx.cisd.openbis.generic.server.authorization.RoleWithIdentifier; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java index 2ae4881d91c..f4d3d27eb54 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java @@ -4,7 +4,7 @@ import java.util.List; import org.apache.log4j.Logger; -import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener; +import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java index cd785ce4b6e..f3c309cbcfd 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java @@ -41,7 +41,7 @@ import ch.rinn.restrictions.Friend; import ch.systemsx.cisd.common.collection.IKeyExtractor; import ch.systemsx.cisd.common.collection.TableMap; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.types.BooleanOrUnknown; +import ch.systemsx.cisd.openbis.common.types.BooleanOrUnknown; import ch.systemsx.cisd.openbis.generic.server.business.bo.common.CodeRecord; import ch.systemsx.cisd.openbis.generic.server.business.bo.common.EntityPropertiesEnricher; import ch.systemsx.cisd.openbis.generic.server.business.bo.common.GenericEntityPropertyRecord; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java index 8b5501a1b15..f9b725ab23b 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java @@ -21,7 +21,7 @@ import java.util.Map; import org.hibernate.SessionFactory; -import ch.systemsx.cisd.common.spring.SpringEoDSQLExceptionTranslator; +import ch.systemsx.cisd.openbis.common.spring.SpringEoDSQLExceptionTranslator; import ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAttachmentDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAuthorizationGroupDAO; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java index 2557a8e58ab..c378005c158 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java @@ -27,8 +27,8 @@ import org.hibernate.Interceptor; import org.hibernate.Transaction; import org.hibernate.type.Type; -import ch.systemsx.cisd.common.conversation.context.ServiceConversationsThreadContext; -import ch.systemsx.cisd.common.conversation.progress.IServiceConversationProgressListener; +import ch.systemsx.cisd.openbis.common.conversation.context.ServiceConversationsThreadContext; +import ch.systemsx.cisd.openbis.common.conversation.progress.IServiceConversationProgressListener; import ch.systemsx.cisd.common.exception.UserFailureException; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.DynamicPropertyEvaluator; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerLogger.java index e5e29983d61..fe3c4ae5e7d 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerLogger.java @@ -29,7 +29,7 @@ import ch.systemsx.cisd.common.exception.InvalidSessionException; import ch.systemsx.cisd.common.exception.UserFailureException; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomColumn; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java index 8fa843458af..5ced05af6a3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java @@ -19,8 +19,8 @@ package ch.systemsx.cisd.openbis.generic.shared; import java.util.List; import java.util.Map; -import ch.systemsx.cisd.common.conversation.annotation.Conversational; -import ch.systemsx.cisd.common.conversation.annotation.Progress; +import ch.systemsx.cisd.openbis.common.conversation.annotation.Conversational; +import ch.systemsx.cisd.openbis.common.conversation.annotation.Progress; import ch.systemsx.cisd.common.exception.InvalidAuthenticationException; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CustomImportFile; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; 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 b2a47aed167..25f65522692 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 @@ -22,8 +22,8 @@ import java.util.List; import org.springframework.transaction.annotation.Transactional; -import ch.systemsx.cisd.common.conversation.annotation.Conversational; -import ch.systemsx.cisd.common.conversation.annotation.Progress; +import ch.systemsx.cisd.openbis.common.conversation.annotation.Conversational; +import ch.systemsx.cisd.openbis.common.conversation.annotation.Progress; import ch.systemsx.cisd.common.exception.UserFailureException; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria; import ch.systemsx.cisd.openbis.generic.shared.basic.EntityOperationsState; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceFactory.java index f63e3314eff..d1b346b34cf 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceFactory.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceFactory.java @@ -16,8 +16,8 @@ package ch.systemsx.cisd.openbis.generic.shared; -import ch.systemsx.cisd.common.api.client.IServicePinger; -import ch.systemsx.cisd.common.api.client.ServiceFinder; +import ch.systemsx.cisd.openbis.common.api.client.IServicePinger; +import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder; /** * A factory for creating proxies to the openBIS application server. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericJsonClassValueToClassObjectsMapping.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericJsonClassValueToClassObjectsMapping.java index 4c770d846b9..3cd10dbd9d3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericJsonClassValueToClassObjectsMapping.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericJsonClassValueToClassObjectsMapping.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.openbis.generic.shared.api.json; -import ch.systemsx.cisd.common.api.server.json.mapping.JsonStaticClassValueToClassObjectsMapping; +import ch.systemsx.cisd.openbis.common.api.server.json.mapping.JsonStaticClassValueToClassObjectsMapping; /** * @author pkupczyk diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericObjectMapper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericObjectMapper.java index eecac1b22b2..9a55538de75 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericObjectMapper.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/json/GenericObjectMapper.java @@ -19,11 +19,11 @@ package ch.systemsx.cisd.openbis.generic.shared.api.json; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext; -import ch.systemsx.cisd.common.api.server.json.deserializer.JsonDeserializerFactory; -import ch.systemsx.cisd.common.api.server.json.introspector.JsonTypeAndClassAnnotationIntrospector; -import ch.systemsx.cisd.common.api.server.json.mapping.JsonReflectionsBaseTypeToSubTypesMapping; -import ch.systemsx.cisd.common.api.server.json.resolver.JsonReflectionsSubTypeResolver; -import ch.systemsx.cisd.common.api.server.json.serializer.JsonSerializerFactory; +import ch.systemsx.cisd.openbis.common.api.server.json.deserializer.JsonDeserializerFactory; +import ch.systemsx.cisd.openbis.common.api.server.json.introspector.JsonTypeAndClassAnnotationIntrospector; +import ch.systemsx.cisd.openbis.common.api.server.json.mapping.JsonReflectionsBaseTypeToSubTypesMapping; +import ch.systemsx.cisd.openbis.common.api.server.json.resolver.JsonReflectionsSubTypeResolver; +import ch.systemsx.cisd.openbis.common.api.server.json.serializer.JsonSerializerFactory; /** * Jackson library object mapper used in generic OpenBIS. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerUrl.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerUrl.java index eeec93b6fbf..0f35ae74a4b 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerUrl.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerUrl.java @@ -16,10 +16,10 @@ package ch.systemsx.cisd.openbis.generic.shared.conversation; -import ch.systemsx.cisd.common.api.client.IServicePinger; -import ch.systemsx.cisd.common.api.client.ServiceFinder; -import ch.systemsx.cisd.common.conversation.manager.IServiceConversationClientManagerRemote; -import ch.systemsx.cisd.common.conversation.manager.IServiceConversationServerManagerRemote; +import ch.systemsx.cisd.openbis.common.api.client.IServicePinger; +import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder; +import ch.systemsx.cisd.openbis.common.conversation.manager.IServiceConversationClientManagerRemote; +import ch.systemsx.cisd.openbis.common.conversation.manager.IServiceConversationServerManagerRemote; /** * @author pkupczyk diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreUrl.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreUrl.java index 590b08eae2d..3a3ad07a106 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreUrl.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreUrl.java @@ -16,8 +16,8 @@ package ch.systemsx.cisd.openbis.generic.shared.conversation; -import ch.systemsx.cisd.common.conversation.manager.IServiceConversationClientManagerRemote; -import ch.systemsx.cisd.common.conversation.manager.IServiceConversationServerManagerRemote; +import ch.systemsx.cisd.openbis.common.conversation.manager.IServiceConversationClientManagerRemote; +import ch.systemsx.cisd.openbis.common.conversation.manager.IServiceConversationServerManagerRemote; import ch.systemsx.cisd.openbis.generic.shared.basic.GenericSharedConstants; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataPE.java index 8b12f78950c..d02c581be20 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataPE.java @@ -36,7 +36,7 @@ import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.annotations.Store; import org.hibernate.validator.constraints.Length; -import ch.systemsx.cisd.common.types.BooleanOrUnknown; +import ch.systemsx.cisd.openbis.common.types.BooleanOrUnknown; import ch.systemsx.cisd.openbis.generic.shared.Constants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewExternalData.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewExternalData.java index 073341386c5..0db7c371f3f 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewExternalData.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewExternalData.java @@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; -import ch.systemsx.cisd.common.types.BooleanOrUnknown; +import ch.systemsx.cisd.openbis.common.types.BooleanOrUnknown; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java index 61ac7df294d..9405f15e90d 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import ch.systemsx.cisd.common.types.BooleanOrUnknown; +import ch.systemsx.cisd.openbis.common.types.BooleanOrUnknown; import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolder; import ch.systemsx.cisd.openbis.generic.shared.basic.PermlinkUtilities; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ContainerDataSet; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java index 974d0559269..b74b35d37f4 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java @@ -26,7 +26,7 @@ import ch.rinn.restrictions.Private; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.NotImplementedException; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerLogger.java index 5a37da848b1..41233d26873 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerLogger.java @@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.demo.server; import java.util.Collection; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java index 8de9eac85fe..f223a651ea9 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Component; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.common.servlet.IRequestContextProvider; -import ch.systemsx.cisd.common.spring.IUncheckedMultipartFile; +import ch.systemsx.cisd.openbis.common.spring.IUncheckedMultipartFile; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DataSetUpdates; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleUpdates; import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java index 15cd7c215c8..4cb742eac0b 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java @@ -33,7 +33,7 @@ import org.springframework.stereotype.Component; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.IASyncAction; import ch.systemsx.cisd.openbis.generic.server.MaterialHelper; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java index 1691126119e..500667b5dfc 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java @@ -24,7 +24,7 @@ import org.apache.commons.lang.StringUtils; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentWithContent; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/FacadeFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/FacadeFactory.java index 0c3b497fc9e..e0144f317ab 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/FacadeFactory.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/FacadeFactory.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.openbis.plugin.query.client.api.v1; -import ch.systemsx.cisd.common.api.client.ServiceFinder; +import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder; import ch.systemsx.cisd.common.api.retry.RetryCaller; import ch.systemsx.cisd.common.api.retry.RetryProxyFactory; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java index 813a1326ac3..b42ca7bbdc1 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java @@ -31,7 +31,7 @@ import org.springframework.stereotype.Component; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ReturnValueFilter; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerLogger.java index 9ef86452edc..f3e8ae9b670 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerLogger.java @@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.query.server; import java.util.List; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java index 2fef4121cd9..ce21f992ac3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerLogger; import ch.systemsx.cisd.openbis.generic.shared.dto.Session; import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.IQueryApiServer; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java index 3dd2987ed3b..092ed50cecd 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java @@ -28,7 +28,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; import ch.systemsx.cisd.authentication.ISessionManager; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceJsonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceJsonServer.java index 146f31d3b36..b2e0556743c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceJsonServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceJsonServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiJsonServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiJsonServiceExporter; import ch.systemsx.cisd.openbis.generic.server.api.v1.ResourceNames; import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.IQueryApiServer; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceServer.java index 455d5a2b0cc..18cd2422287 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceServer.java @@ -21,7 +21,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import ch.systemsx.cisd.common.api.server.AbstractApiServiceExporter; +import ch.systemsx.cisd.openbis.common.api.server.AbstractApiServiceExporter; import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.IQueryApiServer; /** diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java index a2dc7982876..5e113adb644 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java @@ -29,7 +29,7 @@ import org.testng.annotations.Test; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.authentication.Principal; -import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; +import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.common.test.RecordingMatcher; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPersonDAO; diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java index 9f535c52482..43ece0eb89b 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java @@ -33,7 +33,7 @@ import org.jmock.Expectations; import org.testng.annotations.Test; import ch.systemsx.cisd.common.exception.UserFailureException; -import ch.systemsx.cisd.common.types.BooleanOrUnknown; +import ch.systemsx.cisd.openbis.common.types.BooleanOrUnknown; import ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool; import ch.systemsx.cisd.openbis.generic.shared.Constants; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java index 1d7d2a4c6b8..c9933e98e9b 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java @@ -32,7 +32,7 @@ import java.util.List; import org.testng.AssertJUnit; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.types.BooleanOrUnknown; +import ch.systemsx.cisd.openbis.common.types.BooleanOrUnknown; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataSetTypeDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IFileFormatTypeDAO; diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslatorTest.java index d41eb71e9ac..eeb161f5d90 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslatorTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslatorTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.testng.AssertJUnit; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.types.BooleanOrUnknown; +import ch.systemsx.cisd.openbis.common.types.BooleanOrUnknown; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSet; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetKind; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceHttpInvokerApiTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceHttpInvokerApiTest.java index 126129990a7..7d711ed5fc4 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceHttpInvokerApiTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceHttpInvokerApiTest.java @@ -27,7 +27,7 @@ import java.util.Map; import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.api.client.ServiceFinder; +import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder; import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationService; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.ControlledVocabularyPropertyType.VocabularyTerm; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet; -- GitLab