You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2016/12/09 15:58:57 UTC

[3/4] lucene-solr:apiv2: Remove new include file (doesn't work), put SchemaEdit.addFieldType back the way it was

Remove new include file (doesn't work), put SchemaEdit.addFieldType back the way it was


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8d8cd3cb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8d8cd3cb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8d8cd3cb

Branch: refs/heads/apiv2
Commit: 8d8cd3cb907d7b909788c9b13f5576a00e3e14e8
Parents: cedc63d
Author: Cassandra Targett <ct...@apache.org>
Authored: Thu Dec 8 16:08:02 2016 -0600
Committer: Cassandra Targett <ct...@apache.org>
Committed: Thu Dec 8 16:08:02 2016 -0600

----------------------------------------------------------------------
 .../core.SchemaEdit.addFieldType.analyzers.json | 39 --------------------
 .../apispec/core.SchemaEdit.addFieldType.json   | 13 ++++++-
 2 files changed, 11 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d8cd3cb/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.analyzers.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.analyzers.json b/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.analyzers.json
deleted file mode 100644
index c2e6acf..0000000
--- a/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.analyzers.json
+++ /dev/null
@@ -1,39 +0,0 @@
-"class": {
-  "type": "string"
-},
-"tokenizer":{
-  "type":"object",
-  "properties":{
-    "class":{
-      "type":"string"
-    }
-  },
-  "required":["class"],
-  "additionalProperties":true
-},
-"charFilters":{
-  "type":"array",
-  "items":{
-    "type":"object",
-    "properties":{
-      "class":{
-        "type":"string"
-      }
-    },
-    "required":["class"],
-    "additionalProperties":true
-  }
-},
-"filters":{
-  "type":"array",
-  "items":{
-    "type":"object",
-    "properties":{
-      "class":{
-        "type":"string"
-      }
-    },
-    "required":["class"],
-    "additionalProperties":true
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d8cd3cb/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.json b/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.json
index ff6213e..0efb967 100644
--- a/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.json
+++ b/solr/core/src/resources/apispec/core.SchemaEdit.addFieldType.json
@@ -30,8 +30,17 @@
     "queryAnalyzer": {
       "type": "object",
       "description": "A query analyzer section defines how incoming queries to Solr will be analyzed for a field of this type.",
-      "properties":
-         {"#include":"core.SchemaEdit.addFieldType.analyzers.json"},
+      "properties":{
+            "tokenizer": {
+          "type": "object",
+           "properties": {
+             "class": {
+               "type": "string"
+             }
+          },
+           "additionalProperties": true
+         }
+      },
       "additionalProperties": true
     },
     "indexAnalyzer": {