From fd6e99ca2a33935574143c9f882a1da21c3652e9 Mon Sep 17 00:00:00 2001
From: Ray Lee <rhlee@berkeley.edu>
Date: Thu, 3 Jan 2019 16:11:42 -0800
Subject: [PATCH] DRYD-562: Update default Elasticsearch configuration.

---
 .../config/proto-elasticsearch-extension.xml  | 325 +++++++++---------
 1 file changed, 156 insertions(+), 169 deletions(-)

diff --git a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-elasticsearch-extension.xml b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-elasticsearch-extension.xml
index 4302653a2..3a30651da 100644
--- a/3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-elasticsearch-extension.xml
+++ b/3rdparty/nuxeo/nuxeo-server/7.10-HF17/config/proto-elasticsearch-extension.xml
@@ -1,175 +1,162 @@
-  <extension target="org.nuxeo.elasticsearch.ElasticSearchComponent"
-    point="elasticSearchIndex">
-    <elasticSearchIndex name="index_name_placeholder" type="doc" repository="repository_name_placeholder">
-      <fetchFromSource>
-        <include>ecm:*</include>
-        <include>dc:*</include>
-        <exclude>ecm:binarytext</exclude>
-      </fetchFromSource>
+<extension target="org.nuxeo.elasticsearch.ElasticSearchComponent" point="elasticSearchIndex">
+  <elasticSearchIndex name="index_name_placeholder" type="doc" repository="repository_name_placeholder">
+    <fetchFromSource>
+      <include>ecm:*</include>
+      <include>dc:*</include>
+      <exclude>ecm:binarytext</exclude>
+    </fetchFromSource>
 
