[folder structure] installedPlugins -> plugins

.gitignore

@@ -19,7 +19,7 @@ target
 /esvm
 .htpasswd
 .eslintcache
-installedPlugins
+plugins
 disabledPlugins
 webpackstats.json
 config/kibana.dev.yml

CONTRIBUTING.md

@@ -142,7 +142,7 @@ for development and fixing individual tests.
 This should work super if you're using the [Kibana plugin generator](https://github.com/elastic/generator-kibana-plugin). If you're not using the generator, well, you're on your own. We suggest you look at how the generator works.
 
 `npm run test:dev -- --kbnServer.testsBundle.pluginId=some_special_plugin --kbnServer.plugin-path=../some_special_plugin`
-Run the tests for just your particular plugin. Assuming you plugin lives outside of the `installedPlugins directory`, which it should.
+Run the tests for just your particular plugin. Assuming you plugin lives outside of the `plugins directory`, which it should.
 
 #### Running browser automation tests:
 

src/cli/serve/serve.js

@@ -92,7 +92,7 @@ module.exports = function (program) {
     'times to specify multiple directories',
     pluginDirCollector,
     [
-      fromRoot('installedPlugins'),
+      fromRoot('plugins'),
       fromRoot('src/plugins')
     ]
   )

src/cli_plugin/install/__tests__/settings.js

