瀏覽代碼

Merge pull request #13385 from rjernst/wrong_resources

Move resources to their proper location
Ryan Ernst 10 年之前
父節點
當前提交
4914b0c465
共有 100 個文件被更改,包括 3 次插入21 次删除
  1. 3 20
      core/pom.xml
  2. 0 0
      core/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json
  3. 0 0
      core/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json
  4. 0 1
      core/src/test/java/org/elasticsearch/common/io/rootdir.properties
  5. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json
  6. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json
  7. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json
  8. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json
  9. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json
  10. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json
  11. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json
  12. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json
  13. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json
  14. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json
  15. 0 0
      core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json
  16. 0 0
      core/src/test/resources/org/elasticsearch/action/percolate/mpercolate1.json
  17. 0 0
      core/src/test/resources/org/elasticsearch/action/percolate/mpercolate2.json
  18. 0 0
      core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json
  19. 0 0
      core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json
  20. 0 0
      core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json
  21. 0 0
      core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml
  22. 0 0
      core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml
  23. 0 0
      core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json
  24. 0 0
      core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml
  25. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/cjk_analysis.json
  26. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/commongrams/common_words.txt
  27. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams.json
  28. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json
  29. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/keep_analysis.json
  30. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/pattern_capture.json
  31. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json
  32. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/stop.json
  33. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json
  34. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt
  35. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt
  36. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/test1.json
  37. 0 0
      core/src/test/resources/org/elasticsearch/index/analysis/test1.yml
  38. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/mapping.json
  39. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json
  40. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json
  41. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json
  42. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json
  43. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json
  44. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json
  45. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/multifield-mapping_default.json
  46. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json
  47. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/noboost-mapping.json
  48. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/store-mapping.json
  49. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/test1.json
  50. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json
  51. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json
  52. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json
  53. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json
  54. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json
  55. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json
  56. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json
  57. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json
  58. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json
  59. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json
  60. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json
  61. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json
  62. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json
  63. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json
  64. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json
  65. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json
  66. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json
  67. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json
  68. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json
  69. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json
  70. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json
  71. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json
  72. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json
  73. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json
  74. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json
  75. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json
  76. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json
  77. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype.json
  78. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-withtype.json
  79. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json
  80. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/update/all_mapping_create_index.json
  81. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json
  82. 0 0
      core/src/test/resources/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json
  83. 0 0
      core/src/test/resources/org/elasticsearch/index/query/and-filter-cache.json
  84. 0 0
      core/src/test/resources/org/elasticsearch/index/query/and-filter-named.json
  85. 0 0
      core/src/test/resources/org/elasticsearch/index/query/and-filter.json
  86. 0 0
      core/src/test/resources/org/elasticsearch/index/query/and-filter2.json
  87. 0 0
      core/src/test/resources/org/elasticsearch/index/query/bool-filter.json
  88. 0 0
      core/src/test/resources/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json
  89. 0 0
      core/src/test/resources/org/elasticsearch/index/query/bool.json
  90. 0 0
      core/src/test/resources/org/elasticsearch/index/query/boosting-query.json
  91. 0 0
      core/src/test/resources/org/elasticsearch/index/query/child-mapping.json
  92. 0 0
      core/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json
  93. 0 0
      core/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json
  94. 0 0
      core/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json
  95. 0 0
      core/src/test/resources/org/elasticsearch/index/query/constantScore-query.json
  96. 0 0
      core/src/test/resources/org/elasticsearch/index/query/data.json
  97. 0 0
      core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format.json
  98. 0 0
      core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format_invalid.json
  99. 0 0
      core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone.json
  100. 0 0
      core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json

+ 3 - 20
core/pom.xml

@@ -197,38 +197,21 @@
 
         <resources>
             <resource>
-                <directory>${project.basedir}/src/main/java</directory>
+                <directory>${project.basedir}/src/main/resources</directory>
                 <includes>
-                    <include>**/*.json</include>
-                    <include>**/*.yml</include>
+                    <include>es-build.properties</include>
                 </includes>
