Renamed all references to 'ipa_webui' to 'ipawebui'

6 files changed, 15 insertions, 15 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index b837c54ca..f7a626160 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include LICENSE TODO lite-webui.py lite-xmlrpc.py
 graft tests/
-graft ipa_webui/static/
-include ipa_webui/templates/*.kid
+graft ipawebui/static/
+include ipawebui/templates/*.kid
diff --git a/lite-webui.py b/lite-webui.py
index e75e5d9d5..74f6e0f70 100755
--- a/lite-webui.py
+++ b/lite-webui.py
@@ -24,8 +24,8 @@ In-tree Web UI using cherrypy.
 """
 
 from cherrypy import expose, config, quickstart
-from ipa_webui.templates import form, main
-from ipa_webui import controller
+from ipawebui.templates import form, main
+from ipawebui import controller
 from ipalib import api
 
 api.load_plugins()
diff --git a/make-doc b/make-doc
index 1c50d2c84..a9376e8a7 100755
--- a/make-doc
+++ b/make-doc
@@ -2,7 +2,7 @@
 
 # Hackish script to generate documentation using epydoc
 
-sources="ipalib ipa_server ipa_webui tests lite-xmlrpc.py lite-webui.py"
+sources="ipalib ipaserver ipawebui tests"
 out="./freeipa2-dev-doc"
 
 init="./ipalib/__init__.py"
diff --git a/setup.py b/setup.py
index ee12af7ff..ad903748a 100755
--- a/setup.py
+++ b/setup.py
@@ -35,12 +35,12 @@ setup(
         'ipalib.plugins',
         'ipaserver',
         'ipaserver.plugins',
-        'ipa_webui',
-        'ipa_webui.templates',
+        'ipawebui',
+        'ipawebui.templates',
     ],
     package_data={
-        'ipa_webui.templates': ['*.kid'],
-        'ipa_webui': ['static/*'],
+        'ipawebui.templates': ['*.kid'],
+        'ipawebui': ['static/*'],
     },
     scripts=['ipa'],
 )
diff --git a/tests/test_ipa_webui/__init__.py b/tests/test_ipa_webui/__init__.py
index 29fa0cd0d..f739a8563 100644
--- a/tests/test_ipa_webui/__init__.py
+++ b/tests/test_ipa_webui/__init__.py
@@ -17,5 +17,5 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 """
-Sub-package containing unit tests for `ipa_webui` package.
+Sub-package containing unit tests for `ipawebui` package.
 """
diff --git a/tests/test_ipa_webui/test_controllers.py b/tests/test_ipa_webui/test_controllers.py
index f5944dd9e..e236d1a0b 100644
--- a/tests/test_ipa_webui/test_controllers.py
+++ b/tests/test_ipa_webui/test_controllers.py
@@ -17,10 +17,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 """
-Test the `ipa_webui.controller` module.
+Test the `ipawebui.controller` module.
 """
 
-from ipa_webui import controller
+from ipawebui import controller
 
 
 
@@ -31,7 +31,7 @@ class test_Controller(object):
 
     def test_init(self):
         """
-        Test the `ipa_webui.controller.Controller.__init__()` method.
+        Test the `ipawebui.controller.Controller.__init__()` method.
         """
         o = controller.Controller()
         assert o.template is None
@@ -41,7 +41,7 @@ class test_Controller(object):
 
     def test_output_xhtml(self):
         """
-        Test the `ipa_webui.controller.Controller.output_xhtml` method.
+        Test the `ipawebui.controller.Controller.output_xhtml` method.
         """
         class Template(object):
             def __init__(self):
@@ -61,7 +61,7 @@ class test_Controller(object):
 
     def test_output_json(self):
         """
-        Test the `ipa_webui.controller.Controller.output_json` method.
+        Test the `ipawebui.controller.Controller.output_json` method.
         """
         o = controller.Controller()
         assert o.output_json() == '{}'