From 113a026e1f52ee3e1b387d72ab98cdaacdc223e1 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Mon, 23 Nov 2015 14:44:37 -0800
Subject: [PATCH] Change extra plugins to x-plugins directory instead of
 extra-plugin- prefix

---
 settings.gradle | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 91dc2f472bf..fd16d9ff20f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -65,18 +65,18 @@ void addSubProjects(String path, File dir) {
   if (new File(dir, 'build.gradle').exists() == false) return;
 
   include path
-  project(path).projectDir = dir
-
   for (File subdir : dir.listFiles()) {
     addSubProjects("${path}:${subdir.name}", subdir)
   }
 }
 
-// look for sibling projects with the prefix "extra-plugin-"
-File siblings = rootProject.projectDir.parentFile
-for (File extraPluginDir : siblings.listFiles()) {
-  if (extraPluginDir.name.startsWith('extra-plugin-') == false) continue;
-  String path = ":${extraPluginDir.name.substring('extra-plugin-'.size())}"
-  addSubProjects(path, extraPluginDir)
+// look for extra plugins for elasticsearch
+File xplugins = new File(rootProject.projectDir.parentFile, 'x-plugins')
+if (xplugins.exists()) {
+  include ':x-plugins'
+  project(':x-plugins').projectDir = xplugins
+  for (File extraPluginDir : xplugins.listFiles()) {
+    addSubProjects(':x-plugins', extraPluginDir)
+  }
 }