move client-groovy to an updated location

.idea/modules.xml

@@ -6,8 +6,8 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/elasticsearch.iml" filepath="$PROJECT_DIR$/.idea/modules/elasticsearch.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/elasticsearch-root.iml" filepath="$PROJECT_DIR$/.idea/modules/elasticsearch-root.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules//plugin-attachments.iml" filepath="$PROJECT_DIR$/.idea/modules//plugin-attachments.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules//plugin-client-groovy.iml" filepath="$PROJECT_DIR$/.idea/modules//plugin-client-groovy.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules//plugin-discovery-jgroups.iml" filepath="$PROJECT_DIR$/.idea/modules//plugin-discovery-jgroups.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules//plugin-groovy.iml" filepath="$PROJECT_DIR$/.idea/modules//plugin-groovy.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules//plugin-memcached.iml" filepath="$PROJECT_DIR$/.idea/modules//plugin-memcached.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules//test-integration.iml" filepath="$PROJECT_DIR$/.idea/modules//test-integration.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules//test-testng.iml" filepath="$PROJECT_DIR$/.idea/modules//test-testng.iml" />

.idea/modules/plugin-client-groovy.iml

@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../plugins/groovy/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/../../plugins/groovy/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../../plugins/client/groovy/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/../../plugins/client/groovy/build/classes/test" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../plugins/groovy">
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/groovy/src/main/groovy" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/groovy/src/test/groovy" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../plugins/groovy/build" />
+    <content url="file://$MODULE_DIR$/../../plugins/client/groovy">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/client/groovy/src/main/groovy" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/client/groovy/src/test/groovy" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="groovy-1.7.2" level="application" />
     <orderEntry type="module" module-name="elasticsearch" />
+    <orderEntry type="module" module-name="test-testng" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="testng" level="project" />
     <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
-    <orderEntry type="module" module-name="test-testng" scope="TEST" />
   </component>
 </module>
 

plugins/client/groovy/build.gradle

@@ -3,7 +3,7 @@ dependsOn(':elasticsearch')
 apply plugin: 'groovy'
 apply plugin: 'maven'
 
-archivesBaseName = "elasticsearch-groovy"
+archivesBaseName = "elasticsearch-client-groovy"
 
 explodedDistDir = new File(distsDir, 'exploded')
 
@@ -115,7 +115,7 @@ uploadArchives {
 
         pom.project {
             inceptionYear '2009'
-            name 'elasticsearch-plugins-groovy'
+            name 'elasticsearch-plugins-client--groovy'
             description 'Groovy Plugin for ElasticSearch'
             licenses {
                 license {

plugins/client/groovy/src/main/groovy/org/elasticsearch/groovy/node/GNode.groovy

@@ -60,7 +60,7 @@ class GNode {
     }
 
     /**
-     * Closes the node (and   {@link #stop}  s if its running).
+     * Closes the node (and    {@link #stop}   s if its running).
      */
     def close() {
         node.close()

plugins/client/groovy/src/main/groovy/org/elasticsearch/groovy/node/GNodeBuilder.groovy

@@ -26,7 +26,7 @@ import org.elasticsearch.util.settings.ImmutableSettings
 import org.elasticsearch.util.settings.loader.JsonSettingsLoader
 
 /**
- * The node builder allow to build a  {@link GNode}  instance.
+ * The node builder allow to build a   {@link GNode}   instance.
  *
  * @author kimchy (shay.banon)
  */

settings.gradle

@@ -7,7 +7,7 @@ include 'test-integration'
 include 'benchmark-micro'
 
 include 'plugins-attachments'
-include 'plugins-groovy'
+include 'plugins-client-groovy'
 include 'plugins-memcached'
 include 'plugins-discovery-jgroups'