From edf9c2273c00b52b0c240bc0c75dc1ba7bdc396e Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Fri, 9 Nov 2012 01:51:54 -0500
Subject: Reorganized common templates.

The common templates have moved from common-ui into base/common.
The deployment tools have been updated to use the new location.

Ticket #407
---
 base/deploy/src/scriptlets/instance_layout.py   | 23 ++++--------------
 base/deploy/src/scriptlets/webapp_deployment.py | 32 ++++++-------------------
 2 files changed, 11 insertions(+), 44 deletions(-)

(limited to 'base/deploy/src')

diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py
index cf8e42d4f..995f4aacc 100644
--- a/base/deploy/src/scriptlets/instance_layout.py
+++ b/base/deploy/src/scriptlets/instance_layout.py
@@ -72,28 +72,13 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
             util.directory.create(master['pki_tomcat_webapps_path'])
             util.directory.create(master['pki_tomcat_webapps_common_path'])
 
-            # Copy /usr/share/pki/common-ui/css
-            # to <instance>/webapp/pki/css
+            # Copy /usr/share/pki/common-ui
+            # to <instance>/webapp/pki
             util.directory.copy(
                 os.path.join(
                     config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    "common-ui",
-                    "css"),
-                os.path.join(
-                    master['pki_tomcat_webapps_common_path'],
-                    "css"),
-                overwrite_flag=True)
-
-            # 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",
-                    "images"),
-                os.path.join(
-                    master['pki_tomcat_webapps_common_path'],
-                    "images"),
+                    "common-ui"),
+                master['pki_tomcat_webapps_common_path'],
                 overwrite_flag=True)
 
             util.directory.create(master['pki_tomcat_webapps_root_path'])
diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py
index 4c15256bd..9fca206e9 100644
--- a/base/deploy/src/scriptlets/webapp_deployment.py
+++ b/base/deploy/src/scriptlets/webapp_deployment.py
@@ -48,36 +48,18 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
             # deploy webapp
             util.directory.create(master['pki_tomcat_webapps_subsystem_path'])
 
-            # Copy /usr/share/pki/common-ui/admin/console/config
-            # to <instance>/webapp/<subsystem>/admin/console/config
+            # Copy /usr/share/pki/server/webapps/pki/admin
+            # to <instance>/webapp/<subsystem>/admin
             util.directory.copy(
                 os.path.join(
                     config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    "common-ui",
-                    "admin",
-                    "console",
-                    "config"),
-                os.path.join(
-                    master['pki_tomcat_webapps_subsystem_path'],
-                    "admin",
-                    "console",
-                    "config"),
-                overwrite_flag=True)
-
-            # Copy /usr/share/pki/common-ui/admin/console/js
-            # to <instance>/webapp/<subsystem>/admin/console/js
-            util.directory.copy(
-                os.path.join(
-                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
-                    "common-ui",
-                    "admin",
-                    "console",
-                    "js"),
+                    "server",
+                    "webapps",
+                    "pki",
+                    "admin"),
                 os.path.join(
                     master['pki_tomcat_webapps_subsystem_path'],
-                    "admin",
-                    "console",
-                    "js"),
+                    "admin"),
                 overwrite_flag=True)
 
             util.directory.copy(
-- 
cgit