From c470b4ee0f85a3f7902781c177b2e832adcae1e8 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Tue, 23 Oct 2012 11:19:24 +0000
Subject: [PATCH] SP-296 / BIS-191 : Metaprojects: Add it to Lucene index and
make it searchable via search API - fix dependencies problem
SVN: 27327
---
.../generic/server/dataaccess/db/HibernateSearchDAO.java | 2 +-
.../dataaccess/db/search/detailed/DetailedQueryBuilder.java | 2 +-
.../systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.java | 2 +-
.../dataaccess/db => shared}/search/IgnoreCaseAnalyzer.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{server/dataaccess/db => shared}/search/IgnoreCaseAnalyzer.java (95%)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAO.java
index 7443ccebd48..26b2bfae3fa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAO.java
@@ -62,7 +62,6 @@ import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IHibernateSearchDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.HibernateSearchContext;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IgnoreCaseAnalyzer;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.LuceneQueryBuilder;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailedSearchAssociationCriteria;
@@ -73,6 +72,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
import ch.systemsx.cisd.openbis.generic.shared.dto.SearchableEntity;
import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants;
import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
+import ch.systemsx.cisd.openbis.generic.shared.search.IgnoreCaseAnalyzer;
import ch.systemsx.cisd.openbis.generic.shared.translator.DtoConverters;
/**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/detailed/DetailedQueryBuilder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/detailed/DetailedQueryBuilder.java
index 5a44366f1bb..252d95ef084 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/detailed/DetailedQueryBuilder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/detailed/DetailedQueryBuilder.java
@@ -39,7 +39,6 @@ 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.openbis.generic.server.dataaccess.db.MetaprojectSearch;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IgnoreCaseAnalyzer;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.LuceneQueryBuilder;
import ch.systemsx.cisd.openbis.generic.shared.basic.AttributeSearchFieldKindProvider;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailedSearchAssociationCriteria;
@@ -51,6 +50,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IAttributeSearchFieldKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SearchCriteriaConnection;
import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants;
+import ch.systemsx.cisd.openbis.generic.shared.search.IgnoreCaseAnalyzer;
/**
* Builder for detailed lucene queries for different entity kinds.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.java
index 6ffdb3c9033..f26c2d78a5a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.java
@@ -50,11 +50,11 @@ import org.hibernate.search.annotations.Field;
import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.Store;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IgnoreCaseAnalyzer;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MetaprojectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants;
+import ch.systemsx.cisd.openbis.generic.shared.search.IgnoreCaseAnalyzer;
import ch.systemsx.cisd.openbis.generic.shared.util.EqualsHashUtils;
/**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/IgnoreCaseAnalyzer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/search/IgnoreCaseAnalyzer.java
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/IgnoreCaseAnalyzer.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/search/IgnoreCaseAnalyzer.java
index 3c3e5e4a07f..13152b62273 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/IgnoreCaseAnalyzer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/search/IgnoreCaseAnalyzer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search;
+package ch.systemsx.cisd.openbis.generic.shared.search;
import java.io.Reader;
--
GitLab