From 95194961dc6ceaa3de892cdc9cc300d5b2bb805a Mon Sep 17 00:00:00 2001 From: Mohsin Husen Date: Sat, 13 Feb 2016 11:07:43 +0000 Subject: [PATCH] DATAES-211 - move groovy scripting into test folder --- .../springframework/data/elasticsearch/Utils.java | 2 +- src/test/resources/infrastructure.xml | 2 +- .../data/elasticsearch/config/namespace.xml | 2 +- .../modules/lang-groovy/groovy-all-2.4.4-indy.jar | Bin .../modules/lang-groovy/lang-groovy-2.2.0.jar | Bin .../lang-groovy/plugin-descriptor.properties | 0 .../modules/lang-groovy/plugin-security.policy | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename {test-home-dir => src/test/resources/test-home-dir}/modules/lang-groovy/groovy-all-2.4.4-indy.jar (100%) rename {test-home-dir => src/test/resources/test-home-dir}/modules/lang-groovy/lang-groovy-2.2.0.jar (100%) rename {test-home-dir => src/test/resources/test-home-dir}/modules/lang-groovy/plugin-descriptor.properties (100%) rename {test-home-dir => src/test/resources/test-home-dir}/modules/lang-groovy/plugin-security.policy (100%) diff --git a/src/test/java/org/springframework/data/elasticsearch/Utils.java b/src/test/java/org/springframework/data/elasticsearch/Utils.java index 6d56a7c6f..1dfe172a3 100644 --- a/src/test/java/org/springframework/data/elasticsearch/Utils.java +++ b/src/test/java/org/springframework/data/elasticsearch/Utils.java @@ -31,7 +31,7 @@ public class Utils { return (NodeClient) nodeBuilder().settings(Settings.builder() .put("http.enabled", "false") .put("path.data", "target/elasticsearchTestData") - .put("path.home", "test-home-dir")) + .put("path.home", "src/test/resources/test-home-dir")) .clusterName(UUID.randomUUID().toString()).local(true).node() .client(); } diff --git a/src/test/resources/infrastructure.xml b/src/test/resources/infrastructure.xml index 53b807b3b..0d6eebdda 100644 --- a/src/test/resources/infrastructure.xml +++ b/src/test/resources/infrastructure.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml b/src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml index 6d02237c9..946270894 100644 --- a/src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml +++ b/src/test/resources/org/springframework/data/elasticsearch/config/namespace.xml @@ -7,7 +7,7 @@ + path-data="target/elasticsearchTestData" path-home="src/test/resources/test-home-dir"/> diff --git a/test-home-dir/modules/lang-groovy/groovy-all-2.4.4-indy.jar b/src/test/resources/test-home-dir/modules/lang-groovy/groovy-all-2.4.4-indy.jar similarity index 100% rename from test-home-dir/modules/lang-groovy/groovy-all-2.4.4-indy.jar rename to src/test/resources/test-home-dir/modules/lang-groovy/groovy-all-2.4.4-indy.jar diff --git a/test-home-dir/modules/lang-groovy/lang-groovy-2.2.0.jar b/src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-2.2.0.jar similarity index 100% rename from test-home-dir/modules/lang-groovy/lang-groovy-2.2.0.jar rename to src/test/resources/test-home-dir/modules/lang-groovy/lang-groovy-2.2.0.jar diff --git a/test-home-dir/modules/lang-groovy/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties similarity index 100% rename from test-home-dir/modules/lang-groovy/plugin-descriptor.properties rename to src/test/resources/test-home-dir/modules/lang-groovy/plugin-descriptor.properties diff --git a/test-home-dir/modules/lang-groovy/plugin-security.policy b/src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy similarity index 100% rename from test-home-dir/modules/lang-groovy/plugin-security.policy rename to src/test/resources/test-home-dir/modules/lang-groovy/plugin-security.policy