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 (file)
index 0000000..3a6a4ba
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 (file)
index 0000000..4eecfd0
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 (file)
index 0000000..a922d75
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 6ad0f24db945a187d5450d439a3408e0fc4b3bcb..e6d29ddfdfbd43be925f0df8b1f72062a239acd8 100644 (file)
--- 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 (file)
index 0000000..7eafeb4
--- /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 (file)
index 0000000..bbb41b1
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 (file)
index 0000000..f41da6b
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 (file)
index 0000000..be62643
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 (file)
index 0000000..502df56
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 (file)
index 0000000..a44674d
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 (file)
index 0000000..e7206f9
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 (file)
index 0000000..df6548f
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 (file)
index 0000000..014f4c4
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 (file)
index 0000000..fda0021
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 (file)
index 0000000..5241141
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 (file)
index 0000000..0f72a66
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 (file)
index 0000000..0e00a0e
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 (file)
index 0000000..264a7cc
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 (file)
index 0000000..a70c0d6
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 (file)
index 0000000..1b2865a
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 6d1bad9e2dffcef4266a67ace6a09903cf0f0824..e294d11547035cd14fc7279c1ed67ffcb26f87b8 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -17,6 +17,37 @@
     </properties>
 
     <dependencies>
+               <dependency>
+                       <artifactId>lucene-analyzers-common</artifactId>
+                       <groupId>org.apache.lucene</groupId>
+                       <scope>provided</scope>
+                       <version>4.7.2</version>
+               </dependency>
+               <dependency>
+                       <artifactId>lucene-sandbox</artifactId>
+                       <groupId>org.apache.lucene</groupId>
+                       <scope>provided</scope>
+                       <version>4.7.2</version>
+               </dependency>
+               <dependency>
+                       <artifactId>lucene-queries</artifactId>
+                       <groupId>org.apache.lucene</groupId>
+                       <scope>provided</scope>
+                       <version>4.7.2</version>
+               </dependency>
+               <dependency>
+                       <artifactId>lucene-core</artifactId>
+                       <groupId>org.apache.lucene</groupId>
+                       <scope>provided</scope>
+                       <version>4.7.2</version>
+               </dependency>
+               <dependency>
+                       <artifactId>lucene-queryparser</artifactId>
+                       <groupId>org.apache.lucene</groupId>
+                       <scope>provided</scope>
+                       <version>4.7.2</version>
+               </dependency>
+    
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -46,26 +77,7 @@
             <version>1.6.1</version>
             <scope>test</scope>
         </dependency>
-        <!-- CollectionSpace dependencies -->
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authority.service</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-               <exclusion>
-                       <artifactId>nuxeo-core-facade</artifactId>
-                       <groupId>org.nuxeo.ecm.core</groupId>
-               </exclusion>
-               <exclusion>
-                       <artifactId>servlet-api-2.5</artifactId>
-                       <groupId>org.mortbay.jetty</groupId>
-               </exclusion>
-               <exclusion>
-                       <artifactId>jaxb-xjc</artifactId>
-                       <groupId>com.sun.xml.bind</groupId>
-               </exclusion>
-            </exclusions>
-        </dependency>        
+        <!-- CollectionSpace dependencies -->        
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.authorization.service</artifactId>
@@ -109,6 +121,26 @@
                                        <artifactId>jersey-core</artifactId>
                                        <groupId>com.sun.jersey</groupId>
                                </exclusion>
+                               <exclusion>
+                                       <artifactId>lucene-sandbox</artifactId>
+                                       <groupId>org.apache.lucene</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>lucene-queries</artifactId>
+                                       <groupId>org.apache.lucene</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>lucene-core</artifactId>
+                                       <groupId>org.apache.lucene</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>lucene-queryparser</artifactId>
+                                       <groupId>org.apache.lucene</groupId>
+                               </exclusion>
+                               <exclusion>
+                                       <artifactId>lucene-analyzers-common</artifactId>
+                                       <groupId>org.apache.lucene</groupId>
+                               </exclusion>
                        </exclusions>
                </dependency>        
         <dependency>
@@ -681,6 +713,27 @@
                        <artifactId>ant</artifactId>
                        <version>1.7.0</version>
         </dependency>
+        <dependency>
+               <groupId>org.collectionspace.services</groupId>
+               <artifactId>
+                       org.collectionspace.services.authority.service
+               </artifactId>
+               <version>${project.version}</version>
+               <exclusions>
+                       <exclusion>
+                               <artifactId>nuxeo-core-facade</artifactId>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                       </exclusion>
+                       <exclusion>
+                               <artifactId>servlet-api-2.5</artifactId>
+                               <groupId>org.mortbay.jetty</groupId>
+                       </exclusion>
+                       <exclusion>
+                               <artifactId>jaxb-xjc</artifactId>
+                               <groupId>com.sun.xml.bind</groupId>
+                       </exclusion>
+               </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

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 0ff0988c46bfbacb4fa4583bd98a9d1451a3c244..0964474ceffd69179215687cc070e35f72bce607 100644 (file)
--- 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