From: remillet Date: Wed, 19 Aug 2015 20:30:16 +0000 (-0700) Subject: CSPACE-6725: Adding libraries/jars needed for Elasticsearch. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=cdde7d38941100e338bd16abe997db41569548c0;p=tmp%2Fjakarta-migration.git CSPACE-6725: Adding libraries/jars needed for Elasticsearch. --- diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-automation-io-6.0.jar b/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-automation-io-6.0.jar new file mode 100644 index 000000000..3a6a4ba79 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-automation-io-6.0.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-core-binarymanager-s3-6.0.jar b/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-core-binarymanager-s3-6.0.jar new file mode 100644 index 000000000..4eecfd0b9 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-core-binarymanager-s3-6.0.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-platform-tag-api-6.0.jar b/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-platform-tag-api-6.0.jar new file mode 100644 index 000000000..a922d75d3 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/bundles/nuxeo-platform-tag-api-6.0.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/config/nuxeo.properties b/3rdparty/nuxeo/nuxeo-server/6.0/config/nuxeo.properties index 6ad0f24db..e6d29ddfd 100644 --- a/3rdparty/nuxeo/nuxeo-server/6.0/config/nuxeo.properties +++ b/3rdparty/nuxeo/nuxeo-server/6.0/config/nuxeo.properties @@ -2,7 +2,7 @@ org.nuxeo.ecm.instance.host=localhost # enable/disable Elasticsearch -elasticsearch.enabled=false +elasticsearch.enabled=true # runtime remoting config org.nuxeo.runtime.server.locator=socket://0.0.0.0:62474/?datatype=nuxeo diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/config/s3binarymanager.properties b/3rdparty/nuxeo/nuxeo-server/6.0/config/s3binarymanager.properties new file mode 100644 index 000000000..7eafeb461 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-server/6.0/config/s3binarymanager.properties @@ -0,0 +1,3 @@ +nuxeo.s3storage.bucket=__bucketname__ +nuxeo.s3storage.awsid=__AWSAccessKeyId__ +nuxeo.s3storage.awssecret=__AWSSecretKey__ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/aws-java-sdk-1.6.4.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/aws-java-sdk-1.6.4.jar new file mode 100644 index 000000000..bbb41b1c8 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/aws-java-sdk-1.6.4.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/elasticsearch-1.1.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/elasticsearch-1.1.2.jar new file mode 100644 index 000000000..f41da6b57 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/elasticsearch-1.1.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-analyzers-common-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-analyzers-common-4.7.2.jar new file mode 100644 index 000000000..be62643cc Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-analyzers-common-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-codecs-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-codecs-4.7.2.jar new file mode 100644 index 000000000..502df56e3 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-codecs-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-core-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-core-4.7.2.jar new file mode 100644 index 000000000..a44674dc1 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-core-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-grouping-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-grouping-4.7.2.jar new file mode 100644 index 000000000..e7206f9f7 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-grouping-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-highlighter-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-highlighter-4.7.2.jar new file mode 100644 index 000000000..df6548f3f Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-highlighter-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-join-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-join-4.7.2.jar new file mode 100644 index 000000000..014f4c4b6 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-join-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-memory-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-memory-4.7.2.jar new file mode 100644 index 000000000..fda0021ee Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-memory-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-misc-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-misc-4.7.2.jar new file mode 100644 index 000000000..524114162 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-misc-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-queries-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-queries-4.7.2.jar new file mode 100644 index 000000000..0f72a6618 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-queries-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-queryparser-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-queryparser-4.7.2.jar new file mode 100644 index 000000000..0e00a0ebf Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-queryparser-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-sandbox-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-sandbox-4.7.2.jar new file mode 100644 index 000000000..264a7cce9 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-sandbox-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-spatial-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-spatial-4.7.2.jar new file mode 100644 index 000000000..a70c0d622 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-spatial-4.7.2.jar differ diff --git a/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-suggest-4.7.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-suggest-4.7.2.jar new file mode 100644 index 000000000..1b2865a85 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0/lib/lucene-suggest-4.7.2.jar differ diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 6d1bad9e2..e294d1154 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -17,6 +17,37 @@ + + lucene-analyzers-common + org.apache.lucene + provided + 4.7.2 + + + lucene-sandbox + org.apache.lucene + provided + 4.7.2 + + + lucene-queries + org.apache.lucene + provided + 4.7.2 + + + lucene-core + org.apache.lucene + provided + 4.7.2 + + + lucene-queryparser + org.apache.lucene + provided + 4.7.2 + + org.slf4j slf4j-api @@ -46,26 +77,7 @@ 1.6.1 test - - - org.collectionspace.services - org.collectionspace.services.authority.service - ${project.version} - - - nuxeo-core-facade - org.nuxeo.ecm.core - - - servlet-api-2.5 - org.mortbay.jetty - - - jaxb-xjc - com.sun.xml.bind - - - + org.collectionspace.services org.collectionspace.services.authorization.service @@ -109,6 +121,26 @@ jersey-core com.sun.jersey + + lucene-sandbox + org.apache.lucene + + + lucene-queries + org.apache.lucene + + + lucene-core + org.apache.lucene + + + lucene-queryparser + org.apache.lucene + + + lucene-analyzers-common + org.apache.lucene + @@ -681,6 +713,27 @@ ant 1.7.0 + + org.collectionspace.services + + org.collectionspace.services.authority.service + + ${project.version} + + + nuxeo-core-facade + org.nuxeo.ecm.core + + + servlet-api-2.5 + org.mortbay.jetty + + + jaxb-xjc + com.sun.xml.bind + + + diff --git a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java index 0ff0988c4..0964474ce 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java +++ b/services/common/src/main/java/org/collectionspace/services/common/imaging/nuxeo/NuxeoBlobUtils.java @@ -429,7 +429,7 @@ public class NuxeoBlobUtils { Blob nuxeoBlob, Boolean getContentFlag) { BlobsCommon result = new BlobsCommon(); - if (documentModel != null) { + if (documentModel != null && nuxeoBlob != null) { result.setMimeType(nuxeoBlob.getMimeType()); result.setName(nuxeoBlob.getFilename()); result.setLength(Long.toString(nuxeoBlob.getLength())); @@ -984,6 +984,14 @@ public class NuxeoBlobUtils { isNonImageDerivative = true; } } + + if (logger.isDebugEnabled()) { + if (docBlob == null) { + String msg = String.format("Could not retrieve document blob for Nuxeo document ID = '%s' CSID = '%s'", + repositoryId, NuxeoUtils.getCsid(documentModel)); + logger.warn(msg); + } + } // // Create the result instance that will contain the blob metadata