diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-13 18:07:43 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-30 13:47:26 -0500 |
commit | 7f0614e38168f215ba55ccd7cd830943b51486c6 (patch) | |
tree | 127b13c7dbae470193ad9f6fa69fa8134eebcea1 /base/deploy/src/scriptlets | |
parent | a85a14e8f782d5aa3be4a7a995a6f1f3d452c4e8 (diff) | |
download | pki-7f0614e38168f215ba55ccd7cd830943b51486c6.tar.gz pki-7f0614e38168f215ba55ccd7cd830943b51486c6.tar.xz pki-7f0614e38168f215ba55ccd7cd830943b51486c6.zip |
I18n for ProfileList.template.
The messages in ProfileList.template in CA EE has been extracted
into a properties file which can be translated separately.
The original messages in the template have been marked as follows:
<span class="message" name="...key...">...message...</span>
When the page is loaded into the browser, the original message will
be replaced with the translated messages.
Ticket #406
Diffstat (limited to 'base/deploy/src/scriptlets')
-rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 20 | ||||
-rw-r--r-- | base/deploy/src/scriptlets/webapp_deployment.py | 40 |
2 files changed, 38 insertions, 22 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 995f4aacc..773305c13 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -70,26 +70,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): master['pki_instance_lib_log4j_properties']) util.directory.create(master['pki_tomcat_tmpdir_path']) util.directory.create(master['pki_tomcat_webapps_path']) - util.directory.create(master['pki_tomcat_webapps_common_path']) - - # Copy /usr/share/pki/common-ui - # to <instance>/webapp/pki - 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_webapps_root_path']) - util.directory.copy( - os.path.join( - config.PKI_DEPLOYMENT_SOURCE_ROOT, - "server", - "webapps", - "ROOT"), - master['pki_tomcat_webapps_root_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']) diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py index ff4818918..958d5e271 100644 --- a/base/deploy/src/scriptlets/webapp_deployment.py +++ b/base/deploy/src/scriptlets/webapp_deployment.py @@ -45,11 +45,47 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - # deploy webapp + # Copy /usr/share/pki/server/webapps/ROOT + # to <instance>/webapps/ROOT + util.directory.create(master['pki_tomcat_webapps_root_path']) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + "server", + "webapps", + "ROOT"), + master['pki_tomcat_webapps_root_path'], + overwrite_flag=True) + + # Copy /usr/share/pki/common-ui + # to <instance>/webapps/pki + 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) + + # Copy /usr/share/pki/server/webapps/pki/js + # to <instance>/webapps/pki/js util.directory.create(master['pki_tomcat_webapps_subsystem_path']) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + "server", + "webapps", + "pki", + "js"), + os.path.join( + master['pki_tomcat_webapps_common_path'], + "js"), + overwrite_flag=True) # Copy /usr/share/pki/server/webapps/pki/admin - # to <instance>/webapp/<subsystem>/admin + # to <instance>/webapps/<subsystem>/admin + # TODO: common templates should be deployed in common webapp + util.directory.create(master['pki_tomcat_webapps_subsystem_path']) util.directory.copy( os.path.join( config.PKI_DEPLOYMENT_SOURCE_ROOT, |