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

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 e6d29ddfdfbd43be925f0df8b1f72062a239acd8..6ad0f24db945a187d5450d439a3408e0fc4b3bcb 100644 (file)
--- 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 e4314e1c0715cf9fd2ca79afbea71e4f7180d003..90570f21780934e357e5f75468d46b62272fcfdb 100644 (file)
--- 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)) {
                    }