DATAES-211 - move groovy scripting into test folder

PiscesXP · Feb 24, 2016 · 9519496 · 9519496
1 parent 6a2b5fd
commit 9519496
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 deletions.
diff --git 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 static NodeClient getNodeClient() {
 		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
@@ -6,7 +6,7 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <elasticsearch:node-client id="client" local="true" cluster-name="#{T(java.util.UUID).randomUUID().toString()}"
-                               http-enabled="false" path-data="target/elasticsearchTestData" path-home="test-home-dir"
+                               http-enabled="false" path-data="target/elasticsearchTestData" path-home="src/test/resources/test-home-dir"
                                path-configuration="node-client-configuration.yml"/>
 
     <!--<elasticsearch:transport-client id="client" cluster-name="elasticsearch" cluster-nodes="127.0.0.1:9300" />-->

diff --git 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 @@
 
     <elasticsearch:node-client id="client" local="true"
                                cluster-name="#{T(java.util.UUID).randomUUID().toString()}" http-enabled="false"
-                               path-data="target/elasticsearchTestData" path-home="test-home-dir"/>
+                               path-data="target/elasticsearchTestData" path-home="src/test/resources/test-home-dir"/>
 
     <bean name="elasticsearchTemplate"
           class="org.springframework.data.elasticsearch.core.ElasticsearchTemplate">

diff --git a/...les/lang-groovy/groovy-all-2.4.4-indy.jar → ...les/lang-groovy/groovy-all-2.4.4-indy.jar b/...les/lang-groovy/groovy-all-2.4.4-indy.jar → ...les/lang-groovy/groovy-all-2.4.4-indy.jar
diff --git a/...modules/lang-groovy/lang-groovy-2.2.0.jar → ...modules/lang-groovy/lang-groovy-2.2.0.jar b/...modules/lang-groovy/lang-groovy-2.2.0.jar → ...modules/lang-groovy/lang-groovy-2.2.0.jar
diff --git a/.../lang-groovy/plugin-descriptor.properties → .../lang-groovy/plugin-descriptor.properties b/.../lang-groovy/plugin-descriptor.properties → .../lang-groovy/plugin-descriptor.properties
diff --git a/...odules/lang-groovy/plugin-security.policy → ...odules/lang-groovy/plugin-security.policy b/...odules/lang-groovy/plugin-security.policy → ...odules/lang-groovy/plugin-security.policy