Renamed all references to 'ipa_server' to 'ipaserver'

13 files changed, 31 insertions, 31 deletions

diff --git a/ipa_server/context.py b/ipa_server/context.py
index 2929fc957..15dd7d908 100644
--- a/ipa_server/context.py
+++ b/ipa_server/context.py
@@ -21,7 +21,7 @@
 # a new instance to be created in the same thread
 
 # To use:
-#  from ipa_server.context import context
+#  from ipaserver.context import context
 #  context.foo = "bar"
 
 # FIXME: This module is depreciated and code should switch to using
diff --git a/ipa_server/ipaldap.py b/ipa_server/ipaldap.py
index f520475e5..19fd40efd 100644
--- a/ipa_server/ipaldap.py
+++ b/ipa_server/ipaldap.py
@@ -31,7 +31,7 @@ import struct
 import ldap.sasl
 from ldap.controls import LDAPControl,DecodeControlTuples,EncodeControlTuples
 from ldap.ldapobject import SimpleLDAPObject
-from ipa_server import ipautil
+from ipaserver import ipautil
 from ipalib import errors
 
 # Global variable to define SASL auth
diff --git a/ipa_server/mod_python_xmlrpc.py b/ipa_server/mod_python_xmlrpc.py
index 450f4a514..9a2960f93 100644
--- a/ipa_server/mod_python_xmlrpc.py
+++ b/ipa_server/mod_python_xmlrpc.py
@@ -43,9 +43,9 @@ import logging
 import ldap
 from ipalib import api
 from ipalib import config
-from ipa_server import conn
-from ipa_server.servercore import context
-from ipa_server.servercore import ipautil
+from ipaserver import conn
+from ipaserver.servercore import context
+from ipaserver.servercore import ipautil
 from ipalib.util import xmlrpc_unmarshal
 
 import string
diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py
index 8042474f1..071bf52eb 100644
--- a/ipa_server/plugins/b_ldap.py
+++ b/ipa_server/plugins/b_ldap.py
@@ -28,8 +28,8 @@ import ldap as _ldap
 from ipalib import api, Context
 from ipalib import errors
 from ipalib.crud import CrudBackend
-from ipa_server import servercore
-from ipa_server import ipaldap
+from ipaserver import servercore
+from ipaserver import ipaldap
 
 
 class conn(Context):
diff --git a/ipa_server/plugins/b_ra.py b/ipa_server/plugins/b_ra.py
index b60983102..bf119b810 100644
--- a/ipa_server/plugins/b_ra.py
+++ b/ipa_server/plugins/b_ra.py
@@ -39,8 +39,8 @@ from socket import gethostname
 
 from ipalib import api, Backend
 from ipalib import errors
-from ipa_server import servercore
-from ipa_server import ipaldap
+from ipaserver import servercore
+from ipaserver import ipaldap
 
 
 class ra(Backend):
@@ -195,13 +195,13 @@ class ra(Backend):
         revocationr reasons: 0 - unspecified
                              1 - key compromise
                              2 - ca compromise
-                             3 - affiliation changed 
+                             3 - affiliation changed
                              4 - superseded
                              5 - cessation of operation
-                             6 - certificate hold 
+                             6 - certificate hold
                              7 - value 7 is not used
                              8 - remove from CRL
