From bcc4175b53e8667119d619147aa0a0c25f808469 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 7 Sep 2015 19:43:46 -0700 Subject: [PATCH] Build: Move resources to their proper location We have a a number of resources in the java source tree, mostly for tests. This change moves them to their proper location. --- .../org/elasticsearch/index/mapper/default-mapping.json | 0 .../org/elasticsearch/index/mapper/script-mapping.json | 0 .../org/elasticsearch/action/bulk/bulk-log.json | 0 .../org/elasticsearch/action/bulk/simple-bulk.json | 0 .../org/elasticsearch/action/bulk/simple-bulk10.json | 0 .../org/elasticsearch/action/bulk/simple-bulk2.json | 0 .../org/elasticsearch/action/bulk/simple-bulk3.json | 0 .../org/elasticsearch/action/bulk/simple-bulk4.json | 0 .../org/elasticsearch/action/bulk/simple-bulk5.json | 0 .../org/elasticsearch/action/bulk/simple-bulk6.json | 0 .../org/elasticsearch/action/bulk/simple-bulk7.json | 0 .../org/elasticsearch/action/bulk/simple-bulk8.json | 0 .../org/elasticsearch/action/bulk/simple-bulk9.json | 0 .../org/elasticsearch/action/percolate/mpercolate1.json | 0 .../org/elasticsearch/action/percolate/mpercolate2.json | 0 .../org/elasticsearch/action/termvectors/multiRequest1.json | 0 .../org/elasticsearch/action/termvectors/multiRequest2.json | 0 .../org/elasticsearch/action/termvectors/multiRequest3.json | 0 .../org/elasticsearch/common/io/rootdir.properties | 0 .../elasticsearch/common/settings/loader/indentation-settings.yml | 0 .../loader/indentation-with-explicit-document-start-settings.yml | 0 .../org/elasticsearch/common/settings/loader/test-settings.json | 0 .../org/elasticsearch/common/settings/loader/test-settings.yml | 0 .../org/elasticsearch/index/analysis/cjk_analysis.json | 0 .../org/elasticsearch/index/analysis/commongrams/common_words.txt | 0 .../org/elasticsearch/index/analysis/commongrams/commongrams.json | 0 .../index/analysis/commongrams/commongrams_query_mode.json | 0 .../org/elasticsearch/index/analysis/keep_analysis.json | 0 .../org/elasticsearch/index/analysis/pattern_capture.json | 0 .../org/elasticsearch/index/analysis/shingle_analysis.json | 0 .../org/elasticsearch/index/analysis/stop.json | 0 .../org/elasticsearch/index/analysis/synonyms/synonyms.json | 0 .../org/elasticsearch/index/analysis/synonyms/synonyms.txt | 0 .../elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt | 0 .../org/elasticsearch/index/analysis/test1.json | 0 .../org/elasticsearch/index/analysis/test1.yml | 0 .../org/elasticsearch/index/mapper/all/mapping.json | 0 .../index/mapper/all/mapping_boost_omit_positions_on_all.json | 0 .../elasticsearch/index/mapper/all/mapping_offsets_on_all.json | 0 .../index/mapper/all/mapping_omit_positions_on_all.json | 0 .../index/mapper/all/misplaced_mapping_key_in_root.json | 0 .../elasticsearch/index/mapper/all/misplaced_type_in_root.json | 0 .../org/elasticsearch/index/mapper/all/mistyped_type_in_root.json | 0 .../index/mapper/all/multifield-mapping_default.json | 0 .../all/multifield-mapping_include_in_all_set_to_false.json | 0 .../org/elasticsearch/index/mapper/all/noboost-mapping.json | 0 .../org/elasticsearch/index/mapper/all/store-mapping.json | 0 .../org/elasticsearch/index/mapper/all/test1.json | 0 .../index/mapper/all/type_date_detection_mapping.json | 0 .../index/mapper/all/type_dynamic_date_formats_mapping.json | 0 .../index/mapper/all/type_dynamic_template_mapping.json | 0 .../index/mapper/all/type_numeric_detection_mapping.json | 0 .../index/mapper/dynamictemplate/genericstore/test-data.json | 0 .../index/mapper/dynamictemplate/genericstore/test-mapping.json | 0 .../index/mapper/dynamictemplate/pathmatch/test-data.json | 0 .../index/mapper/dynamictemplate/pathmatch/test-mapping.json | 0 .../index/mapper/dynamictemplate/simple/test-data.json | 0 .../index/mapper/dynamictemplate/simple/test-mapping.json | 0 .../elasticsearch/index/mapper/multifield/merge/test-data.json | 0 .../index/mapper/multifield/merge/test-mapping1.json | 0 .../index/mapper/multifield/merge/test-mapping2.json | 0 .../index/mapper/multifield/merge/test-mapping3.json | 0 .../index/mapper/multifield/merge/test-mapping4.json | 0 .../org/elasticsearch/index/mapper/multifield/merge/upgrade1.json | 0 .../org/elasticsearch/index/mapper/multifield/merge/upgrade2.json | 0 .../org/elasticsearch/index/mapper/multifield/merge/upgrade3.json | 0 .../org/elasticsearch/index/mapper/multifield/test-data.json | 0 .../index/mapper/multifield/test-multi-field-type-completion.json | 0 .../index/mapper/multifield/test-multi-field-type-geo_point.json | 0 .../mapper/multifield/test-multi-field-type-no-default-field.json | 0 .../index/mapper/multifield/test-multi-field-type.json | 0 .../elasticsearch/index/mapper/multifield/test-multi-fields.json | 0 .../org/elasticsearch/index/mapper/path/test-mapping.json | 0 .../org/elasticsearch/index/mapper/simple/test-mapping.json | 0 .../org/elasticsearch/index/mapper/simple/test1-notype-noid.json | 0 .../org/elasticsearch/index/mapper/simple/test1-notype.json | 0 .../org/elasticsearch/index/mapper/simple/test1-withtype.json | 0 .../org/elasticsearch/index/mapper/simple/test1.json | 0 .../index/mapper/update/all_mapping_create_index.json | 0 .../index/mapper/update/all_mapping_update_with_conflicts.json | 0 .../mapper/update/default_mapping_with_disabled_root_types.json | 0 .../org/elasticsearch/index/query/and-filter-cache.json | 0 .../org/elasticsearch/index/query/and-filter-named.json | 0 .../org/elasticsearch/index/query/and-filter.json | 0 .../org/elasticsearch/index/query/and-filter2.json | 0 .../org/elasticsearch/index/query/bool-filter.json | 0 .../index/query/bool-query-with-empty-clauses-for-parsing.json | 0 .../{java => resources}/org/elasticsearch/index/query/bool.json | 0 .../org/elasticsearch/index/query/boosting-query.json | 0 .../org/elasticsearch/index/query/child-mapping.json | 0 .../org/elasticsearch/index/query/commonTerms-query1.json | 0 .../org/elasticsearch/index/query/commonTerms-query2.json | 0 .../org/elasticsearch/index/query/commonTerms-query3.json | 0 .../org/elasticsearch/index/query/constantScore-query.json | 0 .../{java => resources}/org/elasticsearch/index/query/data.json | 0 .../org/elasticsearch/index/query/date_range_filter_format.json | 0 .../index/query/date_range_filter_format_invalid.json | 0 .../org/elasticsearch/index/query/date_range_filter_timezone.json | 0 .../index/query/date_range_filter_timezone_numeric_field.json | 0 .../index/query/date_range_query_boundaries_exclusive.json | 0 .../index/query/date_range_query_boundaries_inclusive.json | 0 .../org/elasticsearch/index/query/date_range_query_format.json | 0 .../index/query/date_range_query_format_invalid.json | 0 .../org/elasticsearch/index/query/date_range_query_timezone.json | 0 .../index/query/date_range_query_timezone_numeric_field.json | 0 .../{java => resources}/org/elasticsearch/index/query/disMax.json | 0 .../org/elasticsearch/index/query/disMax2.json | 0 .../elasticsearch/index/query/faulty-function-score-query.json | 0 .../{java => resources}/org/elasticsearch/index/query/field3.json | 0 .../org/elasticsearch/index/query/filtered-query.json | 0 .../org/elasticsearch/index/query/filtered-query2.json | 0 .../org/elasticsearch/index/query/filtered-query3.json | 0 .../org/elasticsearch/index/query/filtered-query4.json | 0 .../org/elasticsearch/index/query/fquery-filter.json | 0 .../elasticsearch/index/query/fquery-with-empty-bool-query.json | 0 .../elasticsearch/index/query/function-filter-score-query.json | 0 .../index/query/function-score-query-causing-NPE.json | 0 .../org/elasticsearch/index/query/fuzzy-with-fields.json | 0 .../org/elasticsearch/index/query/fuzzy-with-fields2.json | 0 .../{java => resources}/org/elasticsearch/index/query/fuzzy.json | 0 .../org/elasticsearch/index/query/geoShape-filter.json | 0 .../org/elasticsearch/index/query/geoShape-query.json | 0 .../org/elasticsearch/index/query/geo_boundingbox-named.json | 0 .../org/elasticsearch/index/query/geo_boundingbox1.json | 0 .../org/elasticsearch/index/query/geo_boundingbox2.json | 0 .../org/elasticsearch/index/query/geo_boundingbox3.json | 0 .../org/elasticsearch/index/query/geo_boundingbox4.json | 0 .../org/elasticsearch/index/query/geo_boundingbox5.json | 0 .../org/elasticsearch/index/query/geo_boundingbox6.json | 0 .../org/elasticsearch/index/query/geo_distance-named.json | 0 .../org/elasticsearch/index/query/geo_distance1.json | 0 .../org/elasticsearch/index/query/geo_distance10.json | 0 .../org/elasticsearch/index/query/geo_distance11.json | 0 .../org/elasticsearch/index/query/geo_distance12.json | 0 .../org/elasticsearch/index/query/geo_distance2.json | 0 .../org/elasticsearch/index/query/geo_distance3.json | 0 .../org/elasticsearch/index/query/geo_distance4.json | 0 .../org/elasticsearch/index/query/geo_distance5.json | 0 .../org/elasticsearch/index/query/geo_distance6.json | 0 .../org/elasticsearch/index/query/geo_distance7.json | 0 .../org/elasticsearch/index/query/geo_distance8.json | 0 .../org/elasticsearch/index/query/geo_distance9.json | 0 .../org/elasticsearch/index/query/geo_polygon-named.json | 0 .../org/elasticsearch/index/query/geo_polygon1.json | 0 .../org/elasticsearch/index/query/geo_polygon2.json | 0 .../org/elasticsearch/index/query/geo_polygon3.json | 0 .../org/elasticsearch/index/query/geo_polygon4.json | 0 .../org/elasticsearch/index/query/geo_polygon_exception_1.json | 0 .../org/elasticsearch/index/query/geo_polygon_exception_2.json | 0 .../org/elasticsearch/index/query/geo_polygon_exception_3.json | 0 .../org/elasticsearch/index/query/geo_polygon_exception_4.json | 0 .../org/elasticsearch/index/query/geo_polygon_exception_5.json | 0 .../elasticsearch/index/query/has-child-in-and-filter-cached.json | 0 .../org/elasticsearch/index/query/has-child.json | 0 .../org/elasticsearch/index/query/mapping.json | 0 .../org/elasticsearch/index/query/match-query-bad-type.json | 0 .../index/query/match-with-fuzzy-transpositions.json | 0 .../index/query/match-without-fuzzy-transpositions.json | 0 .../org/elasticsearch/index/query/matchAll.json | 0 .../org/elasticsearch/index/query/match_all_empty1.json | 0 .../org/elasticsearch/index/query/match_all_empty2.json | 0 .../org/elasticsearch/index/query/mlt-items.json | 0 .../{java => resources}/org/elasticsearch/index/query/mlt.json | 0 .../org/elasticsearch/index/query/multiMatch-query-bad-type.json | 0 .../index/query/multiMatch-query-fields-as-string.json | 0 .../org/elasticsearch/index/query/multiMatch-query-simple.json | 0 .../org/elasticsearch/index/query/not-filter.json | 0 .../org/elasticsearch/index/query/not-filter2.json | 0 .../org/elasticsearch/index/query/not-filter3.json | 0 .../org/elasticsearch/index/query/or-filter.json | 0 .../org/elasticsearch/index/query/or-filter2.json | 0 .../org/elasticsearch/index/query/prefix-boost.json | 0 .../org/elasticsearch/index/query/prefix-filter-named.json | 0 .../org/elasticsearch/index/query/prefix-filter.json | 0 .../org/elasticsearch/index/query/prefix-with-boost.json | 0 .../{java => resources}/org/elasticsearch/index/query/prefix.json | 0 .../org/elasticsearch/index/query/query-fields-match.json | 0 .../org/elasticsearch/index/query/query-fields1.json | 0 .../org/elasticsearch/index/query/query-fields2.json | 0 .../org/elasticsearch/index/query/query-fields3.json | 0 .../org/elasticsearch/index/query/query-filter.json | 0 .../index/query/query-regexp-max-determinized-states.json | 0 .../index/query/query-regexp-too-many-determinized-states.json | 0 .../org/elasticsearch/index/query/query-timezone-incorrect.json | 0 .../org/elasticsearch/index/query/query-timezone.json | 0 .../{java => resources}/org/elasticsearch/index/query/query.json | 0 .../{java => resources}/org/elasticsearch/index/query/query2.json | 0 .../org/elasticsearch/index/query/range-filter-named.json | 0 .../org/elasticsearch/index/query/range-filter.json | 0 .../{java => resources}/org/elasticsearch/index/query/range.json | 0 .../{java => resources}/org/elasticsearch/index/query/range2.json | 0 .../org/elasticsearch/index/query/regexp-boost.json | 0 .../index/query/regexp-filter-flags-named-cached.json | 0 .../org/elasticsearch/index/query/regexp-filter-flags.json | 0 .../index/query/regexp-filter-max-determinized-states.json | 0 .../org/elasticsearch/index/query/regexp-filter-named.json | 0 .../org/elasticsearch/index/query/regexp-filter.json | 0 .../elasticsearch/index/query/regexp-max-determinized-states.json | 0 .../{java => resources}/org/elasticsearch/index/query/regexp.json | 0 .../org/elasticsearch/index/query/simple-query-string.json | 0 .../elasticsearch/index/query/span-multi-term-fuzzy-range.json | 0 .../org/elasticsearch/index/query/span-multi-term-fuzzy-term.json | 0 .../org/elasticsearch/index/query/span-multi-term-prefix.json | 0 .../elasticsearch/index/query/span-multi-term-range-numeric.json | 0 .../org/elasticsearch/index/query/span-multi-term-range-term.json | 0 .../org/elasticsearch/index/query/span-multi-term-wildcard.json | 0 .../org/elasticsearch/index/query/spanContaining.json | 0 .../org/elasticsearch/index/query/spanFieldMaskingTerm.json | 0 .../org/elasticsearch/index/query/spanFirst.json | 0 .../org/elasticsearch/index/query/spanNear.json | 0 .../org/elasticsearch/index/query/spanNot.json | 0 .../{java => resources}/org/elasticsearch/index/query/spanOr.json | 0 .../org/elasticsearch/index/query/spanOr2.json | 0 .../org/elasticsearch/index/query/spanTerm.json | 0 .../org/elasticsearch/index/query/spanWithin.json | 0 .../org/elasticsearch/index/query/starColonStar.json | 0 .../org/elasticsearch/index/query/term-array-invalid.json | 0 .../index/query/term-filter-broken-multi-terms-2.json | 0 .../elasticsearch/index/query/term-filter-broken-multi-terms.json | 0 .../org/elasticsearch/index/query/term-filter-named.json | 0 .../org/elasticsearch/index/query/term-filter.json | 0 .../org/elasticsearch/index/query/term-with-boost.json | 0 .../{java => resources}/org/elasticsearch/index/query/term.json | 0 .../org/elasticsearch/index/query/terms-filter-named.json | 0 .../org/elasticsearch/index/query/terms-filter.json | 0 .../org/elasticsearch/index/query/terms-query-options.json | 0 .../org/elasticsearch/index/query/terms-query.json | 0 .../org/elasticsearch/index/query/wildcard-boost.json | 0 .../org/elasticsearch/index/query/wildcard.json | 0 .../org/elasticsearch/indices/template/template0.json | 0 .../org/elasticsearch/indices/template/template1.json | 0 .../org/elasticsearch/indices/template/template2.json | 0 .../org/elasticsearch/indices/template/template3.json | 0 .../org/elasticsearch/indices/template/template4.json | 0 .../org/elasticsearch/indices/template/template5.json | 0 .../plugins/loading/classpath/es-plugin-test.properties | 0 .../search/aggregations/bucket/agg-filter-with-empty-bool.json | 0 .../elasticsearch/search/child/bool-query-with-empty-clauses.json | 0 .../org/elasticsearch/search/morelikethis/items.json | 0 .../{java => resources}/org/elasticsearch/tribe/elasticsearch.yml | 0 240 files changed, 0 insertions(+), 0 deletions(-) rename core/src/main/{java => resources}/org/elasticsearch/index/mapper/default-mapping.json (100%) rename core/src/main/{java => resources}/org/elasticsearch/index/mapper/script-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/bulk-log.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk10.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk4.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk5.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk6.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk7.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk8.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/bulk/simple-bulk9.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/percolate/mpercolate1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/percolate/mpercolate2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/termvectors/multiRequest1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/termvectors/multiRequest2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/action/termvectors/multiRequest3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/common/io/rootdir.properties (100%) rename core/src/test/{java => resources}/org/elasticsearch/common/settings/loader/indentation-settings.yml (100%) rename core/src/test/{java => resources}/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml (100%) rename core/src/test/{java => resources}/org/elasticsearch/common/settings/loader/test-settings.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/common/settings/loader/test-settings.yml (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/cjk_analysis.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/commongrams/common_words.txt (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/commongrams/commongrams.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/keep_analysis.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/pattern_capture.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/shingle_analysis.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/stop.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/synonyms/synonyms.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/synonyms/synonyms.txt (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/test1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/analysis/test1.yml (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/multifield-mapping_default.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/noboost-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/store-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/test1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/merge/test-data.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/test-data.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/multifield/test-multi-fields.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/path/test-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/simple/test-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/simple/test1-notype-noid.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/simple/test1-notype.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/simple/test1-withtype.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/simple/test1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/update/all_mapping_create_index.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/and-filter-cache.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/and-filter-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/and-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/and-filter2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/bool-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/bool.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/boosting-query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/child-mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/commonTerms-query1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/commonTerms-query2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/commonTerms-query3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/constantScore-query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/data.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_filter_format.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_filter_format_invalid.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_filter_timezone.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_query_format.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_query_format_invalid.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_query_timezone.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/disMax.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/disMax2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/faulty-function-score-query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/field3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/filtered-query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/filtered-query2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/filtered-query3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/filtered-query4.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/fquery-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/fquery-with-empty-bool-query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/function-filter-score-query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/function-score-query-causing-NPE.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/fuzzy-with-fields.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/fuzzy-with-fields2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/fuzzy.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geoShape-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geoShape-query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_boundingbox-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_boundingbox1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_boundingbox2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_boundingbox3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_boundingbox4.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_boundingbox5.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_boundingbox6.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance10.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance11.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance12.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance4.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance5.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance6.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance7.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance8.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_distance9.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon4.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon_exception_1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon_exception_2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon_exception_3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon_exception_4.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/geo_polygon_exception_5.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/has-child-in-and-filter-cached.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/has-child.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/mapping.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/match-query-bad-type.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/matchAll.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/match_all_empty1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/match_all_empty2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/mlt-items.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/mlt.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/multiMatch-query-bad-type.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/multiMatch-query-simple.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/not-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/not-filter2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/not-filter3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/or-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/or-filter2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/prefix-boost.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/prefix-filter-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/prefix-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/prefix-with-boost.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/prefix.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-fields-match.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-fields1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-fields2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-fields3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-regexp-max-determinized-states.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-timezone-incorrect.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query-timezone.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/query2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/range-filter-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/range-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/range.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/range2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/regexp-boost.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/regexp-filter-flags.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/regexp-filter-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/regexp-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/regexp-max-determinized-states.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/regexp.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/simple-query-string.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/span-multi-term-prefix.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/span-multi-term-range-numeric.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/span-multi-term-range-term.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/span-multi-term-wildcard.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanContaining.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanFieldMaskingTerm.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanFirst.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanNear.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanNot.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanOr.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanOr2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanTerm.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/spanWithin.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/starColonStar.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/term-array-invalid.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/term-filter-broken-multi-terms-2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/term-filter-broken-multi-terms.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/term-filter-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/term-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/term-with-boost.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/term.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/terms-filter-named.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/terms-filter.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/terms-query-options.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/terms-query.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/wildcard-boost.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/index/query/wildcard.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/indices/template/template0.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/indices/template/template1.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/indices/template/template2.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/indices/template/template3.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/indices/template/template4.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/indices/template/template5.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties (100%) rename core/src/test/{java => resources}/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/search/child/bool-query-with-empty-clauses.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/search/morelikethis/items.json (100%) rename core/src/test/{java => resources}/org/elasticsearch/tribe/elasticsearch.yml (100%) diff --git a/core/src/main/java/org/elasticsearch/index/mapper/default-mapping.json b/core/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/default-mapping.json rename to core/src/main/resources/org/elasticsearch/index/mapper/default-mapping.json diff --git a/core/src/main/java/org/elasticsearch/index/mapper/script-mapping.json b/core/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json similarity index 100% rename from core/src/main/java/org/elasticsearch/index/mapper/script-mapping.json rename to core/src/main/resources/org/elasticsearch/index/mapper/script-mapping.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/bulk-log.json b/core/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/bulk-log.json rename to core/src/test/resources/org/elasticsearch/action/bulk/bulk-log.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk10.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk10.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk2.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk2.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk3.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk3.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk4.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk4.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk5.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk5.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk5.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk6.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk6.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk7.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk7.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk8.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk8.json diff --git a/core/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json b/core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/bulk/simple-bulk9.json rename to core/src/test/resources/org/elasticsearch/action/bulk/simple-bulk9.json diff --git a/core/src/test/java/org/elasticsearch/action/percolate/mpercolate1.json b/core/src/test/resources/org/elasticsearch/action/percolate/mpercolate1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/percolate/mpercolate1.json rename to core/src/test/resources/org/elasticsearch/action/percolate/mpercolate1.json diff --git a/core/src/test/java/org/elasticsearch/action/percolate/mpercolate2.json b/core/src/test/resources/org/elasticsearch/action/percolate/mpercolate2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/percolate/mpercolate2.json rename to core/src/test/resources/org/elasticsearch/action/percolate/mpercolate2.json diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/multiRequest1.json b/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/multiRequest1.json rename to core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/multiRequest2.json b/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/multiRequest2.json rename to core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/multiRequest3.json b/core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/action/termvectors/multiRequest3.json rename to core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json diff --git a/core/src/test/java/org/elasticsearch/common/io/rootdir.properties b/core/src/test/resources/org/elasticsearch/common/io/rootdir.properties similarity index 100% rename from core/src/test/java/org/elasticsearch/common/io/rootdir.properties rename to core/src/test/resources/org/elasticsearch/common/io/rootdir.properties diff --git a/core/src/test/java/org/elasticsearch/common/settings/loader/indentation-settings.yml b/core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/loader/indentation-settings.yml rename to core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-settings.yml diff --git a/core/src/test/java/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml b/core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml rename to core/src/test/resources/org/elasticsearch/common/settings/loader/indentation-with-explicit-document-start-settings.yml diff --git a/core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json b/core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.json rename to core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.json diff --git a/core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml b/core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml similarity index 100% rename from core/src/test/java/org/elasticsearch/common/settings/loader/test-settings.yml rename to core/src/test/resources/org/elasticsearch/common/settings/loader/test-settings.yml diff --git a/core/src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json b/core/src/test/resources/org/elasticsearch/index/analysis/cjk_analysis.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json rename to core/src/test/resources/org/elasticsearch/index/analysis/cjk_analysis.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt b/core/src/test/resources/org/elasticsearch/index/analysis/commongrams/common_words.txt similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/commongrams/common_words.txt rename to core/src/test/resources/org/elasticsearch/index/analysis/commongrams/common_words.txt diff --git a/core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json b/core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json rename to core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json b/core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json rename to core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams_query_mode.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/keep_analysis.json b/core/src/test/resources/org/elasticsearch/index/analysis/keep_analysis.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/keep_analysis.json rename to core/src/test/resources/org/elasticsearch/index/analysis/keep_analysis.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/pattern_capture.json b/core/src/test/resources/org/elasticsearch/index/analysis/pattern_capture.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/pattern_capture.json rename to core/src/test/resources/org/elasticsearch/index/analysis/pattern_capture.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json b/core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json rename to core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/stop.json b/core/src/test/resources/org/elasticsearch/index/analysis/stop.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/stop.json rename to core/src/test/resources/org/elasticsearch/index/analysis/stop.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json b/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json rename to core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt b/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt rename to core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt diff --git a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt b/core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt rename to core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms_wordnet.txt diff --git a/core/src/test/java/org/elasticsearch/index/analysis/test1.json b/core/src/test/resources/org/elasticsearch/index/analysis/test1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/test1.json rename to core/src/test/resources/org/elasticsearch/index/analysis/test1.json diff --git a/core/src/test/java/org/elasticsearch/index/analysis/test1.yml b/core/src/test/resources/org/elasticsearch/index/analysis/test1.yml similarity index 100% rename from core/src/test/java/org/elasticsearch/index/analysis/test1.yml rename to core/src/test/resources/org/elasticsearch/index/analysis/test1.yml diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_boost_omit_positions_on_all.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_offsets_on_all.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/mapping_omit_positions_on_all.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/misplaced_mapping_key_in_root.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/misplaced_type_in_root.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/mistyped_type_in_root.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_default.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/multifield-mapping_default.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_default.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/multifield-mapping_default.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/multifield-mapping_include_in_all_set_to_false.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/noboost-mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/noboost-mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/noboost-mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/store-mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/store-mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/store-mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/test1.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/test1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/test1.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/test1.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/type_date_detection_mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/type_dynamic_date_formats_mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/type_dynamic_template_mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/all/type_numeric_detection_mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json b/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json rename to core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-data.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json b/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json rename to core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-data.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json b/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json rename to core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-data.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/dynamictemplate/simple/test-mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-data.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-data.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping2.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping3.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/test-mapping4.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade1.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade2.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/merge/upgrade3.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/test-data.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-data.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-completion.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-geo_point.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type-no-default-field.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-field-type.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-fields.json b/core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/multifield/test-multi-fields.json rename to core/src/test/resources/org/elasticsearch/index/mapper/multifield/test-multi-fields.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/path/test-mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/path/test-mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json b/core/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/simple/test-mapping.json rename to core/src/test/resources/org/elasticsearch/index/mapper/simple/test-mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json b/core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype-noid.json rename to core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype-noid.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json b/core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/simple/test1-notype.json rename to core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-notype.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/simple/test1-withtype.json b/core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-withtype.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/simple/test1-withtype.json rename to core/src/test/resources/org/elasticsearch/index/mapper/simple/test1-withtype.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/simple/test1.json b/core/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/simple/test1.json rename to core/src/test/resources/org/elasticsearch/index/mapper/simple/test1.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_create_index.json b/core/src/test/resources/org/elasticsearch/index/mapper/update/all_mapping_create_index.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_create_index.json rename to core/src/test/resources/org/elasticsearch/index/mapper/update/all_mapping_create_index.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json b/core/src/test/resources/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json rename to core/src/test/resources/org/elasticsearch/index/mapper/update/all_mapping_update_with_conflicts.json diff --git a/core/src/test/java/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json b/core/src/test/resources/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json rename to core/src/test/resources/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_root_types.json diff --git a/core/src/test/java/org/elasticsearch/index/query/and-filter-cache.json b/core/src/test/resources/org/elasticsearch/index/query/and-filter-cache.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/and-filter-cache.json rename to core/src/test/resources/org/elasticsearch/index/query/and-filter-cache.json diff --git a/core/src/test/java/org/elasticsearch/index/query/and-filter-named.json b/core/src/test/resources/org/elasticsearch/index/query/and-filter-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/and-filter-named.json rename to core/src/test/resources/org/elasticsearch/index/query/and-filter-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/and-filter.json b/core/src/test/resources/org/elasticsearch/index/query/and-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/and-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/and-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/and-filter2.json b/core/src/test/resources/org/elasticsearch/index/query/and-filter2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/and-filter2.json rename to core/src/test/resources/org/elasticsearch/index/query/and-filter2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/bool-filter.json b/core/src/test/resources/org/elasticsearch/index/query/bool-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/bool-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/bool-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json b/core/src/test/resources/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json rename to core/src/test/resources/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json diff --git a/core/src/test/java/org/elasticsearch/index/query/bool.json b/core/src/test/resources/org/elasticsearch/index/query/bool.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/bool.json rename to core/src/test/resources/org/elasticsearch/index/query/bool.json diff --git a/core/src/test/java/org/elasticsearch/index/query/boosting-query.json b/core/src/test/resources/org/elasticsearch/index/query/boosting-query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/boosting-query.json rename to core/src/test/resources/org/elasticsearch/index/query/boosting-query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/child-mapping.json b/core/src/test/resources/org/elasticsearch/index/query/child-mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/child-mapping.json rename to core/src/test/resources/org/elasticsearch/index/query/child-mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/query/commonTerms-query1.json b/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/commonTerms-query1.json rename to core/src/test/resources/org/elasticsearch/index/query/commonTerms-query1.json diff --git a/core/src/test/java/org/elasticsearch/index/query/commonTerms-query2.json b/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/commonTerms-query2.json rename to core/src/test/resources/org/elasticsearch/index/query/commonTerms-query2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/commonTerms-query3.json b/core/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/commonTerms-query3.json rename to core/src/test/resources/org/elasticsearch/index/query/commonTerms-query3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/constantScore-query.json b/core/src/test/resources/org/elasticsearch/index/query/constantScore-query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/constantScore-query.json rename to core/src/test/resources/org/elasticsearch/index/query/constantScore-query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/data.json b/core/src/test/resources/org/elasticsearch/index/query/data.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/data.json rename to core/src/test/resources/org/elasticsearch/index/query/data.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_filter_format.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_filter_format.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_filter_format_invalid.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format_invalid.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_filter_format_invalid.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format_invalid.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_query_boundaries_exclusive.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_query_boundaries_inclusive.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_query_format.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_query_format.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_query_format.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_query_format.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_query_format_invalid.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_query_format_invalid.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_query_format_invalid.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_query_format_invalid.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_query_timezone.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_query_timezone.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_query_timezone.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_query_timezone.json diff --git a/core/src/test/java/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json b/core/src/test/resources/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json rename to core/src/test/resources/org/elasticsearch/index/query/date_range_query_timezone_numeric_field.json diff --git a/core/src/test/java/org/elasticsearch/index/query/disMax.json b/core/src/test/resources/org/elasticsearch/index/query/disMax.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/disMax.json rename to core/src/test/resources/org/elasticsearch/index/query/disMax.json diff --git a/core/src/test/java/org/elasticsearch/index/query/disMax2.json b/core/src/test/resources/org/elasticsearch/index/query/disMax2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/disMax2.json rename to core/src/test/resources/org/elasticsearch/index/query/disMax2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/faulty-function-score-query.json b/core/src/test/resources/org/elasticsearch/index/query/faulty-function-score-query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/faulty-function-score-query.json rename to core/src/test/resources/org/elasticsearch/index/query/faulty-function-score-query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/field3.json b/core/src/test/resources/org/elasticsearch/index/query/field3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/field3.json rename to core/src/test/resources/org/elasticsearch/index/query/field3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/filtered-query.json b/core/src/test/resources/org/elasticsearch/index/query/filtered-query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/filtered-query.json rename to core/src/test/resources/org/elasticsearch/index/query/filtered-query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/filtered-query2.json b/core/src/test/resources/org/elasticsearch/index/query/filtered-query2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/filtered-query2.json rename to core/src/test/resources/org/elasticsearch/index/query/filtered-query2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/filtered-query3.json b/core/src/test/resources/org/elasticsearch/index/query/filtered-query3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/filtered-query3.json rename to core/src/test/resources/org/elasticsearch/index/query/filtered-query3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/filtered-query4.json b/core/src/test/resources/org/elasticsearch/index/query/filtered-query4.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/filtered-query4.json rename to core/src/test/resources/org/elasticsearch/index/query/filtered-query4.json diff --git a/core/src/test/java/org/elasticsearch/index/query/fquery-filter.json b/core/src/test/resources/org/elasticsearch/index/query/fquery-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/fquery-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/fquery-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/fquery-with-empty-bool-query.json b/core/src/test/resources/org/elasticsearch/index/query/fquery-with-empty-bool-query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/fquery-with-empty-bool-query.json rename to core/src/test/resources/org/elasticsearch/index/query/fquery-with-empty-bool-query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/function-filter-score-query.json b/core/src/test/resources/org/elasticsearch/index/query/function-filter-score-query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/function-filter-score-query.json rename to core/src/test/resources/org/elasticsearch/index/query/function-filter-score-query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/function-score-query-causing-NPE.json b/core/src/test/resources/org/elasticsearch/index/query/function-score-query-causing-NPE.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/function-score-query-causing-NPE.json rename to core/src/test/resources/org/elasticsearch/index/query/function-score-query-causing-NPE.json diff --git a/core/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json b/core/src/test/resources/org/elasticsearch/index/query/fuzzy-with-fields.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields.json rename to core/src/test/resources/org/elasticsearch/index/query/fuzzy-with-fields.json diff --git a/core/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json b/core/src/test/resources/org/elasticsearch/index/query/fuzzy-with-fields2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/fuzzy-with-fields2.json rename to core/src/test/resources/org/elasticsearch/index/query/fuzzy-with-fields2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/fuzzy.json b/core/src/test/resources/org/elasticsearch/index/query/fuzzy.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/fuzzy.json rename to core/src/test/resources/org/elasticsearch/index/query/fuzzy.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geoShape-filter.json b/core/src/test/resources/org/elasticsearch/index/query/geoShape-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geoShape-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/geoShape-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geoShape-query.json b/core/src/test/resources/org/elasticsearch/index/query/geoShape-query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geoShape-query.json rename to core/src/test/resources/org/elasticsearch/index/query/geoShape-query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json b/core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_boundingbox-named.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json b/core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_boundingbox1.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox1.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json b/core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_boundingbox2.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json b/core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_boundingbox3.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json b/core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox4.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_boundingbox4.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox4.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox5.json b/core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox5.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_boundingbox5.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox5.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_boundingbox6.json b/core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox6.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_boundingbox6.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_boundingbox6.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance-named.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance-named.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance1.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance1.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance1.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance10.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance10.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance10.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance10.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance11.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance11.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance11.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance11.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance12.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance12.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance12.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance12.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance2.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance2.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance3.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance3.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance4.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance4.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance4.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance4.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance5.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance5.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance5.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance5.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance6.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance6.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance6.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance6.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance7.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance7.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance7.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance7.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance8.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance8.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance8.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance8.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_distance9.json b/core/src/test/resources/org/elasticsearch/index/query/geo_distance9.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_distance9.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_distance9.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon-named.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon1.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon1.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon1.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon2.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon2.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon3.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon3.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon4.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon4.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon4.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon4.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_1.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_1.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_1.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_2.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_2.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_3.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_3.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_4.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_4.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_4.json diff --git a/core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_5.json b/core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/geo_polygon_exception_5.json rename to core/src/test/resources/org/elasticsearch/index/query/geo_polygon_exception_5.json diff --git a/core/src/test/java/org/elasticsearch/index/query/has-child-in-and-filter-cached.json b/core/src/test/resources/org/elasticsearch/index/query/has-child-in-and-filter-cached.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/has-child-in-and-filter-cached.json rename to core/src/test/resources/org/elasticsearch/index/query/has-child-in-and-filter-cached.json diff --git a/core/src/test/java/org/elasticsearch/index/query/has-child.json b/core/src/test/resources/org/elasticsearch/index/query/has-child.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/has-child.json rename to core/src/test/resources/org/elasticsearch/index/query/has-child.json diff --git a/core/src/test/java/org/elasticsearch/index/query/mapping.json b/core/src/test/resources/org/elasticsearch/index/query/mapping.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/mapping.json rename to core/src/test/resources/org/elasticsearch/index/query/mapping.json diff --git a/core/src/test/java/org/elasticsearch/index/query/match-query-bad-type.json b/core/src/test/resources/org/elasticsearch/index/query/match-query-bad-type.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/match-query-bad-type.json rename to core/src/test/resources/org/elasticsearch/index/query/match-query-bad-type.json diff --git a/core/src/test/java/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json b/core/src/test/resources/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json rename to core/src/test/resources/org/elasticsearch/index/query/match-with-fuzzy-transpositions.json diff --git a/core/src/test/java/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json b/core/src/test/resources/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json rename to core/src/test/resources/org/elasticsearch/index/query/match-without-fuzzy-transpositions.json diff --git a/core/src/test/java/org/elasticsearch/index/query/matchAll.json b/core/src/test/resources/org/elasticsearch/index/query/matchAll.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/matchAll.json rename to core/src/test/resources/org/elasticsearch/index/query/matchAll.json diff --git a/core/src/test/java/org/elasticsearch/index/query/match_all_empty1.json b/core/src/test/resources/org/elasticsearch/index/query/match_all_empty1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/match_all_empty1.json rename to core/src/test/resources/org/elasticsearch/index/query/match_all_empty1.json diff --git a/core/src/test/java/org/elasticsearch/index/query/match_all_empty2.json b/core/src/test/resources/org/elasticsearch/index/query/match_all_empty2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/match_all_empty2.json rename to core/src/test/resources/org/elasticsearch/index/query/match_all_empty2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/mlt-items.json b/core/src/test/resources/org/elasticsearch/index/query/mlt-items.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/mlt-items.json rename to core/src/test/resources/org/elasticsearch/index/query/mlt-items.json diff --git a/core/src/test/java/org/elasticsearch/index/query/mlt.json b/core/src/test/resources/org/elasticsearch/index/query/mlt.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/mlt.json rename to core/src/test/resources/org/elasticsearch/index/query/mlt.json diff --git a/core/src/test/java/org/elasticsearch/index/query/multiMatch-query-bad-type.json b/core/src/test/resources/org/elasticsearch/index/query/multiMatch-query-bad-type.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/multiMatch-query-bad-type.json rename to core/src/test/resources/org/elasticsearch/index/query/multiMatch-query-bad-type.json diff --git a/core/src/test/java/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json b/core/src/test/resources/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json rename to core/src/test/resources/org/elasticsearch/index/query/multiMatch-query-fields-as-string.json diff --git a/core/src/test/java/org/elasticsearch/index/query/multiMatch-query-simple.json b/core/src/test/resources/org/elasticsearch/index/query/multiMatch-query-simple.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/multiMatch-query-simple.json rename to core/src/test/resources/org/elasticsearch/index/query/multiMatch-query-simple.json diff --git a/core/src/test/java/org/elasticsearch/index/query/not-filter.json b/core/src/test/resources/org/elasticsearch/index/query/not-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/not-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/not-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/not-filter2.json b/core/src/test/resources/org/elasticsearch/index/query/not-filter2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/not-filter2.json rename to core/src/test/resources/org/elasticsearch/index/query/not-filter2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/not-filter3.json b/core/src/test/resources/org/elasticsearch/index/query/not-filter3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/not-filter3.json rename to core/src/test/resources/org/elasticsearch/index/query/not-filter3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/or-filter.json b/core/src/test/resources/org/elasticsearch/index/query/or-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/or-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/or-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/or-filter2.json b/core/src/test/resources/org/elasticsearch/index/query/or-filter2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/or-filter2.json rename to core/src/test/resources/org/elasticsearch/index/query/or-filter2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/prefix-boost.json b/core/src/test/resources/org/elasticsearch/index/query/prefix-boost.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/prefix-boost.json rename to core/src/test/resources/org/elasticsearch/index/query/prefix-boost.json diff --git a/core/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json b/core/src/test/resources/org/elasticsearch/index/query/prefix-filter-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/prefix-filter-named.json rename to core/src/test/resources/org/elasticsearch/index/query/prefix-filter-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/prefix-filter.json b/core/src/test/resources/org/elasticsearch/index/query/prefix-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/prefix-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/prefix-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json b/core/src/test/resources/org/elasticsearch/index/query/prefix-with-boost.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/prefix-with-boost.json rename to core/src/test/resources/org/elasticsearch/index/query/prefix-with-boost.json diff --git a/core/src/test/java/org/elasticsearch/index/query/prefix.json b/core/src/test/resources/org/elasticsearch/index/query/prefix.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/prefix.json rename to core/src/test/resources/org/elasticsearch/index/query/prefix.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-fields-match.json b/core/src/test/resources/org/elasticsearch/index/query/query-fields-match.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-fields-match.json rename to core/src/test/resources/org/elasticsearch/index/query/query-fields-match.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-fields1.json b/core/src/test/resources/org/elasticsearch/index/query/query-fields1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-fields1.json rename to core/src/test/resources/org/elasticsearch/index/query/query-fields1.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-fields2.json b/core/src/test/resources/org/elasticsearch/index/query/query-fields2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-fields2.json rename to core/src/test/resources/org/elasticsearch/index/query/query-fields2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-fields3.json b/core/src/test/resources/org/elasticsearch/index/query/query-fields3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-fields3.json rename to core/src/test/resources/org/elasticsearch/index/query/query-fields3.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-filter.json b/core/src/test/resources/org/elasticsearch/index/query/query-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/query-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-regexp-max-determinized-states.json b/core/src/test/resources/org/elasticsearch/index/query/query-regexp-max-determinized-states.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-regexp-max-determinized-states.json rename to core/src/test/resources/org/elasticsearch/index/query/query-regexp-max-determinized-states.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json b/core/src/test/resources/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json rename to core/src/test/resources/org/elasticsearch/index/query/query-regexp-too-many-determinized-states.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-timezone-incorrect.json b/core/src/test/resources/org/elasticsearch/index/query/query-timezone-incorrect.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-timezone-incorrect.json rename to core/src/test/resources/org/elasticsearch/index/query/query-timezone-incorrect.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query-timezone.json b/core/src/test/resources/org/elasticsearch/index/query/query-timezone.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query-timezone.json rename to core/src/test/resources/org/elasticsearch/index/query/query-timezone.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query.json b/core/src/test/resources/org/elasticsearch/index/query/query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query.json rename to core/src/test/resources/org/elasticsearch/index/query/query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/query2.json b/core/src/test/resources/org/elasticsearch/index/query/query2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/query2.json rename to core/src/test/resources/org/elasticsearch/index/query/query2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/range-filter-named.json b/core/src/test/resources/org/elasticsearch/index/query/range-filter-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/range-filter-named.json rename to core/src/test/resources/org/elasticsearch/index/query/range-filter-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/range-filter.json b/core/src/test/resources/org/elasticsearch/index/query/range-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/range-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/range-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/range.json b/core/src/test/resources/org/elasticsearch/index/query/range.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/range.json rename to core/src/test/resources/org/elasticsearch/index/query/range.json diff --git a/core/src/test/java/org/elasticsearch/index/query/range2.json b/core/src/test/resources/org/elasticsearch/index/query/range2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/range2.json rename to core/src/test/resources/org/elasticsearch/index/query/range2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/regexp-boost.json b/core/src/test/resources/org/elasticsearch/index/query/regexp-boost.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/regexp-boost.json rename to core/src/test/resources/org/elasticsearch/index/query/regexp-boost.json diff --git a/core/src/test/java/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json b/core/src/test/resources/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json rename to core/src/test/resources/org/elasticsearch/index/query/regexp-filter-flags-named-cached.json diff --git a/core/src/test/java/org/elasticsearch/index/query/regexp-filter-flags.json b/core/src/test/resources/org/elasticsearch/index/query/regexp-filter-flags.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/regexp-filter-flags.json rename to core/src/test/resources/org/elasticsearch/index/query/regexp-filter-flags.json diff --git a/core/src/test/java/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json b/core/src/test/resources/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json rename to core/src/test/resources/org/elasticsearch/index/query/regexp-filter-max-determinized-states.json diff --git a/core/src/test/java/org/elasticsearch/index/query/regexp-filter-named.json b/core/src/test/resources/org/elasticsearch/index/query/regexp-filter-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/regexp-filter-named.json rename to core/src/test/resources/org/elasticsearch/index/query/regexp-filter-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/regexp-filter.json b/core/src/test/resources/org/elasticsearch/index/query/regexp-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/regexp-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/regexp-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/regexp-max-determinized-states.json b/core/src/test/resources/org/elasticsearch/index/query/regexp-max-determinized-states.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/regexp-max-determinized-states.json rename to core/src/test/resources/org/elasticsearch/index/query/regexp-max-determinized-states.json diff --git a/core/src/test/java/org/elasticsearch/index/query/regexp.json b/core/src/test/resources/org/elasticsearch/index/query/regexp.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/regexp.json rename to core/src/test/resources/org/elasticsearch/index/query/regexp.json diff --git a/core/src/test/java/org/elasticsearch/index/query/simple-query-string.json b/core/src/test/resources/org/elasticsearch/index/query/simple-query-string.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/simple-query-string.json rename to core/src/test/resources/org/elasticsearch/index/query/simple-query-string.json diff --git a/core/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json b/core/src/test/resources/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json rename to core/src/test/resources/org/elasticsearch/index/query/span-multi-term-fuzzy-range.json diff --git a/core/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json b/core/src/test/resources/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json rename to core/src/test/resources/org/elasticsearch/index/query/span-multi-term-fuzzy-term.json diff --git a/core/src/test/java/org/elasticsearch/index/query/span-multi-term-prefix.json b/core/src/test/resources/org/elasticsearch/index/query/span-multi-term-prefix.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/span-multi-term-prefix.json rename to core/src/test/resources/org/elasticsearch/index/query/span-multi-term-prefix.json diff --git a/core/src/test/java/org/elasticsearch/index/query/span-multi-term-range-numeric.json b/core/src/test/resources/org/elasticsearch/index/query/span-multi-term-range-numeric.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/span-multi-term-range-numeric.json rename to core/src/test/resources/org/elasticsearch/index/query/span-multi-term-range-numeric.json diff --git a/core/src/test/java/org/elasticsearch/index/query/span-multi-term-range-term.json b/core/src/test/resources/org/elasticsearch/index/query/span-multi-term-range-term.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/span-multi-term-range-term.json rename to core/src/test/resources/org/elasticsearch/index/query/span-multi-term-range-term.json diff --git a/core/src/test/java/org/elasticsearch/index/query/span-multi-term-wildcard.json b/core/src/test/resources/org/elasticsearch/index/query/span-multi-term-wildcard.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/span-multi-term-wildcard.json rename to core/src/test/resources/org/elasticsearch/index/query/span-multi-term-wildcard.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanContaining.json b/core/src/test/resources/org/elasticsearch/index/query/spanContaining.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanContaining.json rename to core/src/test/resources/org/elasticsearch/index/query/spanContaining.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanFieldMaskingTerm.json b/core/src/test/resources/org/elasticsearch/index/query/spanFieldMaskingTerm.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanFieldMaskingTerm.json rename to core/src/test/resources/org/elasticsearch/index/query/spanFieldMaskingTerm.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanFirst.json b/core/src/test/resources/org/elasticsearch/index/query/spanFirst.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanFirst.json rename to core/src/test/resources/org/elasticsearch/index/query/spanFirst.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanNear.json b/core/src/test/resources/org/elasticsearch/index/query/spanNear.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanNear.json rename to core/src/test/resources/org/elasticsearch/index/query/spanNear.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanNot.json b/core/src/test/resources/org/elasticsearch/index/query/spanNot.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanNot.json rename to core/src/test/resources/org/elasticsearch/index/query/spanNot.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanOr.json b/core/src/test/resources/org/elasticsearch/index/query/spanOr.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanOr.json rename to core/src/test/resources/org/elasticsearch/index/query/spanOr.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanOr2.json b/core/src/test/resources/org/elasticsearch/index/query/spanOr2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanOr2.json rename to core/src/test/resources/org/elasticsearch/index/query/spanOr2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanTerm.json b/core/src/test/resources/org/elasticsearch/index/query/spanTerm.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanTerm.json rename to core/src/test/resources/org/elasticsearch/index/query/spanTerm.json diff --git a/core/src/test/java/org/elasticsearch/index/query/spanWithin.json b/core/src/test/resources/org/elasticsearch/index/query/spanWithin.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/spanWithin.json rename to core/src/test/resources/org/elasticsearch/index/query/spanWithin.json diff --git a/core/src/test/java/org/elasticsearch/index/query/starColonStar.json b/core/src/test/resources/org/elasticsearch/index/query/starColonStar.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/starColonStar.json rename to core/src/test/resources/org/elasticsearch/index/query/starColonStar.json diff --git a/core/src/test/java/org/elasticsearch/index/query/term-array-invalid.json b/core/src/test/resources/org/elasticsearch/index/query/term-array-invalid.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/term-array-invalid.json rename to core/src/test/resources/org/elasticsearch/index/query/term-array-invalid.json diff --git a/core/src/test/java/org/elasticsearch/index/query/term-filter-broken-multi-terms-2.json b/core/src/test/resources/org/elasticsearch/index/query/term-filter-broken-multi-terms-2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/term-filter-broken-multi-terms-2.json rename to core/src/test/resources/org/elasticsearch/index/query/term-filter-broken-multi-terms-2.json diff --git a/core/src/test/java/org/elasticsearch/index/query/term-filter-broken-multi-terms.json b/core/src/test/resources/org/elasticsearch/index/query/term-filter-broken-multi-terms.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/term-filter-broken-multi-terms.json rename to core/src/test/resources/org/elasticsearch/index/query/term-filter-broken-multi-terms.json diff --git a/core/src/test/java/org/elasticsearch/index/query/term-filter-named.json b/core/src/test/resources/org/elasticsearch/index/query/term-filter-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/term-filter-named.json rename to core/src/test/resources/org/elasticsearch/index/query/term-filter-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/term-filter.json b/core/src/test/resources/org/elasticsearch/index/query/term-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/term-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/term-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/term-with-boost.json b/core/src/test/resources/org/elasticsearch/index/query/term-with-boost.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/term-with-boost.json rename to core/src/test/resources/org/elasticsearch/index/query/term-with-boost.json diff --git a/core/src/test/java/org/elasticsearch/index/query/term.json b/core/src/test/resources/org/elasticsearch/index/query/term.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/term.json rename to core/src/test/resources/org/elasticsearch/index/query/term.json diff --git a/core/src/test/java/org/elasticsearch/index/query/terms-filter-named.json b/core/src/test/resources/org/elasticsearch/index/query/terms-filter-named.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/terms-filter-named.json rename to core/src/test/resources/org/elasticsearch/index/query/terms-filter-named.json diff --git a/core/src/test/java/org/elasticsearch/index/query/terms-filter.json b/core/src/test/resources/org/elasticsearch/index/query/terms-filter.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/terms-filter.json rename to core/src/test/resources/org/elasticsearch/index/query/terms-filter.json diff --git a/core/src/test/java/org/elasticsearch/index/query/terms-query-options.json b/core/src/test/resources/org/elasticsearch/index/query/terms-query-options.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/terms-query-options.json rename to core/src/test/resources/org/elasticsearch/index/query/terms-query-options.json diff --git a/core/src/test/java/org/elasticsearch/index/query/terms-query.json b/core/src/test/resources/org/elasticsearch/index/query/terms-query.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/terms-query.json rename to core/src/test/resources/org/elasticsearch/index/query/terms-query.json diff --git a/core/src/test/java/org/elasticsearch/index/query/wildcard-boost.json b/core/src/test/resources/org/elasticsearch/index/query/wildcard-boost.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/wildcard-boost.json rename to core/src/test/resources/org/elasticsearch/index/query/wildcard-boost.json diff --git a/core/src/test/java/org/elasticsearch/index/query/wildcard.json b/core/src/test/resources/org/elasticsearch/index/query/wildcard.json similarity index 100% rename from core/src/test/java/org/elasticsearch/index/query/wildcard.json rename to core/src/test/resources/org/elasticsearch/index/query/wildcard.json diff --git a/core/src/test/java/org/elasticsearch/indices/template/template0.json b/core/src/test/resources/org/elasticsearch/indices/template/template0.json similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/template0.json rename to core/src/test/resources/org/elasticsearch/indices/template/template0.json diff --git a/core/src/test/java/org/elasticsearch/indices/template/template1.json b/core/src/test/resources/org/elasticsearch/indices/template/template1.json similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/template1.json rename to core/src/test/resources/org/elasticsearch/indices/template/template1.json diff --git a/core/src/test/java/org/elasticsearch/indices/template/template2.json b/core/src/test/resources/org/elasticsearch/indices/template/template2.json similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/template2.json rename to core/src/test/resources/org/elasticsearch/indices/template/template2.json diff --git a/core/src/test/java/org/elasticsearch/indices/template/template3.json b/core/src/test/resources/org/elasticsearch/indices/template/template3.json similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/template3.json rename to core/src/test/resources/org/elasticsearch/indices/template/template3.json diff --git a/core/src/test/java/org/elasticsearch/indices/template/template4.json b/core/src/test/resources/org/elasticsearch/indices/template/template4.json similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/template4.json rename to core/src/test/resources/org/elasticsearch/indices/template/template4.json diff --git a/core/src/test/java/org/elasticsearch/indices/template/template5.json b/core/src/test/resources/org/elasticsearch/indices/template/template5.json similarity index 100% rename from core/src/test/java/org/elasticsearch/indices/template/template5.json rename to core/src/test/resources/org/elasticsearch/indices/template/template5.json diff --git a/core/src/test/java/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties b/core/src/test/resources/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties similarity index 100% rename from core/src/test/java/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties rename to core/src/test/resources/org/elasticsearch/plugins/loading/classpath/es-plugin-test.properties diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json b/core/src/test/resources/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json similarity index 100% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json rename to core/src/test/resources/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json diff --git a/core/src/test/java/org/elasticsearch/search/child/bool-query-with-empty-clauses.json b/core/src/test/resources/org/elasticsearch/search/child/bool-query-with-empty-clauses.json similarity index 100% rename from core/src/test/java/org/elasticsearch/search/child/bool-query-with-empty-clauses.json rename to core/src/test/resources/org/elasticsearch/search/child/bool-query-with-empty-clauses.json diff --git a/core/src/test/java/org/elasticsearch/search/morelikethis/items.json b/core/src/test/resources/org/elasticsearch/search/morelikethis/items.json similarity index 100% rename from core/src/test/java/org/elasticsearch/search/morelikethis/items.json rename to core/src/test/resources/org/elasticsearch/search/morelikethis/items.json diff --git a/core/src/test/java/org/elasticsearch/tribe/elasticsearch.yml b/core/src/test/resources/org/elasticsearch/tribe/elasticsearch.yml similarity index 100% rename from core/src/test/java/org/elasticsearch/tribe/elasticsearch.yml rename to core/src/test/resources/org/elasticsearch/tribe/elasticsearch.yml