From: remillet <remillet@yahoo.com>
Date: Tue, 22 Mar 2016 20:07:39 +0000 (-0700)
Subject: NOJIRA: Turn off Elasticsearch in Nuxeo by default.  Add actual short ID value to... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=23d9e77104d4e1622311f38e4854421b4a6fb1e1;p=tmp%2Fjakarta-migration.git

NOJIRA: Turn off Elasticsearch in Nuxeo by default.  Add actual short ID value to validation error message.
---

diff --git a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/nuxeo.properties b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/nuxeo.properties
index e6d29ddfd..6ad0f24db 100644
--- a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/nuxeo.properties
+++ b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/config/nuxeo.properties
@@ -2,7 +2,7 @@
 org.nuxeo.ecm.instance.host=localhost
 
 # enable/disable Elasticsearch
-elasticsearch.enabled=true
+elasticsearch.enabled=false
 
 # runtime remoting config
 org.nuxeo.runtime.server.locator=socket://0.0.0.0:62474/?datatype=nuxeo
diff --git a/services/citation/service/src/main/java/org/collectionspace/services/citation/nuxeo/CitationAuthorityValidatorHandler.java b/services/citation/service/src/main/java/org/collectionspace/services/citation/nuxeo/CitationAuthorityValidatorHandler.java
index e4314e1c0..90570f217 100644
--- a/services/citation/service/src/main/java/org/collectionspace/services/citation/nuxeo/CitationAuthorityValidatorHandler.java
+++ b/services/citation/service/src/main/java/org/collectionspace/services/citation/nuxeo/CitationAuthorityValidatorHandler.java
@@ -77,7 +77,7 @@ public class CitationAuthorityValidatorHandler implements ValidatorHandler {
 	                // a display name or supplied in another manner.
 	                if ((shortId != null) && (shortIdBadPattern.matcher(shortId).find())) {
 	                    invalid = true;
-	                    msg += "shortIdentifier must only contain standard word characters";
+	                    msg += String.format("shortIdentifier '%s' must only contain standard word characters", shortId);
 	                }
 	            } else if (action.equals(Action.UPDATE)) {
 	            }