@@ -70,7 +70,7 @@ describe('kibana cli', function () {
         let options = {};
         const kbnPackage = { version: 1234 };
         beforeEach(function () {
-          options = { pluginDir: fromRoot('installedPlugins') };
+          options = { pluginDir: fromRoot('plugins') };
         });
 
         describe('timeout option', function () {
@@ -143,10 +143,10 @@ describe('kibana cli', function () {
 
         describe('pluginDir option', function () {
 
-          it('should default to installedPlugins', function () {
+          it('should default to plugins', function () {
             const settings = parse(command, options, kbnPackage);
 
-            expect(settings.pluginDir).to.be(fromRoot('installedPlugins'));
+            expect(settings.pluginDir).to.be(fromRoot('plugins'));
           });
 
           it('should set settings.config property', function () {

src/cli_plugin/install/index.js

@@ -39,7 +39,7 @@ export default function pluginInstall(program) {
   .option(
     '-d, --plugin-dir <path>',
     'path to the directory where plugins are stored',
-    fromRoot('installedPlugins')
+    fromRoot('plugins')
   )
   .description('install a plugin',
 `Common examples:

src/cli_plugin/list/__tests__/settings.js

@@ -15,15 +15,15 @@ describe('kibana cli', function () {
         let command;
         const options = {};
         beforeEach(function () {
-          command = { pluginDir: fromRoot('installedPlugins') };
+          command = { pluginDir: fromRoot('plugins') };
         });
 
         describe('pluginDir option', function () {
 
-          it('should default to installedPlugins', function () {
+          it('should default to plugins', function () {
             const settings = parse(command, options);
 
-            expect(settings.pluginDir).to.be(fromRoot('installedPlugins'));
+            expect(settings.pluginDir).to.be(fromRoot('plugins'));
           });
 
           it('should set settings.config property', function () {

src/cli_plugin/list/index.js

@@ -23,7 +23,7 @@ export default function pluginList(program) {
     .option(
       '-d, --plugin-dir <path>',
       'path to the directory where plugins are stored',
-      fromRoot('installedPlugins')
+      fromRoot('plugins')
     )
     .description('list installed plugins')
     .action(processCommand);

src/cli_plugin/remove/__tests__/settings.js

@@ -16,7 +16,7 @@ describe('kibana cli', function () {
         let options = {};
         const kbnPackage = { version: 1234 };
         beforeEach(function () {
-          options = { pluginDir: fromRoot('installedPlugins') };
+          options = { pluginDir: fromRoot('plugins') };
         });
 
         describe('quiet option', function () {
@@ -72,10 +72,10 @@ describe('kibana cli', function () {
 
         describe('pluginDir option', function () {
 
-          it('should default to installedPlugins', function () {
+          it('should default to plugins', function () {
             const settings = parse(command, options, kbnPackage);
 
-            expect(settings.pluginDir).to.be(fromRoot('installedPlugins'));
+            expect(settings.pluginDir).to.be(fromRoot('plugins'));
           });
 
           it('should set settings.config property', function () {

src/cli_plugin/remove/index.js

@@ -31,7 +31,7 @@ export default function pluginRemove(program) {
   .option(
     '-d, --plugin-dir <path>',
     'path to the directory where plugins are stored',
-    fromRoot('installedPlugins')
+    fromRoot('plugins')
   )
   .description('remove a plugin',
 `common examples:

src/server/path/index.js

@@ -10,7 +10,7 @@ const CONFIG_PATHS = [
 
 const DATA_PATHS = [
   process.env.DATA_PATH,
-  fromRoot('installedPlugins/.data'),
+  fromRoot('plugins/.data'),
   '/var/lib/kibana'
 ].filter(Boolean);
 

tasks/build/index.js

@@ -9,7 +9,7 @@ module.exports = function (grunt) {
       'copy:devSource',
       'babel:build',
       '_build:babelOptions',
-      '_build:installedPlugins',
+      '_build:plugins',
       '_build:packageJson',
       '_build:readme',
       '_build:babelCache',

tasks/build/installed_plugins.js

@@ -1,6 +1,6 @@
 module.exports = function (grunt) {
-  grunt.registerTask('_build:installedPlugins', function () {
+  grunt.registerTask('_build:plugins', function () {
-    grunt.file.mkdir('build/kibana/installedPlugins');
+    grunt.file.mkdir('build/kibana/plugins');
-    grunt.file.mkdir('build/kibana/installedPlugins/.data');
+    grunt.file.mkdir('build/kibana/plugins/.data');
   });
 };

tasks/build/os_packages.js

@@ -45,7 +45,7 @@ export default (grunt) => {
         //config folder is moved to path.conf, exclude {path.home}/config
         //uses relative path to --prefix, strip the leading /
         '--exclude', `${packages.path.home.slice(1)}/config`,
-        '--exclude', `${packages.path.home.slice(1)}/installedPlugins/.data`
+        '--exclude', `${packages.path.home.slice(1)}/plugins/.data`
       ];
       const debOptions = [
         '-t', 'deb',
@@ -60,7 +60,7 @@ export default (grunt) => {
       const args = [
         `${buildDir}/=${packages.path.home}/`,
         `${buildDir}/config/=${packages.path.conf}/`,
-        `${buildDir}/installedPlugins/.data/=${packages.path.data}/`,
+        `${buildDir}/plugins/.data/=${packages.path.data}/`,
         `${servicesByName.sysv.outputDir}/etc/=/etc/`,
         `${servicesByName.systemd.outputDir}/lib/=/lib/`
       ];

tasks/config/packages.js

@@ -16,7 +16,7 @@ export default (grunt) => {
   const FOLDER_HOME = '/usr/share/kibana';
   const FOLDER_DATA = '/var/lib/kibana';
   const FOLDER_LOGS = '/var/log/kibana';
-  const FOLDER_PLUGINS = `${FOLDER_HOME}/installedPlugins`;
+  const FOLDER_PLUGINS = `${FOLDER_HOME}/plugins`;
 
   const FILE_KIBANA_CONF = `${FOLDER_CONFIG}/kibana.yml`;
   const FILE_KIBANA_BINARY = `${FOLDER_HOME}/bin/kibana`;

tasks/reject_rej_files.js

@@ -10,7 +10,7 @@ export default grunt => {
   grunt.registerTask('rejectRejFiles', 'Reject any git-apply .rej files', () => {
     const ignoredTopLevelDirs = [
       'esvm',
-      'installedPlugins',
+      'plugins',
       'node_modules',
       'optimize'
     ];