From 785148ad07582e321898aa8767da48e42259650d Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jbjohnso@us.ibm.com>
Date: Tue, 6 May 2014 10:48:29 -0400
Subject: [PATCH] Rename pluginapi module to be more indicative of what the
 module represents

---
 confluent/consoleserver.py          | 2 +-
 confluent/{pluginapi.py => core.py} | 0
 confluent/httpapi.py                | 2 +-
 confluent/main.py                   | 4 ++--
 confluent/sockapi.py                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename confluent/{pluginapi.py => core.py} (100%)

diff --git a/confluent/consoleserver.py b/confluent/consoleserver.py
index b863aac1..358986f8 100644
--- a/confluent/consoleserver.py
+++ b/confluent/consoleserver.py
@@ -25,7 +25,7 @@ import confluent.config.configmanager as configmodule
 import confluent.exceptions as exc
 import confluent.interface.console as conapi
 import confluent.log as log
-import confluent.pluginapi as plugin
+import confluent.core as plugin
 import eventlet
 import eventlet.green.threading as threading
 import random
diff --git a/confluent/pluginapi.py b/confluent/core.py
similarity index 100%
rename from confluent/pluginapi.py
rename to confluent/core.py
diff --git a/confluent/httpapi.py b/confluent/httpapi.py
index 1d485608..ad243d4b 100644
--- a/confluent/httpapi.py
+++ b/confluent/httpapi.py
@@ -24,7 +24,7 @@ import confluent.consoleserver as consoleserver
 import confluent.exceptions as exc
 import confluent.log as log
 import confluent.messages
-import confluent.pluginapi as pluginapi
+import confluent.core as pluginapi
 import confluent.util as util
 import copy
 import eventlet
diff --git a/confluent/main.py b/confluent/main.py
index bb00aff3..e99d58a0 100644
--- a/confluent/main.py
+++ b/confluent/main.py
@@ -27,7 +27,7 @@
 import atexit
 import confluent.auth as auth
 import confluent.consoleserver as consoleserver
-import confluent.pluginapi as pluginapi
+import confluent.core as confluentcore
 import confluent.httpapi as httpapi
 import confluent.log as log
 import confluent.sockapi as sockapi
@@ -109,7 +109,7 @@ def doexit():
 
 def run():
     _checkpidfile()
-    pluginapi.load_plugins()
+    confluentcore.load_plugins()
     _daemonize()
     _updatepidfile()
     auth.init_auth()
diff --git a/confluent/sockapi.py b/confluent/sockapi.py
index 6e5150f3..2d490f9f 100644
--- a/confluent/sockapi.py
+++ b/confluent/sockapi.py
@@ -35,7 +35,7 @@ import confluent.consoleserver as consoleserver
 import confluent.config.configmanager as configmanager
 import confluent.exceptions as exc
 import confluent.log as log
-import confluent.pluginapi as pluginapi
+import confluent.core as pluginapi
 
 
 tracelog = None