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

35 files changed, 19 insertions, 76 deletions

diff --git a/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm b/base/common/shared/webapps/pki/admin/console/config/adminauthenticatepanel.vm
index b27042c..b27042c 100644
--- a/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/adminauthenticatepanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/adminpanel.vm b/base/common/shared/webapps/pki/admin/console/config/adminpanel.vm
index 37d9227..37d9227 100644
--- a/dogtag/common-ui/shared/admin/console/config/adminpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/adminpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm b/base/common/shared/webapps/pki/admin/console/config/agentauthenticatepanel.vm
index abb7678..abb7678 100644
--- a/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/agentauthenticatepanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm b/base/common/shared/webapps/pki/admin/console/config/backupkeycertpanel.vm
index 3ec3526..3ec3526 100644
--- a/dogtag/common-ui/shared/admin/console/config/backupkeycertpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/backupkeycertpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm b/base/common/shared/webapps/pki/admin/console/config/certchainpanel.vm
index 08bcc13..08bcc13 100644
--- a/dogtag/common-ui/shared/admin/console/config/certchainpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/certchainpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm b/base/common/shared/webapps/pki/admin/console/config/certprettyprintpanel.vm
index ac8da10..ac8da10 100644
--- a/dogtag/common-ui/shared/admin/console/config/certprettyprintpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/certprettyprintpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm b/base/common/shared/webapps/pki/admin/console/config/certrequestpanel.vm
index 0502834..0502834 100644
--- a/dogtag/common-ui/shared/admin/console/config/certrequestpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/certrequestpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm b/base/common/shared/webapps/pki/admin/console/config/config_addhsm.vm
index 839cff5..839cff5 100644
--- a/dogtag/common-ui/shared/admin/console/config/config_addhsm.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/config_addhsm.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm b/base/common/shared/webapps/pki/admin/console/config/config_hsmloginpanel.vm
index 147425b..147425b 100644
--- a/dogtag/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/config_hsmloginpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm b/base/common/shared/webapps/pki/admin/console/config/createsubsystempanel.vm
index 8ae6f3f..8ae6f3f 100644
--- a/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/createsubsystempanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/databasepanel.vm b/base/common/shared/webapps/pki/admin/console/config/databasepanel.vm
index 1747101..1747101 100644
--- a/dogtag/common-ui/shared/admin/console/config/databasepanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/databasepanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm b/base/common/shared/webapps/pki/admin/console/config/displaycertchainpanel.vm
index 26506c1..26506c1 100644
--- a/dogtag/common-ui/shared/admin/console/config/displaycertchainpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/displaycertchainpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/donepanel.vm b/base/common/shared/webapps/pki/admin/console/config/donepanel.vm
index 1367601..1367601 100644
--- a/dogtag/common-ui/shared/admin/console/config/donepanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/donepanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/footer.vm b/base/common/shared/webapps/pki/admin/console/config/footer.vm
index a596e45..a596e45 100644
--- a/dogtag/common-ui/shared/admin/console/config/footer.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/footer.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/header.vm b/base/common/shared/webapps/pki/admin/console/config/header.vm
index e0fe6a9..e0fe6a9 100644
--- a/dogtag/common-ui/shared/admin/console/config/header.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/header.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm b/base/common/shared/webapps/pki/admin/console/config/hierarchypanel.vm
index e6c03a6..e6c03a6 100644
--- a/dogtag/common-ui/shared/admin/console/config/hierarchypanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/hierarchypanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm b/base/common/shared/webapps/pki/admin/console/config/importadmincertpanel.vm
index 53d4459..53d4459 100644
--- a/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/importadmincertpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm b/base/common/shared/webapps/pki/admin/console/config/importcachainpanel.vm
index c53c3af..c53c3af 100755
--- a/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/importcachainpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/login.vm b/base/common/shared/webapps/pki/admin/console/config/login.vm
index 2400bd2..2400bd2 100644
--- a/dogtag/common-ui/shared/admin/console/config/login.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/login.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/modulepanel.vm b/base/common/shared/webapps/pki/admin/console/config/modulepanel.vm
index f0952ec..f0952ec 100644
--- a/dogtag/common-ui/shared/admin/console/config/modulepanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/modulepanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/namepanel.vm b/base/common/shared/webapps/pki/admin/console/config/namepanel.vm
index a1fff38..a1fff38 100644
--- a/dogtag/common-ui/shared/admin/console/config/namepanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/namepanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm b/base/common/shared/webapps/pki/admin/console/config/restorekeycertpanel.vm
index ab9b06f..ab9b06f 100644
--- a/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/restorekeycertpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm b/base/common/shared/webapps/pki/admin/console/config/savepkcs12panel.vm
index ce74eca..ce74eca 100644
--- a/dogtag/common-ui/shared/admin/console/config/savepkcs12panel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/savepkcs12panel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/base/common/shared/webapps/pki/admin/console/config/securitydomainloginpanel.vm
index e9e0763..e9e0763 100644
--- a/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/securitydomainloginpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm b/base/common/shared/webapps/pki/admin/console/config/securitydomainpanel.vm
index a8ac15b..a8ac15b 100644
--- a/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/securitydomainpanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/sidemenu.vm b/base/common/shared/webapps/pki/admin/console/config/sidemenu.vm
index 09fe168..09fe168 100644
--- a/dogtag/common-ui/shared/admin/console/config/sidemenu.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/sidemenu.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/sizepanel.vm b/base/common/shared/webapps/pki/admin/console/config/sizepanel.vm
index 1dee1ce..1dee1ce 100644
--- a/dogtag/common-ui/shared/admin/console/config/sizepanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/sizepanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/topmenu.vm b/base/common/shared/webapps/pki/admin/console/config/topmenu.vm
index 6488106..6488106 100644
--- a/dogtag/common-ui/shared/admin/console/config/topmenu.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/topmenu.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm b/base/common/shared/webapps/pki/admin/console/config/welcomepanel.vm
index 07b0d64..07b0d64 100644
--- a/dogtag/common-ui/shared/admin/console/config/welcomepanel.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/welcomepanel.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/wizard.vm b/base/common/shared/webapps/pki/admin/console/config/wizard.vm
index cc868e5..cc868e5 100644
--- a/dogtag/common-ui/shared/admin/console/config/wizard.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/wizard.vm
diff --git a/dogtag/common-ui/shared/admin/console/config/xml.vm b/base/common/shared/webapps/pki/admin/console/config/xml.vm
index ee4bc2c..ee4bc2c 100644
--- a/dogtag/common-ui/shared/admin/console/config/xml.vm
+++ b/base/common/shared/webapps/pki/admin/console/config/xml.vm
diff --git a/dogtag/common-ui/shared/admin/console/js/misc.js b/base/common/shared/webapps/pki/admin/console/js/misc.js
index d4dc336..d4dc336 100644
--- a/dogtag/common-ui/shared/admin/console/js/misc.js
+++ b/base/common/shared/webapps/pki/admin/console/js/misc.js
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py
index cf8e42d..995f4aa 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 4c15256..9fca206 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(
diff --git a/base/setup/pkicreate b/base/setup/pkicreate
index 6b503fe..6f63e96 100755
--- a/base/setup/pkicreate
+++ b/base/setup/pkicreate
@@ -2065,27 +2065,11 @@ sub process_pki_directories
                                     $default_dir_permissions, $default_file_permissions,
                                     $pki_user, $pki_group);
 
