Skip to content

Commit

Permalink
Added common theme webapp.
Browse files Browse the repository at this point in the history
A new theme webapp has been added to store the theme files for
all PKI webapps. In the future the subsystem webapps can be
modified to use the theme files provided by this common webapp
instead of having to include duplicate files in each webapp.

Ticket #89
  • Loading branch information
edewata committed Sep 12, 2012
1 parent 130e573 commit e455ddd
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
18 changes: 18 additions & 0 deletions base/deploy/src/scriptlets/instance_layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,17 @@
# All rights reserved.
#

# System Imports
import os


# PKI Deployment Imports
import pkiconfig as config
from pkiconfig import pki_master_dict as master
import pkihelper as util
import pkimessages as log
import pkiscriptlet
import os


# PKI Deployment Instance Layout Scriptlet
Expand All @@ -50,6 +55,13 @@ def spawn(self):
util.file.copy(master['pki_source_webapps_root_web_xml'],
master['pki_tomcat_webapps_root_webinf_web_xml'],
overwrite_flag=True)
util.directory.create(master['pki_tomcat_webapps_common_path'])
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,
"common-ui"),
master['pki_tomcat_webapps_common_path'],
overwrite_flag=True)
util.directory.create(master['pki_tomcat_work_path'])
util.directory.create(master['pki_tomcat_work_catalina_path'])
util.directory.create(master['pki_tomcat_work_catalina_host_path'])
Expand Down Expand Up @@ -150,6 +162,12 @@ def respawn(self):
util.directory.modify(master['pki_tomcat_common_path'])
util.directory.modify(master['pki_tomcat_common_lib_path'])
util.directory.modify(master['pki_tomcat_webapps_path'])
util.directory.copy(
os.path.join(
config.PKI_DEPLOYMENT_SOURCE_ROOT,
"common-ui"),
master['pki_tomcat_webapps_common_path'],
overwrite_flag=True)
util.directory.modify(master['pki_tomcat_webapps_root_path'])
util.directory.modify(master['pki_tomcat_webapps_root_webinf_path'])
util.file.copy(master['pki_source_webapps_root_web_xml'],
Expand Down
3 changes: 3 additions & 0 deletions base/deploy/src/scriptlets/pkiparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,9 @@ def compose_pki_master_dictionary():
config.pki_master_dict['pki_tomcat_webapps_root_path'] =\
os.path.join(config.pki_master_dict['pki_tomcat_webapps_path'],
"ROOT")
config.pki_master_dict['pki_tomcat_webapps_common_path'] =\
os.path.join(config.pki_master_dict['pki_tomcat_webapps_path'],
"pki")
config.pki_master_dict['pki_tomcat_webapps_root_webinf_path'] =\
os.path.join(
config.pki_master_dict['pki_tomcat_webapps_root_path'],
Expand Down

0 comments on commit e455ddd

Please sign in to comment.