diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-28 14:14:54 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-09-12 12:38:58 -0500 |
| commit | 7c622a4e5714af8f83ce30022c970cc36c2ee597 (patch) | |
| tree | 37391f70339126337560bd424bf6aa34b4f52185 /base/deploy/src/scriptlets/instance_layout.py | |
| parent | e455ddd81b3ef74e4b88ad34e7cd9e07e4c491b8 (diff) | |
| download | pki-7c622a4e5714af8f83ce30022c970cc36c2ee597.tar.gz pki-7c622a4e5714af8f83ce30022c970cc36c2ee597.tar.xz pki-7c622a4e5714af8f83ce30022c970cc36c2ee597.zip | |
Added common ROOT webapp.
The current ROOT webapp will redirect users coming to the root
URL path to the proper path of the subsystem's webapp.
Since now a single Tomcat instance may have multiple subsystems,
a new ROOT webapp has been added to present the user with a menu
of all available webapps from all subsystems in the instance.
Ticket #89
Diffstat (limited to 'base/deploy/src/scriptlets/instance_layout.py')
| -rw-r--r-- | base/deploy/src/scriptlets/instance_layout.py | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 72ccad16a..245df5a5f 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -50,11 +50,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.create(master['pki_tomcat_common_lib_path']) util.directory.create(master['pki_tomcat_tmpdir_path']) util.directory.create(master['pki_tomcat_webapps_path']) - util.directory.create(master['pki_tomcat_webapps_root_path']) - util.directory.create(master['pki_tomcat_webapps_root_webinf_path']) - 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( @@ -62,6 +57,15 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "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, + "shared", + "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']) @@ -168,11 +172,16 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): "common-ui"), master['pki_tomcat_webapps_common_path'], overwrite_flag=True) + util.directory.copy( + os.path.join( + config.PKI_DEPLOYMENT_SOURCE_ROOT, + "shared", + "webapps", + "ROOT"), + master['pki_tomcat_webapps_root_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'], - master['pki_tomcat_webapps_root_webinf_web_xml'], - overwrite_flag=True) util.directory.modify(master['pki_tomcat_work_path']) util.directory.modify(master['pki_tomcat_work_catalina_path']) util.directory.modify(master['pki_tomcat_work_catalina_host_path']) |