-                             9 - privilege withdrawn 
+                             9 - privilege withdrawn
                             10 - aa compromise
         see RFC 5280 for more details
         """
diff --git a/ipa_server/servercore.py b/ipa_server/servercore.py
index 1f7603f19..6991989e5 100644
--- a/ipa_server/servercore.py
+++ b/ipa_server/servercore.py
@@ -20,8 +20,8 @@
 import ldap
 import string
 import re
-from ipa_server.context import context
-from ipa_server import ipaldap
+from ipaserver.context import context
+from ipaserver import ipaldap
 import ipautil
 from ipalib import errors
 from ipalib import api
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index e30b7fed6..e1ef09c1d 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -31,7 +31,7 @@ heavily cross-referenced with further documentation that (hopefully) fills
 in the missing details.
 
 In addition to this tutorial, the many built-in plugins in `ipalib.plugins`
-and `ipa_server.plugins` provide real-life examples of how to write good
+and `ipaserver.plugins` provide real-life examples of how to write good
 plugins.
 
 
@@ -227,12 +227,12 @@ There are two types of plugins:
 
     2. *Backend plugins* - These are only loaded in a *server* context and
        only need to be installed on the IPA server.  The built-in backend
-       plugins can be found in `ipa_server.plugins`.
+       plugins can be found in `ipaserver.plugins`.
 
 Backend plugins should provide a set of methods that standardize how IPA
 interacts with some external system or library.  For example, all interaction
 with LDAP is done through the ``ldap`` backend plugin defined in
-`ipa_server.plugins.b_ldap`.  As a good rule of thumb, anytime you need to
+`ipaserver.plugins.b_ldap`.  As a good rule of thumb, anytime you need to
 import some package that is not part of the Python standard library, you
 should probably interact with that package via a corresponding backend
 plugin you implement.
@@ -824,7 +824,7 @@ To learn more about writing freeIPA plugins, you should:
 
     1. Look at some of the built-in plugins, like the frontend plugins in
        `ipalib.plugins.f_user` and the backend plugins in
-       `ipa_server.plugins.b_ldap`.
+       `ipaserver.plugins.b_ldap`.
 
     2. Learn about the base classes for frontend plugins in `ipalib.frontend`.
 
diff --git a/ipalib/cli.py b/ipalib/cli.py
index f4cdbbf57..442e5061a 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -763,8 +763,8 @@ class CLI(object):
 #            try:
 #                import krbV
 #                import ldap
-#                from ipa_server import conn
-#                from ipa_server.servercore import context
+#                from ipaserver import conn
+#                from ipaserver.servercore import context
 #                krbccache =  krbV.default_context().default_ccache().name
 #                context.conn = conn.IPAConn(self.api.env.ldaphost, self.api.env.ldapport, krbccache)
 #            except ImportError:
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index d4ec8749b..b52db9008 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -639,7 +639,7 @@ class API(DictProxy):
             return
         util.import_plugins_subpackage('ipalib')
         if self.env.in_server:
-            util.import_plugins_subpackage('ipa_server')
+            util.import_plugins_subpackage('ipaserver')
 
     def finalize(self):
         """
diff --git a/lite-xmlrpc.py b/lite-xmlrpc.py
index 3b04bc3f6..ee03adae7 100755
--- a/lite-xmlrpc.py
+++ b/lite-xmlrpc.py
@@ -32,8 +32,8 @@ import threading
 import commands
 from ipalib import api
 from ipalib import config
-from ipa_server import conn
-from ipa_server.servercore import context
+from ipaserver import conn
+from ipaserver.servercore import context
 from ipalib.util import xmlrpc_unmarshal
 import traceback
 import krbV
diff --git a/setup.py b/setup.py
index b9e1454c8..ee12af7ff 100755
--- a/setup.py
+++ b/setup.py
@@ -33,8 +33,8 @@ setup(
     packages=[
         'ipalib',
         'ipalib.plugins',
-        'ipa_server',
-        'ipa_server.plugins',
+        'ipaserver',
+        'ipaserver.plugins',
         'ipa_webui',
         'ipa_webui.templates',
     ],
diff --git a/tests/test_ipa_server/__init__.py b/tests/test_ipa_server/__init__.py
index 5cf883dbd..56a6c533c 100644
--- a/tests/test_ipa_server/__init__.py
+++ b/tests/test_ipa_server/__init__.py
@@ -18,5 +18,5 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 """
-Sub-package containing unit tests for `ipa_server` package.
+Sub-package containing unit tests for `ipaserver` package.
 """
diff --git a/tests/test_ipa_server/test_rpc.py b/tests/test_ipa_server/test_rpc.py
index 9c6cf23a3..07191fda1 100644
--- a/tests/test_ipa_server/test_rpc.py
+++ b/tests/test_ipa_server/test_rpc.py
@@ -18,18 +18,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 """
-Test the `ipa_server.rpc` module.
+Test the `ipaserver.rpc` module.
 """
 
 from tests.util import create_test_api, raises, PluginTester
 from tests.data import unicode_str
 from ipalib import errors, Command
-from ipa_server import rpc
+from ipaserver import rpc
 
 
 def test_params_2_args_options():
     """
-    Test the `ipa_server.rpc.params_2_args_options` function.
+    Test the `ipaserver.rpc.params_2_args_options` function.
     """
     f = rpc.params_2_args_options
     args = ('Hello', u'world!')
@@ -43,14 +43,14 @@ def test_params_2_args_options():
 
 class test_xmlrpc(PluginTester):
     """
-    Test the `ipa_server.rpc.xmlrpc` plugin.
+    Test the `ipaserver.rpc.xmlrpc` plugin.
     """
 
     _plugin = rpc.xmlrpc
 
     def test_dispatch(self):
         """
-        Test the `ipa_server.rpc.xmlrpc.dispatch` method.
+        Test the `ipaserver.rpc.xmlrpc.dispatch` method.
         """
         (o, api, home) = self.instance('Backend', in_server=True)
         e = raises(errors.CommandError, o.dispatch, 'echo', tuple())