mirror of
https://github.com/Alfresco/SearchServices.git
synced 2025-09-10 14:11:25 +00:00
Merge master into jaxen-jaxen-1.2.0.
This commit is contained in:
Tom Page
3
search-services/.gitignore → .gitignore
vendored
3
search-services/.gitignore → .gitignore
vendored
@@ -8,6 +8,8 @@ target
|
||||
alf_data_dev
|
||||
alfresco.log*
|
||||
solr.log*
|
||||
alfresco-insight-engine/bin/
|
||||
packaging/bin/
|
||||
# OS generated files #
|
||||
######################
|
||||
.DS_Store
|
||||
@@ -17,6 +19,7 @@ solr.log*
|
||||
.Trashes
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
.git-rewrite
|
||||
|
||||
#############
|
||||
# Test data #
|
||||
33
pom.xml
Normal file
33
pom.xml
Normal file
@@ -0,0 +1,33 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-super-pom</artifactId>
|
||||
<version>10</version>
|
||||
</parent>
|
||||
<artifactId>alfresco-search-and-insight-parent</artifactId>
|
||||
<version>1.4.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Alfresco Search And Insight Parent</name>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>alfresco-internal</id>
|
||||
<url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases/</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>alfresco-internal-snapshots</id>
|
||||
<url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-snapshots/</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
<scm>
|
||||
<connection>scm:git:https://git.alfresco.com/search_discovery/insightengine.git</connection>
|
||||
<developerConnection>scm:git:https://git.alfresco.com/search_discovery/insightengine.git</developerConnection>
|
||||
<url>https://git.alfresco.com/search_discovery/insightengine.git</url>
|
||||
<tag>HEAD</tag>
|
||||
</scm>
|
||||
<modules>
|
||||
<module>search-services</module>
|
||||
<module>insight-engine</module>
|
||||
</modules>
|
||||
</project>
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
package org.alfresco.solr.query.afts.qparser;
|
||||
|
||||
|
||||
import static java.util.Arrays.stream;
|
||||
|
||||
import static org.alfresco.model.ContentModel.PROP_CONTENT;
|
||||
import static org.alfresco.model.ContentModel.PROP_CREATED;
|
||||
import static org.alfresco.model.ContentModel.PROP_DESCRIPTION;
|
||||
@@ -28,21 +28,25 @@ import static org.alfresco.model.ContentModel.PROP_NAME;
|
||||
import static org.alfresco.model.ContentModel.TYPE_CONTENT;
|
||||
import static org.alfresco.model.ContentModel.TYPE_THUMBNAIL;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.solr.dataload.TestDataProvider;
|
||||
import org.alfresco.util.CachingDateFormat;
|
||||
import org.alfresco.util.CachingDateFormat.SimpleDateFormatAndResolution;
|
||||
import org.apache.solr.SolrTestCaseJ4;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.Locale;
|
||||
|
||||
@SolrTestCaseJ4.SuppressSSL
|
||||
public class QParserPluginTest extends AbstractQParserPluginTest implements QueryConstants
|
||||
{
|
||||
/** The UTC time zone. */
|
||||
private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
|
||||
private final long [] msecs = {
|
||||
333,
|
||||
20000,
|
||||
@@ -571,7 +575,9 @@ public class QParserPluginTest extends AbstractQParserPluginTest implements Quer
|
||||
{
|
||||
stream(CachingDateFormat.getLenientFormatters())
|
||||
.filter(formatter -> formatter.getResolution() < Calendar.DAY_OF_MONTH)
|
||||
.map(formatter -> formatter.getSimpleDateFormat().format(FTS_TEST_DATE))
|
||||
.map(SimpleDateFormatAndResolution::getSimpleDateFormat)
|
||||
.peek(simpleDateFormat -> simpleDateFormat.setTimeZone(UTC))
|
||||
.map(simpleDateFormat -> simpleDateFormat.format(FTS_TEST_DATE))
|
||||
.filter(date -> date.length() >= 9)
|
||||
.forEach(date -> assertAQuery("\\@" + escape(QName.createQName(TEST_NAMESPACE, "date-ista")) + ":\"" + date + "\"", 1));
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Alfresco Search Services ${project.version} Docker Image
|
||||
|
||||
FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-1fd3c4475374
|
||||
FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-3e4e9f4e5d6a
|
||||
LABEL creator="Gethin James" maintainer="Alfresco Search Services Team"
|
||||
|
||||
ENV DIST_DIR /opt/alfresco-search-services
|
||||
|
||||
@@ -3,9 +3,12 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-super-pom</artifactId>
|
||||
<version>10</version>
|
||||
<artifactId>alfresco-search-and-insight-parent</artifactId>
|
||||
<version>1.4.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<!-- The groupId and version are required by the maven pom extractor plugin on Bamboo - more details in this issue:
|
||||
https://bitbucket.org/dehringer/bamboo-maven-pom-extractor-plugin/issues/18/groupid-not-populated-if-using-parent-pom -->
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-search-parent</artifactId>
|
||||
<version>1.4.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
@@ -18,22 +21,6 @@
|
||||
<solr.zip>https://artifacts.alfresco.com/nexus/content/repositories/public/org/apache/solr/solr/solr-${solr.version}-patched/solr-solr-${solr.version}-patched.zip</solr.zip>
|
||||
<solr.directory>${project.build.directory}/solr-${solr.version}-patched</solr.directory>
|
||||
</properties>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>alfresco-releases</id>
|
||||
<url>https://artifacts.alfresco.com/nexus/content/repositories/releases/</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>alfresco-snapshots</id>
|
||||
<url>https://artifacts.alfresco.com/nexus/content/repositories/snapshots/</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
<scm>
|
||||
<connection>scm:git:git@github.com:Alfresco/SearchServices.git</connection>
|
||||
<developerConnection>scm:git:git@github.com:Alfresco/SearchServices.git</developerConnection>
|
||||
<url>https://github.com/Alfresco/SearchServices.git</url>
|
||||
<tag>HEAD</tag>
|
||||
</scm>
|
||||
<modules>
|
||||
<module>alfresco-solrclient-lib</module>
|
||||
<module>alfresco-search</module>
|
||||
|
||||
Reference in New Issue
Block a user