honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13385 from rjernst/wrong_resources 

Move resources to their proper location
This commit is contained in:
Ryan Ernst 2015-09-08 13:25:31 -07:00
parent 164cf2775f 6b88093f78
commit 4914b0c465
241 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/pom.xml
View File

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

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

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

1
core/src/test/java/org/elasticsearch/common/io/rootdir.properties
View File

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

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

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

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

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

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

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

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

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

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

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

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

0
core/src/test/java/org/elasticsearch/action/percolate/mpercolate1.json → core/src/test/resources/org/elasticsearch/action/percolate/mpercolate1.json
View File

0
core/src/test/java/org/elasticsearch/action/percolate/mpercolate2.json → core/src/test/resources/org/elasticsearch/action/percolate/mpercolate2.json
View File

0
core/src/test/java/org/elasticsearch/action/termvectors/multiRequest1.json → core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest1.json
View File

0
core/src/test/java/org/elasticsearch/action/termvectors/multiRequest2.json → core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest2.json
View File

0
core/src/test/java/org/elasticsearch/action/termvectors/multiRequest3.json → core/src/test/resources/org/elasticsearch/action/termvectors/multiRequest3.json
View File

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

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

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

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

0
core/src/test/java/org/elasticsearch/index/analysis/cjk_analysis.json → core/src/test/resources/org/elasticsearch/index/analysis/cjk_analysis.json
View File

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

0
core/src/test/java/org/elasticsearch/index/analysis/commongrams/commongrams.json → core/src/test/resources/org/elasticsearch/index/analysis/commongrams/commongrams.json
View File

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

0
core/src/test/java/org/elasticsearch/index/analysis/keep_analysis.json → core/src/test/resources/org/elasticsearch/index/analysis/keep_analysis.json
View File

0
core/src/test/java/org/elasticsearch/index/analysis/pattern_capture.json → core/src/test/resources/org/elasticsearch/index/analysis/pattern_capture.json
View File

0
core/src/test/java/org/elasticsearch/index/analysis/shingle_analysis.json → core/src/test/resources/org/elasticsearch/index/analysis/shingle_analysis.json
View File

0
core/src/test/java/org/elasticsearch/index/analysis/stop.json → core/src/test/resources/org/elasticsearch/index/analysis/stop.json
View File

0
core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.json → core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.json
View File

0
core/src/test/java/org/elasticsearch/index/analysis/synonyms/synonyms.txt → core/src/test/resources/org/elasticsearch/index/analysis/synonyms/synonyms.txt
View File

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

0
core/src/test/java/org/elasticsearch/index/analysis/test1.json → core/src/test/resources/org/elasticsearch/index/analysis/test1.json
View File

0
core/src/test/java/org/elasticsearch/index/analysis/test1.yml → core/src/test/resources/org/elasticsearch/index/analysis/test1.yml
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

0
core/src/test/java/org/elasticsearch/index/query/bool.json → core/src/test/resources/org/elasticsearch/index/query/bool.json
View File

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

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

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

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

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

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

0
core/src/test/java/org/elasticsearch/index/query/data.json → core/src/test/resources/org/elasticsearch/index/query/data.json
View File

0
core/src/test/java/org/elasticsearch/index/query/date_range_filter_format.json → core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format.json
View File

0
core/src/test/java/org/elasticsearch/index/query/date_range_filter_format_invalid.json → core/src/test/resources/org/elasticsearch/index/query/date_range_filter_format_invalid.json
View File

0
core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone.json → core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone.json
View File

0
core/src/test/java/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json → core/src/test/resources/org/elasticsearch/index/query/date_range_filter_timezone_numeric_field.json
View File

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