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-27 14:01:30 -0500 |
| commit | 0d4eab8f4af3efcdee7bd60fbbd7a3789a9713c6 (patch) | |
| tree | 2e870a036eb8c5d47b595985191576373973633c /base/deploy | |
| parent | 066789642947768eceb024a4064af88efeed24b0 (diff) | |
| download | pki-0d4eab8f4af3efcdee7bd60fbbd7a3789a9713c6.tar.gz pki-0d4eab8f4af3efcdee7bd60fbbd7a3789a9713c6.tar.xz pki-0d4eab8f4af3efcdee7bd60fbbd7a3789a9713c6.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')
| -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, |