From fb80a25498513a5f5242acfd185d2db2d3b6e8c1 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Mon, 5 Nov 2012 15:59:44 -0500
Subject: Updated tools to deploy combined images and CSS files.

The pkispawn and pkicreate have been updated to deploy the
combined images and CSS files from the common-ui into /pki/images
and /pki/css.

The common Velocity templates and JavaScript files still need to
be deployed from the <subsystem>-ui packages into each subsystem.

Ticket #328
---
 base/deploy/src/scriptlets/instance_layout.py | 69 ++-------------------------
 1 file changed, 5 insertions(+), 64 deletions(-)

(limited to 'base/deploy/src/scriptlets/instance_layout.py')

diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py
index f45293104..cf8e42d4f 100644
--- a/base/deploy/src/scriptlets/instance_layout.py
+++ b/base/deploy/src/scriptlets/instance_layout.py
@@ -72,22 +72,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
             util.directory.create(master['pki_tomcat_webapps_path'])
             util.directory.create(master['pki_tomcat_webapps_common_path'])
 
-            common_images = os.path.join(
-                master['pki_tomcat_webapps_common_path'],
-                "images")
-
-            # Copy /usr/share/pki/common-ui/admin/console/img
-            # to <instance>/webapp/pki/images
-            util.directory.copy(
-                os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    "common-ui",
-                    "admin",
-                    "console",
-                    "img"),
-                common_images,
-                overwrite_flag=True)
-
             # Copy /usr/share/pki/common-ui/css
             # to <instance>/webapp/pki/css
             util.directory.copy(
@@ -100,61 +84,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     "css"),
                 overwrite_flag=True)
 
-            # Copy /usr/share/pki/common-ui/img
+            # Copy /usr/share/pki/common-ui/images
             # to <instance>/webapp/pki/images
             util.directory.copy(
                 os.path.join(
                     config.PKI_DEPLOYMENT_SOURCE_ROOT,
                     "common-ui",
-                    "img"),
-                common_images,
+                    "images"),
+                os.path.join(
+                    master['pki_tomcat_webapps_common_path'],
+                    "images"),
                 overwrite_flag=True)
 
-            # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/admin/graphics
-            # to <instance>/webapp/pki/images
-            dir = os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    master['pki_subsystem'].lower() + "-ui",
-                    "webapps",
-                    master['pki_subsystem'].lower(),
-                    "admin",
-                    "graphics")
-            if (util.directory.exists(dir)):
-                util.directory.copy(
-                    dir,
-                    common_images,
-                    overwrite_flag=True)
-
-            # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/agent/graphics
-            # to <instance>/webapp/pki/images
-            dir = os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    master['pki_subsystem'].lower() + "-ui",
-                    "webapps",
-                    master['pki_subsystem'].lower(),
-                    "agent",
-                    "graphics")
-            if (util.directory.exists(dir)):
-                util.directory.copy(
-                    dir,
-                    common_images,
-                    overwrite_flag=True)
-
-            # Copy /usr/share/pki/<subsystem>-ui/webapps/<subsystem>/ee/graphics
-            # to <instance>/webapp/pki/images
-            dir = os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    master['pki_subsystem'].lower() + "-ui",
-                    "webapps",
-                    master['pki_subsystem'].lower(),
-                    "ee",
-                    "graphics")
-            if (util.directory.exists(dir)):
-                util.directory.copy(
-                    dir,
-                    common_images,
-                    overwrite_flag=True)
-
             util.directory.create(master['pki_tomcat_webapps_root_path'])
             util.directory.copy(
                 os.path.join(
-- 
cgit