diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-21 13:15:34 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-09-05 10:08:41 -0500 |
commit | 63ac9595b4b193200e9b7af94f0854361a70eec9 (patch) | |
tree | e90039709931cd7783cbdb0276bf3e683704cf22 /base/deploy/src/scriptlets | |
parent | 1637107a208bc4ea465671ba0d9539548b4f1146 (diff) | |
download | pki-63ac9595b4b193200e9b7af94f0854361a70eec9.tar.gz pki-63ac9595b4b193200e9b7af94f0854361a70eec9.tar.xz pki-63ac9595b4b193200e9b7af94f0854361a70eec9.zip |
Moved webapp deployment code into pkispawn.
Previously the WAR files were generated at build time, so it would
include theme files that were installed on the build machine.
The code has been changed such that instead of generating WAR files
pkispawn will copy the webapp files from the theme folders and combine
them with subsystem webapp files at deployment time. This way it will
use the actual theme files installed on the deployment machine.
Ticket #89
Diffstat (limited to 'base/deploy/src/scriptlets')
-rw-r--r-- | base/deploy/src/scriptlets/pkimessages.py | 6 | ||||
-rw-r--r-- | base/deploy/src/scriptlets/pkiparser.py | 7 | ||||
-rw-r--r-- | base/deploy/src/scriptlets/webapp_deployment.py (renamed from base/deploy/src/scriptlets/war_explosion.py) | 60 |
3 files changed, 55 insertions, 18 deletions
diff --git a/base/deploy/src/scriptlets/pkimessages.py b/base/deploy/src/scriptlets/pkimessages.py index ba3f22898..ff023c6de 100644 --- a/base/deploy/src/scriptlets/pkimessages.py +++ b/base/deploy/src/scriptlets/pkimessages.py @@ -334,6 +334,6 @@ SLOT_ASSIGNMENT_SPAWN_1 = "assigning slots for '%s'" SUBSYSTEM_DESTROY_1 = "depopulating '%s'" SUBSYSTEM_RESPAWN_1 = "repopulating '%s'" SUBSYSTEM_SPAWN_1 = "populating '%s'" -WAR_EXPLOSION_DESTROY_1 = "removing '%s'" -WAR_EXPLOSION_RESPAWN_1 = "redeploying '%s'" -WAR_EXPLOSION_SPAWN_1 = "deploying '%s'" +WEBAPP_DEPLOYMENT_DESTROY_1 = "removing '%s'" +WEBAPP_DEPLOYMENT_RESPAWN_1 = "redeploying '%s'" +WEBAPP_DEPLOYMENT_SPAWN_1 = "deploying '%s'" diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index 4b6128440..09424120c 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -406,17 +406,10 @@ def compose_pki_master_dictionary(): "lib") config.pki_master_dict['pki_tomcat_systemd'] =\ config.PKI_DEPLOYMENT_TOMCAT_SYSTEMD - config.pki_master_dict['pki_war_source_dir'] =\ - os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, - config.pki_master_dict['pki_subsystem'].lower(), - "war") config.pki_master_dict['pki_source_webapps_path'] =\ os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT, config.pki_master_dict['pki_subsystem'].lower(), "webapps") - config.pki_master_dict['pki_war'] =\ - os.path.join(config.pki_master_dict['pki_war_source_dir'], - config.pki_master_dict['pki_war_file']) config.pki_master_dict['pki_source_catalina_properties'] =\ os.path.join(config.pki_master_dict['pki_source_shared_path'], "catalina.properties") diff --git a/base/deploy/src/scriptlets/war_explosion.py b/base/deploy/src/scriptlets/webapp_deployment.py index 16113ba7d..17b1bc349 100644 --- a/base/deploy/src/scriptlets/war_explosion.py +++ b/base/deploy/src/scriptlets/webapp_deployment.py @@ -19,6 +19,10 @@ # All rights reserved. # +# System Imports +import os + + # PKI Deployment Imports import pkiconfig as config from pkiconfig import pki_master_dict as master @@ -27,18 +31,38 @@ import pkimessages as log import pkiscriptlet -# PKI Deployment War Explosion Scriptlet +# PKI Web Application Deployment Scriptlet class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): rv = 0 def spawn(self): if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: - config.pki_log.info(log.WAR_EXPLOSION_SPAWN_1, __name__, + config.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) # deploy war file util.directory.create(master['pki_tomcat_webapps_subsystem_path']) - util.war.explode(master['pki_war'], - master['pki_tomcat_webapps_subsystem_path']) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + "common-ui"), + master['pki_tomcat_webapps_subsystem_path'], + overwrite_flag=True) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower() + "-ui", + "webapps", + master['pki_subsystem'].lower()), + master['pki_tomcat_webapps_subsystem_path'], + overwrite_flag=True) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower(), + "webapps", + master['pki_subsystem'].lower()), + master['pki_tomcat_webapps_subsystem_path'], + overwrite_flag=True) util.directory.create( master['pki_tomcat_webapps_subsystem_webinf_classes_path']) util.directory.create( @@ -62,12 +86,32 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def respawn(self): if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: - config.pki_log.info(log.WAR_EXPLOSION_RESPAWN_1, __name__, + config.pki_log.info(log.WEBAPP_DEPLOYMENT_RESPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) # redeploy war file util.directory.modify(master['pki_tomcat_webapps_subsystem_path']) - util.war.explode(master['pki_war'], - master['pki_tomcat_webapps_subsystem_path']) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + "common-ui"), + master['pki_tomcat_webapps_subsystem_path'], + overwrite_flag=True) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower() + "-ui", + "webapps", + master['pki_subsystem'].lower()), + master['pki_tomcat_webapps_subsystem_path'], + overwrite_flag=True) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + master['pki_subsystem'].lower(), + "webapps", + master['pki_subsystem'].lower()), + master['pki_tomcat_webapps_subsystem_path'], + overwrite_flag=True) # update Tomcat webapps subsystem WEB-INF lib symbolic links if master['pki_subsystem'] == "CA": util.symlink.modify(master['pki_ca_jar_link']) @@ -83,7 +127,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): def destroy(self): if master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS: - config.pki_log.info(log.WAR_EXPLOSION_DESTROY_1, __name__, + config.pki_log.info(log.WEBAPP_DEPLOYMENT_DESTROY_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) util.directory.delete(master['pki_tomcat_webapps_subsystem_path']) return self.rv |