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.

7 files changed, 61 insertions, 0 deletions

diff --git a/base/ca/shared/webapps/ca/META-INF/context.xml b/base/ca/shared/conf/Catalina/localhost/ca.xml
index 975ecabf1..975ecabf1 100644
--- a/base/ca/shared/webapps/ca/META-INF/context.xml
+++ b/base/ca/shared/conf/Catalina/localhost/ca.xml
diff --git a/base/common/shared/webapps/ROOT/META-INF/context.xml b/base/common/shared/conf/Catalina/localhost/ROOT.xml
index c29b4586e..c29b4586e 100644
--- a/base/common/shared/webapps/ROOT/META-INF/context.xml
+++ b/base/common/shared/conf/Catalina/localhost/ROOT.xml
diff --git a/base/common/shared/conf/Catalina/localhost/pki.xml b/base/common/shared/conf/Catalina/localhost/pki.xml
new file mode 100644
index 000000000..c29b4586e
--- /dev/null
+++ b/base/common/shared/conf/Catalina/localhost/pki.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- BEGIN COPYRIGHT BLOCK
+     Copyright (C) 2012 Red Hat, Inc.
+     All rights reserved.
+     Modifications: configuration parameters
+     END COPYRIGHT BLOCK
+-->
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<Context crossContext="true" allowLinking="true">
+
+</Context>
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(
diff --git a/base/kra/shared/webapps/kra/META-INF/context.xml b/base/kra/shared/conf/Catalina/localhost/kra.xml
index 975ecabf1..975ecabf1 100644
--- a/base/kra/shared/webapps/kra/META-INF/context.xml
+++ b/base/kra/shared/conf/Catalina/localhost/kra.xml
diff --git a/base/ocsp/shared/webapps/ocsp/META-INF/context.xml b/base/ocsp/shared/conf/Catalina/localhost/ocsp.xml
index 975ecabf1..975ecabf1 100644
--- a/base/ocsp/shared/webapps/ocsp/META-INF/context.xml
+++ b/base/ocsp/shared/conf/Catalina/localhost/ocsp.xml
diff --git a/base/tks/shared/webapps/tks/META-INF/context.xml b/base/tks/shared/conf/Catalina/localhost/tks.xml
index 975ecabf1..975ecabf1 100644
--- a/base/tks/shared/webapps/tks/META-INF/context.xml
+++ b/base/tks/shared/conf/Catalina/localhost/tks.xml