refactor plugins into sub groups

.idea/modules.xml

@@ -5,10 +5,10 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules//benchmark-micro.iml" filepath="$PROJECT_DIR$/.idea/modules//benchmark-micro.iml" />
       <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-memcached.iml" filepath="$PROJECT_DIR$/.idea/modules//plugin-memcached.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules//plugin-mapper-attachments.iml" filepath="$PROJECT_DIR$/.idea/modules//plugin-mapper-attachments.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules//plugin-transport-memcached.iml" filepath="$PROJECT_DIR$/.idea/modules//plugin-transport-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" />
     </modules>

.idea/modules/elasticsearch-root.iml

@@ -13,8 +13,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="elasticsearch" />
-    <orderEntry type="module" module-name="plugin-memcached" />
-    <orderEntry type="module" module-name="plugin-attachments" />
+    <orderEntry type="module" module-name="plugin-client-groovy" />
+    <orderEntry type="module" module-name="plugin-discovery-jgroups" />
+    <orderEntry type="module" module-name="plugin-mapper-attachments" />
+    <orderEntry type="module" module-name="plugin-transport-memcached" />
     <orderEntry type="module" module-name="test-integration" />
   </component>
 </module>

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

@@ -7,6 +7,7 @@
     <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" />
+      <excludeFolder url="file://$MODULE_DIR$/../../plugins/client/groovy/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/modules/plugin-mapper-attachments.iml

@@ -1,21 +1,21 @@
 <?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/attachments/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/../../plugins/attachments/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../../plugins/mapper/attachments/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/../../plugins/mapper/attachments/build/classes/test" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../plugins/attachments">
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/attachments/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/attachments/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../plugins/attachments/build" />
+    <content url="file://$MODULE_DIR$/../../plugins/mapper/attachments">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/mapper/attachments/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/mapper/attachments/src/test/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/../../plugins/mapper/attachments/src/test/java" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="elasticsearch" />
     <orderEntry type="library" name="tika" level="project" />
+    <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>
 

.idea/modules/plugin-transport-memcached.iml

@@ -1,21 +1,21 @@
 <?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/memcached/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/../../plugins/memcached/build/classes/test" />
+    <output url="file://$MODULE_DIR$/../../plugins/transport/memcached/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/../../plugins/transport/memcached/build/classes/test" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../plugins/memcached">
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/memcached/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/memcached/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../plugins/memcached/build" />
+    <content url="file://$MODULE_DIR$/../../plugins/transport/memcached">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/transport/memcached/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/transport/memcached/src/test/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/../../plugins/transport/memcached/src/test/java" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="elasticsearch" />
-    <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" />
     <orderEntry type="library" scope="TEST" name="spymemcached" level="project" />
+    <orderEntry type="module" module-name="test-testng" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="hamcrest" level="project" />
+    <orderEntry type="library" scope="TEST" name="testng" level="project" />
   </component>
 </module>
 

build.gradle

@@ -92,7 +92,7 @@ task zip(type: Zip, dependsOn: ['explodedDist']) {
     }
 }
 
-task release(dependsOn: [zip, ":plugins-attachments:release"]) << {
+task release(dependsOn: [zip]) << {
     ant.delete(dir: explodedDistDir)
 }
 

plugins/client/groovy/build.gradle

@@ -7,7 +7,7 @@ archivesBaseName = "elasticsearch-client-groovy"
 
 explodedDistDir = new File(distsDir, 'exploded')
 
-manifest.mainAttributes("Implementation-Title": "ElasticSearch::Plugins::Groovy", "Implementation-Version": rootProject.version, "Implementation-Date": buildTimeStr)
+manifest.mainAttributes("Implementation-Title": "ElasticSearch::Plugins::Client::Groovy", "Implementation-Version": rootProject.version, "Implementation-Date": buildTimeStr)
 
 configurations.compile.transitive = true
 configurations.testCompile.transitive = true

plugins/discovery/jgroups/src/main/java/es-plugin.properties

@@ -0,0 +1 @@
+plugin=org.elasticsearch.plugin.jgroups.JgroupsPlugin

plugins/discovery/jgroups/src/main/java/org/elasticsearch/plugin/jgroups/JgroupsPlugin.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elastic Search and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Elastic Search licenses this
+ * file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.plugin.jgroups;
+
+import org.elasticsearch.plugins.AbstractPlugin;
+
+/**
+ * @author kimchy (shay.banon)
+ */
+public class JgroupsPlugin extends AbstractPlugin {
+
+    @Override public String name() {
+        return "discovery-plugin";
+    }
+
+    @Override public String description() {
+        return "Adds jgroups as a discovery type";
+    }
+}

plugins/mapper/attachments/build.gradle

@@ -3,11 +3,11 @@ dependsOn(':elasticsearch')
 apply plugin: 'java'
 apply plugin: 'maven'
 
-archivesBaseName = "elasticsearch-attachments"
+archivesBaseName = "elasticsearch-mapper-attachments"
 
 explodedDistDir = new File(distsDir, 'exploded')
 
-manifest.mainAttributes("Implementation-Title": "ElasticSearch::Plugins::Attachments", "Implementation-Version": rootProject.version, "Implementation-Date": buildTimeStr)
+manifest.mainAttributes("Implementation-Title": "ElasticSearch::Plugins::Mapper::Attachments", "Implementation-Version": rootProject.version, "Implementation-Date": buildTimeStr)
 
 configurations.compile.transitive = true
 configurations.testCompile.transitive = true

plugins/mapper/attachments/src/main/java/org/elasticsearch/plugin/attachments/AttachmentsPlugin.java

@@ -32,7 +32,7 @@ import static com.google.common.collect.Lists.*;
 public class AttachmentsPlugin extends AbstractPlugin {
 
     @Override public String name() {
-        return "attachments";
+        return "mapper-attachments";
     }
 
     @Override public String description() {

plugins/transport/memcached/build.gradle

@@ -3,7 +3,7 @@ dependsOn(':elasticsearch')
 apply plugin: 'java'
 apply plugin: 'maven'
 
-archivesBaseName = "elasticsearch-memcached"
+archivesBaseName = "elasticsearch-transport-memcached"
 
 explodedDistDir = new File(distsDir, 'exploded')
 

plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/MemcachedPlugin.java

@@ -40,7 +40,7 @@ public class MemcachedPlugin extends AbstractPlugin {
     }
 
     @Override public String name() {
-        return "memcached";
+        return "transport-memcached";
     }
 
     @Override public String description() {

settings.gradle

@@ -6,9 +6,9 @@ include 'test-integration'
 
 include 'benchmark-micro'
 
-include 'plugins-attachments'
+include 'plugins-mapper-attachments'
 include 'plugins-client-groovy'
-include 'plugins-memcached'
+include 'plugins-transport-memcached'
 include 'plugins-discovery-jgroups'
 
 rootProject.name = 'elasticsearch-root'