From 3a8126f1024d071302d751d17c226ce4dc0cc6e3 Mon Sep 17 00:00:00 2001
From: Mikhail Sobolev <mss@mawhrin.net>
Date: Tue, 22 Jul 2014 13:41:22 +0300
Subject: [PATCH] introduce 'util' category of plugins

* this will help to make master.cfg files that only use core functinality to
  look much simpler
---
 master/buildbot/plugins/__init__.py |  3 +-
 master/setup.py                     | 47 ++++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/master/buildbot/plugins/__init__.py b/master/buildbot/plugins/__init__.py
index 34b606b7ff5..41b2ec816c6 100644
--- a/master/buildbot/plugins/__init__.py
+++ b/master/buildbot/plugins/__init__.py
@@ -25,7 +25,7 @@
 from buildbot.interfaces import IStatusReceiver
 
 
-__all__ = ['changes', 'schedulers', 'buildslave', 'steps', 'status']
+__all__ = ['changes', 'schedulers', 'buildslave', 'steps', 'status', 'util']
 
 
 # Names here match the names of the corresponding Buildbot module, hence
@@ -35,3 +35,4 @@
 buildslave = get_plugins('build_slave', IBuildSlave)
 steps = get_plugins('step', IBuildStep)
 status = get_plugins('status', IStatusReceiver)
+util = get_plugins('util', None)
diff --git a/master/setup.py b/master/setup.py
index 544c08ae049..78ce8db98d0 100755
--- a/master/setup.py
+++ b/master/setup.py
@@ -291,13 +291,52 @@ def define_plugin_entries(groups):
             ('buildbot.status.github', ['GitHubStatus'])
         ]),
         ('buildbot.util', [
-            ('buildbot.process.factory', [
-                'BuildFactory', 'GNUAutoconf', 'CPAN', 'Distutils', 'Trial',
-                'BasicBuildFactory', 'QuickBuildFactory', 'BasicSVN']),
+            # Connection seems to be a way too generic name, though
+            ('buildbot.buildslave.libvirt', ['Connection']),
             ('buildbot.changes.filter', ['ChangeFilter']),
+            ('buildbot.changes.gerritchangesource', ['GerritChangeFilter']),
+            ('buildbot.changes.svnpoller', [
+                ('svn.split_file_projects_branches',
+                 'split_file_projects_branches'),
+                ('svn.split_file_branches', 'split_file_branches'),
+                ('svn.split_file_alwaystrunk', 'split_file_alwaystrunk')]),
             ('buildbot.config', ['BuilderConfig']),
             ('buildbot.locks', ['MasterLock', 'SlaveLock']),
-            ('buildbot.steps.shellsequence', ['ShellArg'])
+            ('buildbot.manhole', [
+                'AuthorizedKeysManhole', 'PasswordManhole', 'TelnetManhole']),
+            ('buildbot.process.builder', ['enforceChosenSlave']),
+            ('buildbot.process.factory', [
+                'BuildFactory', 'GNUAutoconf', 'CPAN', 'Distutils', 'Trial',
+                'BasicBuildFactory', 'QuickBuildFactory', 'BasicSVN']),
+            ('buildbot.process.logobserver', ['LogLineObserver']),
+            ('buildbot.process.properties', [
+                'FlattenList', 'Interpolate', 'Property', 'WithProperties',
+                'renderer']),
+            ('buildbot.process.properties', [
+                'CommandlineUserManager']),
+            ('buildbot.revlinks', ['RevlinkMatch']),
+            ('buildbot.schedulers.forcesched', [
+                'AnyPropertyParameter', 'BooleanParameter',
+                'BuildslaveChoiceParameter', 'ChoiceStringParameter',
+                'CodebaseParameter', 'FixedParameter', 'InheritBuildParameter',
+                'IntParameter', 'NestedParameter', 'ParameterGroup',
+                'StringParameter', 'TextParameter', 'UserNameParameter']),
+            ('buildbot.status.results', [
+                'Results', 'SUCCESS', 'WARNINGS', 'FAILURE', 'SKIPPED',
+                'EXCEPTION', 'RETRY', 'CANCELLED']),
+            ('buildbot.steps.mtrlogobserver', ['EqConnectionPool']),
+            ('buildbot.steps.source.repo', [
+                ('repo.DownloadsFromChangeSource',
+                 'RepoDownloadsFromChangeSource'),
+                ('repo.DownloadsFromProperties',
+                 'RepoDownloadsFromProperties')]),
+            ('buildbot.steps.shellsequence', ['ShellArg']),
+            ('buildbot.www.avatar', ['AvatarGravatar']),
+            ('buildbot.www.auth', [
+                'UserPasswordAuth', 'HTPasswdAuth', 'RemoteUserAuth']),
+            ('buildbot.www.ldapuserinfos', ['LdapUserInfo']),
+            ('buildbot.www.oauth2', [
+                'GoogleAuth', 'GitHubAuth'])
         ])
     ])
 }