From 263bf5a1605e2ff27c43141959ec553e9da034df Mon Sep 17 00:00:00 2001 From: jakubs <jakubs> Date: Mon, 22 Oct 2012 09:44:47 +0000 Subject: [PATCH] SP-334 SWE-14 rename common package to openbis.common in openbis-common project SVN: 27287 --- .../plugin/proteomics/client/api/v1/FacadeFactory.java | 2 +- .../openbis/plugin/proteomics/server/PhosphoNetXServer.java | 2 +- .../plugin/proteomics/server/PhosphoNetXServerLogger.java | 2 +- .../proteomics/server/ProteomicsDataServiceInternal.java | 2 +- .../server/ProteomicsDataServiceInternalLogger.java | 2 +- .../proteomics/server/api/v1/ProteomicsDataService.java | 2 +- .../proteomics/server/api/v1/ProteomicsDataServiceLogger.java | 2 +- .../proteomics/server/api/v1/ProteomicsDataServiceServer.java | 2 +- .../plugin/proteomics/server/PhosphoNetXServerTest.java | 3 +-- .../plugin/proteomics/server/business/ErrorModelTest.java | 2 +- .../proteomics/server/business/ProteinInfoTableTest.java | 4 +--- .../server/business/ProteinRelatedSampleTableTest.java | 3 +-- .../proteomics/server/business/ProteinSummaryTableTest.java | 3 +-- 13 files changed, 13 insertions(+), 18 deletions(-) diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/client/api/v1/FacadeFactory.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/client/api/v1/FacadeFactory.java index 1690fb4c714..686fe98b785 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/client/api/v1/FacadeFactory.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/client/api/v1/FacadeFactory.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.openbis.plugin.proteomics.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/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServer.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServer.java index 5cf9107da6e..d234ff2c50d 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServer.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServer.java @@ -27,7 +27,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.AuthorizationGuard; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.RolesAllowed; diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerLogger.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerLogger.java index 3ef77bde885..6d3db78b32f 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerLogger.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerLogger.java @@ -20,7 +20,7 @@ import java.util.List; 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.Vocabulary; diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternal.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternal.java index 1acd4f96b82..e731c5e129c 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternal.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternal.java @@ -28,7 +28,7 @@ import java.util.Set; import ch.systemsx.cisd.authentication.ISessionManager; import ch.systemsx.cisd.common.exception.EnvironmentFailureException; 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.ReturnValueFilter; diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternalLogger.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternalLogger.java index 6946222825c..c9cfb82a8dc 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternalLogger.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternalLogger.java @@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.proteomics.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.Experiment; diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataService.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataService.java index a2007850e29..0715f98626f 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataService.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataService.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Component; 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.RolesAllowed; import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager; diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataServiceLogger.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataServiceLogger.java index 2b2edae25a8..e8361bdbf23 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataServiceLogger.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataServiceLogger.java @@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.proteomics.server.api.v1; 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.dto.Session; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.api.v1.IProteomicsDataService; diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataServiceServer.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataServiceServer.java index 77e14a719ca..d23f693e5e4 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataServiceServer.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/api/v1/ProteomicsDataServiceServer.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.proteomics.shared.api.v1.IProteomicsDataService; /** diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerTest.java index 1f9f512a43e..57f95107e7b 100644 --- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerTest.java +++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/PhosphoNetXServerTest.java @@ -23,14 +23,13 @@ import org.jmock.Expectations; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.eodsql.MockDataSet; +import ch.systemsx.cisd.openbis.common.eodsql.MockDataSet; import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin; import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerTestCase; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample; import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE; -import ch.systemsx.cisd.openbis.plugin.proteomics.server.PhosphoNetXServer; import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.IAbundanceColumnDefinitionTable; import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.IBusinessObjectFactory; import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.IProteinDetailsBO; diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ErrorModelTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ErrorModelTest.java index fdde68882d8..6f4a9e8ce92 100644 --- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ErrorModelTest.java +++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ErrorModelTest.java @@ -23,7 +23,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.eodsql.MockDataSet; +import ch.systemsx.cisd.openbis.common.eodsql.MockDataSet; import ch.systemsx.cisd.openbis.plugin.proteomics.server.dataaccess.IProteinQueryDAO; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.dto.IdentifiedProtein; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.dto.ProbabilityFDRMapping; diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinInfoTableTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinInfoTableTest.java index f96d353305a..3d826a60089 100644 --- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinInfoTableTest.java +++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinInfoTableTest.java @@ -30,12 +30,10 @@ import org.jmock.Expectations; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.eodsql.MockDataSet; +import ch.systemsx.cisd.openbis.common.eodsql.MockDataSet; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample; import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE; -import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.ISampleProvider; -import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.ProteinInfoTable; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto.AbundanceColumnDefinition; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto.AggregateFunction; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto.ProteinInfo; diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinRelatedSampleTableTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinRelatedSampleTableTest.java index e32ad6a91cd..68e9ddcc5dd 100644 --- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinRelatedSampleTableTest.java +++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinRelatedSampleTableTest.java @@ -22,7 +22,7 @@ import org.jmock.Expectations; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.eodsql.MockDataSet; +import ch.systemsx.cisd.openbis.common.eodsql.MockDataSet; import ch.systemsx.cisd.openbis.generic.shared.CommonTestUtils; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode; @@ -37,7 +37,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.builders.EntityTypePropertyTy import ch.systemsx.cisd.openbis.generic.shared.dto.builders.SamplePEBuilder; import ch.systemsx.cisd.openbis.generic.shared.dto.builders.SampleTypePEBuilder; import ch.systemsx.cisd.openbis.generic.shared.dto.builders.SpacePEBuilder; -import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.ProteinRelatedSampleTable; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto.ProteinRelatedSample; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.dto.SampleAbundance; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.dto.SamplePeptideModification; diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinSummaryTableTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinSummaryTableTest.java index 260a87bb28b..9e3ffe6d075 100644 --- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinSummaryTableTest.java +++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/ProteinSummaryTableTest.java @@ -25,11 +25,10 @@ import org.jmock.Expectations; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import ch.systemsx.cisd.common.eodsql.MockDataSet; +import ch.systemsx.cisd.openbis.common.eodsql.MockDataSet; import ch.systemsx.cisd.openbis.generic.shared.AbstractServerTestCase; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE; -import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.ProteinSummaryTable; import ch.systemsx.cisd.openbis.plugin.proteomics.server.dataaccess.IPhosphoNetXDAOFactory; import ch.systemsx.cisd.openbis.plugin.proteomics.server.dataaccess.IProteinQueryDAO; import ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.dto.ProteinSummary; -- GitLab