From 26b0e8fc9809a4cd9f2f9a2281f0894e2e0f8db2 Mon Sep 17 00:00:00 2001
From: Adam Young <ayoung@redhat.com>
Date: Mon, 26 Jul 2010 11:57:29 -0400
Subject: This patch removes the existing UI functionality, as a prep for
 adding the Javascript based ui.

---
 install/Makefile.am              |  3 ---
 install/po/Makefile.in           |  4 ----
 install/share/wsgi.py            |  2 --
 install/tools/ipa-server-install | 14 --------------
 4 files changed, 23 deletions(-)

(limited to 'install')

diff --git a/install/Makefile.am b/install/Makefile.am
index bc1dff14..1b97afa5 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -19,13 +19,10 @@ install-exec-local:
 	chmod 700 $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
 	mkdir -p $(DESTDIR)$(localstatedir)/cache/ipa/sessions
 	chmod 700 $(DESTDIR)$(localstatedir)/cache/ipa/sessions
-	mkdir -p $(DESTDIR)$(localstatedir)/cache/ipa/assets
-	chmod 700 $(DESTDIR)$(localstatedir)/cache/ipa/assets
 
 uninstall-local:
 	-rmdir $(DESTDIR)$(localstatedir)/lib/ipa/sysrestore
 	-rmdir $(DESTDIR)$(localstatedir)/lib/ipa
-	-rmdir $(DESTDIR)$(localstatedir)/cache/ipa/assets
 	-rmdir $(DESTDIR)$(localstatedir)/cache/ipa/sessions
 	-rmdir $(DESTDIR)$(localstatedir)/cache/ipa
 
diff --git a/install/po/Makefile.in b/install/po/Makefile.in
index d3aa018e..6f8932e3 100644
--- a/install/po/Makefile.in
+++ b/install/po/Makefile.in
@@ -129,10 +129,6 @@ PYTHON_POTFILES = \
      ../../ipaserver/plugins/xmlserver.py \
      ../../ipaserver/plugins/dogtag.py \
      ../../contrib/RHEL4/ipachangeconf.py \
-     ../../ipawebui/engine.py \
-     ../../ipawebui/__init__.py \
-     ../../ipawebui/widgets.py \
-     ../../ipawebui/controllers.py \
      ../../ipa-client/ipaclient/ntpconf.py \
      ../../ipa-client/ipaclient/__init__.py \
      ../../ipa-client/ipaclient/ipachangeconf.py \
diff --git a/install/share/wsgi.py b/install/share/wsgi.py
index e1c2c733..f6b99a2d 100644
--- a/install/share/wsgi.py
+++ b/install/share/wsgi.py
@@ -10,8 +10,6 @@ except StandardError, e:
     api.log.error('Failed to start IPA: %s' % e)
 else:
     api.log.info('*** PROCESS START ***')
-    import ipawebui
-    ui = ipawebui.create_wsgi_app(api)
 
     # This is the WSGI callable:
     application = api.Backend.session
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index c7fe6608..89bb83e3 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -56,14 +56,12 @@ from ipapython import sysrestore
 from ipapython.ipautil import *
 from ipalib import api, errors, util
 
-import ipawebui
 
 pw_name = None
 uninstalling = False
 
 # Used to determine the the highest possible uid/gid
 MAXINT_32BIT = 2147483648
-ASSETS_DIR = '/var/cache/ipa/assets'
 
 def parse_options():
     namespace = random.randint(1000000, (MAXINT_32BIT - 1000000))
@@ -412,13 +410,6 @@ def uninstall(dm_password=None):
     return 0
 
 
-def render_assets():
-    """
-    Render CSS and JavaScript assets.
-    """
-    ui = ipawebui.create_wsgi_app(api)
-    ui.render_assets()
-
 def set_subject_in_config(host_name, dm_password, suffix, subject_base):
         ldapuri = 'ldap://%s' % host_name
         try:
@@ -511,7 +502,6 @@ def main():
     print "  * Create and configure an instance of Directory Server"
     print "  * Create and configure a Kerberos Key Distribution Center (KDC)"
     print "  * Configure Apache (httpd)"
-    print "  * Render web UI JavaScript and CSS assets"
     if options.setup_dns:
         print "  * Configure DNS (bind)"
     if not options.conf_ntp:
@@ -656,7 +646,6 @@ def main():
     fd.write("enable_ra=True\n")
     if not options.selfsign:
         fd.write("ra_plugin=dogtag\n")
-    fd.write('webui_assets_dir=' + ASSETS_DIR + '\n')
     fd.close()
 
     api.bootstrap(**cfg)
@@ -739,9 +728,6 @@ def main():
     # generated
     ds.add_cert_to_service()
 
-    # Render webui assets:
-    ipautil.run(["/sbin/restorecon", ASSETS_DIR])
-    render_assets()
 
     # Create a HTTP instance
 
-- 
cgit