From 42667acb21cee0ce73c58aaf55aea8fee19620ff Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 24 Feb 2015 21:02:13 -0500
Subject: Added support for Tomcat 8.

The Dogtag code has been modified to support both Tomcat 7 and 8.
All files depending on a specific Tomcat version are now stored
in separate folders. The build scripts have been modified to use
the proper folder for the target platform. The tomcatjss
dependency has been updated as well.

The upgrade script will be added in a separate patch.

https://fedorahosted.org/pki/ticket/1264
---
 base/tks/CMakeLists.txt                          |  8 +++++
 base/tks/shared/conf/Catalina/localhost/tks.xml  | 37 ----------------------
 base/tks/tomcat7/CMakeLists.txt                  |  6 ++++
 base/tks/tomcat7/conf/Catalina/localhost/tks.xml | 37 ++++++++++++++++++++++
 base/tks/tomcat8/CMakeLists.txt                  |  6 ++++
 base/tks/tomcat8/conf/Catalina/localhost/tks.xml | 39 ++++++++++++++++++++++++
 6 files changed, 96 insertions(+), 37 deletions(-)
 delete mode 100644 base/tks/shared/conf/Catalina/localhost/tks.xml
 create mode 100644 base/tks/tomcat7/CMakeLists.txt
 create mode 100644 base/tks/tomcat7/conf/Catalina/localhost/tks.xml
 create mode 100644 base/tks/tomcat8/CMakeLists.txt
 create mode 100644 base/tks/tomcat8/conf/Catalina/localhost/tks.xml

(limited to 'base/tks')

diff --git a/base/tks/CMakeLists.txt b/base/tks/CMakeLists.txt
index 4b17ca0c8..8bdf2258e 100644
--- a/base/tks/CMakeLists.txt
+++ b/base/tks/CMakeLists.txt
@@ -4,6 +4,14 @@ add_subdirectory(src)
 add_subdirectory(setup)
 add_subdirectory(shared/conf)
 
+if(WITH_TOMCAT7)
+    add_subdirectory(tomcat7)
+endif(WITH_TOMCAT7)
+
+if(WITH_TOMCAT8)
+    add_subdirectory(tomcat8)
+endif(WITH_TOMCAT8)
+
 # install directories
 install(
     DIRECTORY
diff --git a/base/tks/shared/conf/Catalina/localhost/tks.xml b/base/tks/shared/conf/Catalina/localhost/tks.xml
deleted file mode 100644
index e838503a6..000000000
--- a/base/tks/shared/conf/Catalina/localhost/tks.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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">
-
-    <Manager
-        secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/>
-
-    <Valve className="com.netscape.cms.tomcat.SSLAuthenticatorWithFallback"
-        alwaysUseSession="true"
-        secureRandomProvider="Mozilla-JSS"
-        secureRandomAlgorithm="pkcs11prng"/>
-
-    <Realm className="com.netscape.cms.tomcat.ProxyRealm" />
-
-</Context>
diff --git a/base/tks/tomcat7/CMakeLists.txt b/base/tks/tomcat7/CMakeLists.txt
new file mode 100644
index 000000000..5c324e441
--- /dev/null
+++ b/base/tks/tomcat7/CMakeLists.txt
@@ -0,0 +1,6 @@
+install(
+    DIRECTORY
+        conf/
+    DESTINATION
+        ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/conf/
+)
diff --git a/base/tks/tomcat7/conf/Catalina/localhost/tks.xml b/base/tks/tomcat7/conf/Catalina/localhost/tks.xml
new file mode 100644
index 000000000..e838503a6
--- /dev/null
+++ b/base/tks/tomcat7/conf/Catalina/localhost/tks.xml
@@ -0,0 +1,37 @@
+<?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">
+
+    <Manager
+        secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/>
+
+    <Valve className="com.netscape.cms.tomcat.SSLAuthenticatorWithFallback"
+        alwaysUseSession="true"
+        secureRandomProvider="Mozilla-JSS"
+        secureRandomAlgorithm="pkcs11prng"/>
+
+    <Realm className="com.netscape.cms.tomcat.ProxyRealm" />
+
+</Context>
diff --git a/base/tks/tomcat8/CMakeLists.txt b/base/tks/tomcat8/CMakeLists.txt
new file mode 100644
index 000000000..5c324e441
--- /dev/null
+++ b/base/tks/tomcat8/CMakeLists.txt
@@ -0,0 +1,6 @@
+install(
+    DIRECTORY
+        conf/
+    DESTINATION
+        ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}/conf/
+)
diff --git a/base/tks/tomcat8/conf/Catalina/localhost/tks.xml b/base/tks/tomcat8/conf/Catalina/localhost/tks.xml
new file mode 100644
index 000000000..2c045dec7
--- /dev/null
+++ b/base/tks/tomcat8/conf/Catalina/localhost/tks.xml
@@ -0,0 +1,39 @@
+<?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">
+
+    <Manager
+        secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/>
+
+    <Valve className="com.netscape.cms.tomcat.SSLAuthenticatorWithFallback"
+        alwaysUseSession="true"
+        secureRandomProvider="Mozilla-JSS"
+        secureRandomAlgorithm="pkcs11prng"/>
+
+    <Realm className="com.netscape.cms.tomcat.ProxyRealm" />
+
+    <Resources allowLinking="true" />
+
+</Context>
-- 
cgit