-      <settings>
-{
-   "analysis" : {
-      "filter" : {
-         "en_stem_filter" : {
-            "name" : "minimal_english",
-            "type" : "stemmer"
-         },
-         "en_stop_filter" : {
-            "stopwords" : [
-               "_english_"
-            ],
-            "type" : "stop"
-         },
-         "fr_elision_filter" : {
-            "articles" : [
-               "c",
-               "l",
-               "m",
-               "t",
-               "qu",
-               "n",
-               "s",
-               "j"
-            ],
-            "type" : "elision"
-         },
-         "fr_stem_filter" : {
-            "name" : "minimal_french",
-            "type" : "stemmer"
-         },
-         "fr_stop_filter" : {
-            "stopwords" : [
-               "_french_"
-            ],
-            "type" : "stop"
-         }
-      },
-      "tokenizer" : {
-         "path_tokenizer" : {
-            "delimiter" : "/",
-            "type" : "path_hierarchy"
-         }
-      },
-      "analyzer" : {
-         "en_analyzer" : {
-            "alias" : "fulltext",
-            "filter" : [
-               "lowercase",
-               "en_stop_filter",
-               "en_stem_filter",
-               "asciifolding"
-            ],
-            "type" : "custom",
-            "tokenizer" : "standard"
-         },
-         "fr_analyzer" : {
-            "filter" : [
-               "lowercase",
-               "fr_stop_filter",
-               "fr_stem_filter",
-               "asciifolding",
-               "fr_elision_filter"
-            ],
-            "type" : "custom",
-            "tokenizer" : "standard"
-         },
-         "path_analyzer" : {
-            "type" : "custom",
-            "tokenizer" : "path_tokenizer"
-         },
-         "default" : {
-            "type" : "custom",
-            "tokenizer" : "keyword"
-         }
-      }
-   }
-}
-      </settings>
-      <mapping>
-{
-   "_size" : {
-      "enabled" : true
-   },
-   "_all" : {
-      "analyzer" : "fulltext"
-   },
-   "properties" : {
-      "dc:title" : {
-         "type" : "multi_field",
-         "fields" : {
-           "dc:title" : {
-             "index" : "not_analyzed",
-             "type" : "string"
-           },
-           "fulltext" : {
-             "boost": 2,
-             "type": "string",
-             "analyzer" : "fulltext"
-          }
-        }
-      },
-      "dc:description" : {
-         "type" : "multi_field",
-         "fields" : {
-           "dc:description" : {
-             "index" : "no",
-             "include_in_all" : "true",
-             "type" : "string"
-           },
-           "fulltext" : {
-             "boost": 1.5,
-             "type": "string",
-             "analyzer" : "fulltext"
+    <settings>
+      {
+        "analysis" : {
+          "char_filter" : {
+            "refname_displayname" : {
+              "type" : "pattern_replace",
+              "pattern" : "^.*?'(.*)'$",
+              "replacement" : "$1"
+            },
+            "refname_shortid" : {
+              "type" : "pattern_replace",
+              "pattern" : "^.*:item:name\\((.*)\\).*$",
+              "replacement" : "$1"
+            },
+            "doctype_tenant_unqualified" : {
+              "type" : "pattern_replace",
+              "pattern" : "^(.*?)(Tenant.*)?$",
+              "replacement" : "$1"
+            }
+          },
+          "filter" : {
+            "en_stem_filter" : {
+              "name" : "minimal_english",
+              "type" : "stemmer"
+            },
+            "en_stop_filter" : {
+              "stopwords" : [
+                "_english_"
+              ],
+              "type" : "stop"
+            },
+            "fr_elision_filter" : {
+              "articles" : [
+                "c",
+                "l",
+                "m",
+                "t",
+                "qu",
+                "n",
+                "s",
+                "j"
+              ],
+              "type" : "elision"
+            },
+            "fr_stem_filter" : {
+              "name" : "minimal_french",
+              "type" : "stemmer"
+            },
+            "fr_stop_filter" : {
+              "stopwords" : [
+                "_french_"
+              ],
+              "type" : "stop"
+            }
+          },
+          "tokenizer" : {
+            "path_tokenizer" : {
+              "delimiter" : "/",
+              "type" : "path_hierarchy"
+            }
+          },
+          "analyzer" : {
+            "en_analyzer" : {
+              "alias" : "fulltext",
+              "filter" : [
+                "lowercase",
+                "en_stop_filter",
+                "en_stem_filter",
+                "asciifolding"
+              ],
+              "type" : "custom",
+              "tokenizer" : "standard"
+            },
+            "fr_analyzer" : {
+              "filter" : [
+                "lowercase",
+                "fr_stop_filter",
+                "fr_stem_filter",
+                "asciifolding",
+                "fr_elision_filter"
+              ],
+              "type" : "custom",
+              "tokenizer" : "standard"
+            },
+            "path_analyzer" : {
+              "type" : "custom",
+              "tokenizer" : "path_tokenizer"
+            },
+            "refname_displayname_analyzer" : {
+              "type" : "custom",
+              "tokenizer" : "keyword",
+              "char_filter" : ["refname_displayname"]
+            },
+            "refname_displayname_fulltext_analyzer" : {
+              "char_filter" : ["refname_displayname"],
+              "filter" : [
+                "lowercase",
+                "en_stop_filter",
+                "en_stem_filter",
+                "asciifolding"
+              ],
+              "type" : "custom",
+              "tokenizer" : "standard"
+            },
+            "refname_shortid_analyzer" : {
+              "type" : "custom",
+              "tokenizer" : "keyword",
+              "char_filter" : ["refname_shortid"]
+            },
+            "doctype_analyzer" : {
+              "type" : "custom",
+              "tokenizer" : "keyword",
+              "char_filter" : ["doctype_tenant_unqualified"]
+            },
+            "sorting_analyzer" : {
+              "filter" : [
+                "lowercase",
+                "asciifolding"
+              ],
+              "type" : "custom",
+              "tokenizer" : "keyword"
+            },
+            "default" : {
+              "type" : "custom",
+              "tokenizer" : "keyword"
+            }
           }
         }
-      },
-      "note:note" : {
-         "type" : "multi_field",
-         "fields" : {
-           "note:note" : {
-             "index" : "no",
-             "include_in_all" : "true",
-             "type" : "string"
-           },
-           "fulltext" : {
-             "type": "string",
-             "analyzer" : "fulltext"
+      }
+    </settings>
+
+    <mapping>
+      {
+        "_size" : {
+          "enabled" : true
+        },
+        "_all" : {
+          "analyzer" : "fulltext"
+        },
+        "properties" : {
+          "ecm:currentLifeCycleState": {
+            "type": "string",
+            "include_in_all": "false"
+          },
+          "ecm:primaryType": {
+            "type": "string",
+            "analyzer" : "doctype_analyzer",
+            "include_in_all": "false"
           }
         }
-      },
-      "ecm:binarytext*" : {
-         "type" : "string",
-         "analyzer" : "fulltext"
-      },
-      "ecm:path" : {
-         "type" : "multi_field",
-         "fields" : {
-            "children" : {
-               "search_analyzer" : "keyword",
-               "index_analyzer" : "path_analyzer",
-               "type" : "string"
-            },
-            "ecm:path" : {
-               "index" : "not_analyzed",
-               "type" : "string"
-            }
-         }
-      },
-      "ecm:pos": {
-         "type": "integer"
-      },
-      "dc:created": {
-         "format": "dateOptionalTime",
-        "type": "date"
-      },
-      "dc:modified": {
-         "format": "dateOptionalTime",
-        "type": "date"
       }
-   }
-}
-      </mapping>
-
-    </elasticSearchIndex>
-  </extension>
\ No newline at end of file
+    </mapping>
+  </elasticSearchIndex>
+</extension>
\ No newline at end of file
-- 
2.47.3