+                <filtering>true</filtering>
             </resource>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
                 <includes>
                     <include>**/*.*</include>
                 </includes>
-                <filtering>true</filtering>
             </resource>
         </resources>
 
         <testResources>
-            <testResource>
-                <directory>${project.basedir}/src/test/java</directory>
-                <includes>
-                    <include>**/*.json</include>
-                    <include>**/*.yml</include>
-                    <include>**/*.txt</include>
-                    <include>**/*.properties</include>
-                </includes>
-                <filtering>true</filtering>
-            </testResource>
-            <testResource>
-                <directory>${project.basedir}/src/test/java</directory>
-                <includes>
-                    <include>**/*.gz</include>
-                </includes>
-            </testResource>
             <testResource>
                 <directory>${project.basedir}/src/test/resources</directory>
                 <includes>

+ 0 - 0
core/src/main/java/org/elasticsearch/index/mapper/default-mapping.json → core/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json


+ 0 - 0
core/src/main/java/org/elasticsearch/index/mapper/script-mapping.json → core/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json


+ 0 - 1
core/src/test/java/org/elasticsearch/common/io/rootdir.properties

@@ -1 +0,0 @@
-copyappend.root.dir=${basedir}/src/test/resources/org/elasticsearch/common/io/copyappend

+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/bulk-log.json → core/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk5.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json → core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/percolate/mpercolate1.json → core/src/test/resources/org/elasticsearch/action/percolate/mpercolate1.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/percolate/mpercolate2.json → core/src/test/resources/org/elasticsearch/action/percolate/mpercolate2.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/termvectors/multiRequest1.json → core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/termvectors/multiRequest2.json → core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json


+ 0 - 0
core/src/test/java/org/elasticsearch/action/termvectors/multiRequest3.json → core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json


+ 0 - 0
core/src/test/java/org/elasticsearch/common/settings/loader/indentation-settings.yml → core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml


+ 0 - 0
core/src/test/java/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml → core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml


+ 0 - 0
core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json → core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json


+ 0 - 0
core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml → core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json → core/src/test/resources/org/elasticsearch/index/analysis/cjk_analysis.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt → core/src/test/resources/org/elasticsearch/index/analysis/commongrams/common_words.txt


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json → core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json → core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/keep_analysis.json → core/src/test/resources/org/elasticsearch/index/analysis/keep_analysis.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/pattern_capture.json → core/src/test/resources/org/elasticsearch/index/analysis/pattern_capture.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json → core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/stop.json → core/src/test/resources/org/elasticsearch/index/analysis/stop.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json → core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt → core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt → core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/test1.json → core/src/test/resources/org/elasticsearch/index/analysis/test1.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/analysis/test1.yml → core/src/test/resources/org/elasticsearch/index/analysis/test1.yml


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/all/mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json → core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json → core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json → core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json → core/src/test/resources/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json → core/src/test/resources/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json → core/src/test/resources/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_default.json → core/src/test/resources/org/elasticsearch/index/mapper/all/multifield-mapping_default.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json → core/src/test/resources/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/all/noboost-mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/all/store-mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/test1.json → core/src/test/resources/org/elasticsearch/index/mapper/all/test1.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json → core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json → core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json → core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-fields.json → core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json → core/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json → core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json → core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/simple/test1-withtype.json → core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-withtype.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/simple/test1.json → core/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_create_index.json → core/src/test/resources/org/elasticsearch/index/mapper/update/all_mapping_create_index.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json → core/src/test/resources/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json → core/src/test/resources/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/and-filter-cache.json → core/src/test/resources/org/elasticsearch/index/query/and-filter-cache.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/and-filter-named.json → core/src/test/resources/org/elasticsearch/index/query/and-filter-named.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/and-filter.json → core/src/test/resources/org/elasticsearch/index/query/and-filter.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/and-filter2.json → core/src/test/resources/org/elasticsearch/index/query/and-filter2.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/bool-filter.json → core/src/test/resources/org/elasticsearch/index/query/bool-filter.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json → core/src/test/resources/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/bool.json → core/src/test/resources/org/elasticsearch/index/query/bool.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/boosting-query.json → core/src/test/resources/org/elasticsearch/index/query/boosting-query.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/child-mapping.json → core/src/test/resources/org/elasticsearch/index/query/child-mapping.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/commonTerms-query1.json → core/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/commonTerms-query2.json → core/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/commonTerms-query3.json → core/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/constantScore-query.json → core/src/test/resources/org/elasticsearch/index/query/constantScore-query.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/data.json → core/src/test/resources/org/elasticsearch/index/query/data.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/date_range_filter_format.json → core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/date_range_filter_format_invalid.json → core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format_invalid.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone.json → core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone.json


+ 0 - 0
core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json → core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json


Some files were not shown because too many files changed in this diff