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 e5d50a1769b93ada81fd7ca10eb24a2c1fb3fbed..c971b0d74d63265bf072962edc1082b66ae70df0 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 0ac3d8af8448b1f5f90c051bde39cddc60fea3c1..163070c86cf1de8f5f5edd319f01be78071d46ee 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 7aa321f1363d4f4d03f676708e8df3cb9716db3f..47f481c203beacb952e70862f0ab3fcee87b23e2 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 82af3c7a7313bf9e269444d185cddf6cb76d4ba3..a27db3d39ab51ffc81afbcb10d809a5b9a674de6 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 461d792bcba35c4a66609f9fddef1cdaee5a2136..37d717f34299111e7e1b91a92463df1ac1e51e20 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 43176bdd8f339b8f0dfe2c98dc9ecf6fd7faaa9e..e69b0872b606719b8db6c0fa5cb4db918499eb87 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 1dfe6db5dc0350e27721a612d11d4f371905e224..aa2fdebc66fa1b9a92671a1cd26ebbc9b3636db3 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 8d574679183fea3eb9217906b36c09cd2adac6a2..a33a1eb6efe5f1f6c38abfa5beebda35fa372753 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 b25a46018358ad0ca53e5497e1dfb5d03cd2be18..2da5b377ec323b331a7cade71290a23b18a5a6e6 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 74ebf7121e7b0b947bd1889ddf0631590e1344b2..bd949acf6eccd49da50ccea3a67a88f7d55c9704 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 10bc170149123fdaea5d8e4854e74ab7d9e5f48c..bdec4e3afa72529cb141813a30a31d4ac9d846e4 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 3d67565abdb7561845e82b4414f8f0f590a306d9..2337a1befa13e1cc9ddf31b2384b26fdb292b411 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 7be503f0a873976e43a2ec13e95f5ba53e7d2100..4a8965a25a132ff6049b58ed00689e383ec9fbf9 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 827130a75ec659c0160f0c08171019ec8a1e463d..aa0f07b7db4737ac755580a85cb3dca38fd4bac2 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 01badd6d32d91328a200e82f45d787a7afcac8b6..fc74486cdd65fcf880f87b5f275eed18a7853074 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 9fb8cca8f7057f5013100ffb20b88d1cc626e6a3..978d5d35ba4a4d718d1e7cf7cf0c49ba24aaaf88 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 a8bc90ddd22a6d2ff6c22c3bb63c7499a6358341..c1dbe1af24de6269946bd3a2e838f974ba898ec0 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 0405ff93b82a9516ef797642cfdb7919cd35f5bb..819fbb1f6b7aedc80d034bdaaff78131002372bf 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 4d6e279517522e4cb9804f0fe0333b1aa0c7e047..498fb728926c7b9bd6ef974a7f9bdf01fb3cf282 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 5ce162954b0d55d362939d8d25c5ad2c69cb08d0..611dab06bf1b09f718097ccac33dcac727486a20 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 b5dc8066e9a9e0f74654e4b4e0c07cd06549db13..78e3c833b4c77ab3b9c70b14c8ab8314d1ae545a 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 92e7a6034e2f349709c363e199f98dfe534f1a5b..2e64e276dfacc0f9ef505fbbe907b3a7ecbe3620 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 8f42a167ebf9546e7f4597ba3403f29234acd844..569014e857a3bebd133a598efa02c2a730722645 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 937db77b7b41a8c268373d2aa5964c1cf39a9b3e..608b0dfb4b87f77fe6be86692ddb4ecc771e4c4e 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 1eda0c6148de5937507e9189eb59f59825b9c5db..b2b8a63d7b8071c0fbb8edb3c22c9c4691c5d5bb 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 d0ab7247d58638b3f73e040617f192fb75c63b68..b2674a4b03faa2d6318dd30d585485c1d837b009 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 c718ec76615e5ffad9a7e890221bfbd49227fd07..bb53edbc322094c57db2d10e7f3c7dabb8437062 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 c304f660a3e8277680048ed5b5be88504a3a88f2..539a44f8e9c6ab24e6170a273f72b4d92a4e5a40 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 a3cb3b9438a144265f4b399501b9e024f927de5b..9d3255749ddeff40b15174c4b0e669397302296b 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 04f2a26880d3968f7b70ef02aa048e42fa5bdaf4..31e216a1aa9da321038299393d05475712607966 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 34459b24b1433b27599f926b52663d7fd8b70508..3e70d7c5e62a491b58d46f0390cbd13086052b23 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 2ae4881d91cf1a5cf8abaf65389194952cb63f1a..f4d3d27eb544abcee45b90cbf0fba09e06610305 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 cd785ce4b6e71b397560dd146bdb576d943f722a..f3c309cbcfd2e9f8ba751e7c0bd91d3be19ef68b 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 8b5501a1b15390dc69507bbdfc880a8f2aa80636..f9b725ab23b607cc09949e6e53038b9c3424bcae 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 2557a8e58ab710db275060ca49ac04db0e3c3a4e..c378005c158cd2ef5529ae2463dce258f5b1c96a 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 e5e29983d61fde00b5a1651edb15503d7f8a8319..fe3c4ae5e7db26a4f7ac9d862594853192ff0edc 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 8fa843458af17b0727be30b671a40670063d8cb4..5ced05af6a32e37361087d2cf0bbb6b719148a36 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 b2a47aed16711be91d666a17fa688fb39a8a9e24..25f65522692c484586d8da282456f33c305926f0 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 f63e3314efff25def8c3882aef2b68488b28212f..d1b346b34cf8753ab258f121327062de711a9048 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 4c770d846b97412d64d63b092a30dbbfd480c6dc..3cd10dbd9d3ac6cfe2214126dfeddaef558f90ab 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 eecac1b22b2e674941d22dcae0137835e045dc28..9a55538de75e425ac0d00b6fef35ae7232ea6de5 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 eeec93b6fbf873d34469902deed8ca7982c02984..0f35ae74a4b06b76ca9cb39e260ef0b503d780e4 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 590b08eae2dc64c95a980520c5fd5e87f58af4b8..3a3ad07a106b2056f3d4bc1beb5204b04b4e3870 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 8b12f78950ce0d529eed78eb575514553d3c15c5..d02c581be202867fcf4e4e2c83ee153194a44612 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 073341386c5c1fc7cd9a855b850f5d544424ad6b..0db7c371f3f057b6d94e096cb2bdcdaea81ac220 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 61ac7df294d9fddc20d5791b670dd2180b13c4ff..9405f15e90deb345682c76f83c458d758c0fa327 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 974d05592693820fd2a84f97c2c768cb732cf9cc..b74b35d37f4db2409c9f526418cd4ee8eb7f06be 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 5a37da848b1f76d6541a3bbdab63304e140fb0b1..41233d26873c7b63e59a9d7308b5080b7fe531d0 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 8de9eac85fe11d9c9c2ccbe7844b1d3561905583..f223a651ea9617deeb02623859af8462e791f310 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 15cd7c215c8d5921b148c43fb6d66f2b6a3fbcae..4cb742eac0be08345d9fd2c66457f405b7b3f5f7 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 1691126119e861a1b29e742ef227e79ef9face84..500667b5dfc5a6fd6f91768fbb61452a4191298c 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 0c3b497fc9e9489def5656e2edd9c5ad30ee7356..e0144f317abdb34c3322fba41440fdc23d2aadfb 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 813a1326ac3e69c25f7a4c48779bc20cb26ff08b..b42ca7bbdc13084762c2d08e8534d6e898f07bc4 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 9ef86452edcb605008b7a16b9a6c064578503a09..f3e8ae9b67083e9d8edd8404b61466923d2bd725 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 2fef4121cd94fdc382019e098a131165aa96e941..ce21f992ac309756e0ec0030a484b90793071cc3 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 3dd2987ed3ba82a83b2de45cb9d3668528bf6749..092ed50cecdd8493a6c14b6a90a3b7d4bd454c67 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 146f31d3b367da97104421c8579819bbf919f234..b2e0556743c3e0de76b39b34de1166bed114cfc9 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 455d5a2b0ccdd8c8eeaebe62e0df5bf080c0549c..18cd2422287f5dd467cdf2cd546da44968ce6f8c 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 a2dc798287678ebef2594fc116668b8cf4e1dc33..5e113adb64430abe2ff37555dc04ac491847f0f5 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 9f535c524826322ab80e717e9c711f1e28a1ca5f..43ece0eb89b21766675a24e0e7131ce715caa5dd 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 1d7d2a4c6b80f3ff25a82de1c86cb131e14e3aac..c9933e98e9b4cdf26f5c37e49f594c4a4d7004f8 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 d41eb71e9acd9dc74a0e7971538706d5368ad5b2..eeb161f5d90b05cccc972a939c75522bf53ea630 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 126129990a7aea2f4d91ca4bc1dc7ae76968f220..7d711ed5fc47d7afe09fd06dc0d3bb1d2f7ecf44 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;