-        # Copy /usr/share/pki/common-ui/css
-        # to <instance>/docroot/pki/css
+        # Copy /usr/share/pki/common-ui
+        # to <instance>/docroot/pki
         return 0 if !copy_directory(
-            "$common_ui_subsystem_path/css",
-            "$docroot_instance_path/pki/css",
-            $default_dir_permissions, $default_file_permissions,
-            $pki_user, $pki_group);
-
-        # Copy /usr/share/pki/common-ui/esc
-        # to <instance>/docroot/pki/esc
-        return 0 if !copy_directory(
-            "$common_ui_subsystem_path/esc",
-            "$docroot_instance_path/pki/esc",
-            $default_dir_permissions, $default_file_permissions,
-            $pki_user, $pki_group);
-
-        # Copy /usr/share/pki/common-ui/images
-        # to <instance>/docroot/pki/images
-        return 0 if !copy_directory(
-            "$common_ui_subsystem_path/images",
-            "$docroot_instance_path/pki/images",
+            $common_ui_subsystem_path,
+            "$docroot_instance_path/pki",
             $default_dir_permissions, $default_file_permissions,
             $pki_user, $pki_group);
 
@@ -2116,19 +2100,11 @@ sub process_pki_directories
                                     $default_dir_permissions, $default_file_permissions,
                                     $pki_user, $pki_group);
 
-        # Copy /usr/share/pki/common-ui/admin/console/config
-        # to <instance>/webapp/<subsystem>/admin/console/config
-        return 0 if !copy_directory(
-            "$common_ui_subsystem_path/admin/console/config",
-            "$webapps_subsystem_instance_path/admin/console/config",
-            $default_dir_permissions, $default_file_permissions,
-            $pki_user, $pki_group);
-
-        # Copy /usr/share/pki/common-ui/admin/console/js
-        # to <instance>/webapp/<subsystem>/admin/console/js
+        # Copy /usr/share/pki/server/webapps/pki/admin
+        # to <instance>/webapp/<subsystem>/admin
         return 0 if !copy_directory(
-            "$common_ui_subsystem_path/admin/console/js",
-            "$webapps_subsystem_instance_path/admin/console/js",
+            "$pki_subsystem_common_area/server/webapps/pki/admin",
+            "$webapps_subsystem_instance_path/admin",
             $default_dir_permissions, $default_file_permissions,
             $pki_user, $pki_group);