From 0be1b09f5bd694df0ce68cdc7841fb56a464e3d2 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Thu, 24 Jun 2010 09:14:53 +0000
Subject: [PATCH] [LMS-1605] fixed dependencies

SVN: 16711
---
 .../generic/server/authorization/PredicateExecutor.java     | 4 ++--
 .../generic/server/batch/BatchOperationExecutor.java        | 2 +-
 .../generic/server/batch/DataSetBatchUpdate.java            | 2 +-
 .../{plugin => }/generic/server/batch/IBatchOperation.java  | 2 +-
 .../generic/server/batch/SampleBatchRegistration.java       | 2 +-
 .../generic/server/batch/SampleBatchUpdate.java             | 2 +-
 .../generic/server/GenericDataSetTypeSlaveServerPlugin.java | 4 ++--
 .../generic/server/GenericSampleTypeSlaveServerPlugin.java  | 6 +++---
 .../cisd/openbis/plugin/generic/server/GenericServer.java   | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => }/generic/server/batch/BatchOperationExecutor.java (95%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => }/generic/server/batch/DataSetBatchUpdate.java (96%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => }/generic/server/batch/IBatchOperation.java (93%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => }/generic/server/batch/SampleBatchRegistration.java (96%)
 rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => }/generic/server/batch/SampleBatchUpdate.java (96%)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java
index f53ebde58f6..70deb1c9fba 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java
@@ -28,6 +28,8 @@ import org.hibernate.Session;
 
 import ch.rinn.restrictions.Private;
 import ch.systemsx.cisd.common.exceptions.Status;
+import ch.systemsx.cisd.openbis.generic.server.batch.BatchOperationExecutor;
+import ch.systemsx.cisd.openbis.generic.server.batch.IBatchOperation;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAuthorizationDAOFactory;
 import ch.systemsx.cisd.openbis.generic.shared.authorization.IAuthorizationDataProvider;
 import ch.systemsx.cisd.openbis.generic.shared.authorization.RoleWithIdentifier;
@@ -51,8 +53,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.QueryPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SampleAccessPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.BatchOperationExecutor;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.IBatchOperation;
 
 /**
  * A static class to execute {@link IPredicate}.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/BatchOperationExecutor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/BatchOperationExecutor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java
index 3d50e443f04..53883fafe4e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/BatchOperationExecutor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.openbis.plugin.generic.server.batch;
+package ch.systemsx.cisd.openbis.generic.server.batch;
 
 import java.util.List;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/DataSetBatchUpdate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetBatchUpdate.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/DataSetBatchUpdate.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetBatchUpdate.java
index 6f1f059e87a..60c63615e72 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/DataSetBatchUpdate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetBatchUpdate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin.generic.server.batch;
+package ch.systemsx.cisd.openbis.generic.server.batch;
 
 import java.util.List;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/IBatchOperation.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperation.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/IBatchOperation.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperation.java
index 990d3936f25..f3408d67425 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/IBatchOperation.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin.generic.server.batch;
+package ch.systemsx.cisd.openbis.generic.server.batch;
 
 import java.util.List;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/SampleBatchRegistration.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchRegistration.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/SampleBatchRegistration.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchRegistration.java
index e6f261235f8..a160cc5c34a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/SampleBatchRegistration.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchRegistration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin.generic.server.batch;
+package ch.systemsx.cisd.openbis.generic.server.batch;
 
 import java.util.List;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/SampleBatchUpdate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchUpdate.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/SampleBatchUpdate.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchUpdate.java
index 3a5f25217a8..b5c0bcd0288 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/batch/SampleBatchUpdate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchUpdate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.plugin.generic.server.batch;
+package ch.systemsx.cisd.openbis.generic.server.batch;
 
 import java.util.List;
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
index 198be640dc5..ba1073b3e62 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
@@ -22,13 +22,13 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
+import ch.systemsx.cisd.openbis.generic.server.batch.BatchOperationExecutor;
+import ch.systemsx.cisd.openbis.generic.server.batch.DataSetBatchUpdate;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IExternalDataTable;
 import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlugin;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewDataSet;
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.BatchOperationExecutor;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.DataSetBatchUpdate;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
 /**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java
index c4967d6d1c9..6cf0ad08ee0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java
@@ -24,6 +24,9 @@ import org.springframework.stereotype.Component;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
 import ch.systemsx.cisd.openbis.generic.server.ComponentNames;
+import ch.systemsx.cisd.openbis.generic.server.batch.BatchOperationExecutor;
+import ch.systemsx.cisd.openbis.generic.server.batch.SampleBatchRegistration;
+import ch.systemsx.cisd.openbis.generic.server.batch.SampleBatchUpdate;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.SampleHierarchyFiller;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.server.plugin.ISampleTypeSlaveServerPlugin;
@@ -33,9 +36,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SampleParentWithDerivedDTO;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.BatchOperationExecutor;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.SampleBatchRegistration;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.SampleBatchUpdate;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
 /**
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 6e6084bc7f6..4663d99cf6f 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
@@ -39,6 +39,8 @@ 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.generic.server.AbstractServer;
+import ch.systemsx.cisd.openbis.generic.server.batch.BatchOperationExecutor;
+import ch.systemsx.cisd.openbis.generic.server.batch.IBatchOperation;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IExperimentBO;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IExternalDataBO;
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IMaterialBO;
@@ -100,8 +102,6 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.ExperimentTranslator;
 import ch.systemsx.cisd.openbis.generic.shared.translator.MaterialTranslator;
 import ch.systemsx.cisd.openbis.generic.shared.translator.MaterialTypeTranslator;
 import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.BatchOperationExecutor;
-import ch.systemsx.cisd.openbis.plugin.generic.server.batch.IBatchOperation;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
 import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 
-- 
GitLab