From 991577dd40bbb18613893362783d0cd06cbdce79 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Tue, 5 Feb 2013 17:13:22 -0500
Subject: Rearranged context.xml.

Previously the context.xml files are deployed into META-INF folders
in each webapps. They now have been moved into <instance>/conf/
Catalina/localhost/<subsystem>.xml to allow further clean-up.
---
 base/deploy/src/scriptlets/webapp_deployment.py | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'base/deploy')

diff --git a/base/deploy/src/scriptlets/webapp_deployment.py b/base/deploy/src/scriptlets/webapp_deployment.py
index 958d5e271..a3b459ab3 100644
--- a/base/deploy/src/scriptlets/webapp_deployment.py
+++ b/base/deploy/src/scriptlets/webapp_deployment.py
@@ -45,6 +45,25 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
             config.pki_log.info(log.WEBAPP_DEPLOYMENT_SPAWN_1, __name__,
                                 extra=config.PKI_INDENTATION_LEVEL_1)
 
+            # Copy /usr/share/pki/server/conf/Catalina/localhost
+            # to <instance>/conf/Catalina/localhost
+            util.directory.create(
+                os.path.join(
+                    master['pki_instance_configuration_path'],
+                    "Catalina"))
+            util.directory.copy(
+                os.path.join(
+                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
+                    "server",
+                    "conf",
+                    "Catalina",
+                    "localhost"),
+                os.path.join(
+                    master['pki_instance_configuration_path'],
+                    "Catalina",
+                    "localhost"),
+                overwrite_flag=True)
+
             # Copy /usr/share/pki/server/webapps/ROOT
             # to <instance>/webapps/ROOT
             util.directory.create(master['pki_tomcat_webapps_root_path'])
@@ -98,6 +117,21 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
                     "admin"),
                 overwrite_flag=True)
 
+            # Copy /usr/share/pki/<subsystem>/conf/Catalina/localhost
+            # to <instance>/conf/Catalina/localhost
+            util.directory.copy(
+                os.path.join(
+                    config.PKI_DEPLOYMENT_SOURCE_ROOT,
+                    master['pki_subsystem_type'],
+                    "conf",
+                    "Catalina",
+                    "localhost"),
+                os.path.join(
+                    master['pki_instance_configuration_path'],
+                    "Catalina",
+                    "localhost"),
+                overwrite_flag=True)
+
             # Copy /usr/share/pki/<subsystem>/webapps/<subsystem>
             # to <instance>/webapps/<subsystem>
             util.directory.copy(
-- 
cgit