Skip to content

Commit

Permalink
Added common ROOT webapp.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
edewata committed Sep 12, 2012
1 parent e455ddd commit 7c622a4
Show file tree
Hide file tree
Showing 12 changed files with 294 additions and 39 deletions.
2 changes: 2 additions & 0 deletions base/ca/shared/webapps/ca/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "file:///usr/share/pki/setup/web-app_2_3.dtd">
<web-app>

<display-name>Certificate Authority</display-name>

<servlet>
<servlet-name>csadmin-wizard</servlet-name>
<servlet-class>com.netscape.cms.servlet.wizard.WizardServlet</servlet-class>
Expand Down
2 changes: 1 addition & 1 deletion base/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ install(
DESTINATION
${DATA_INSTALL_DIR}/shared/
PATTERN
"lib/" EXCLUDE
"lib/*" EXCLUDE
)

# install empty directories
Expand Down
27 changes: 27 additions & 0 deletions base/common/shared/webapps/ROOT/META-INF/context.xml
Original file line number Diff line number Diff line change
@@ -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>
25 changes: 25 additions & 0 deletions base/common/shared/webapps/ROOT/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
Copyright 2004 The Apache Software Foundation
Licensed 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.
-->

<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">

<display-name>PKI</display-name>

</web-app>
209 changes: 209 additions & 0 deletions base/common/shared/webapps/ROOT/index.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
<!-- --- BEGIN COPYRIGHT BLOCK ---
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Copyright (C) 2012 Red Hat, Inc.
All rights reserved.
--- END COPYRIGHT BLOCK --- -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>Certificate System</title>
<meta http-equiv=Content-Type content="text/html; charset=UTF-8">
<link rel="shortcut icon" href="/pki/img/favicon.ico" />
<link rel="stylesheet" href="/pki/css/pki-base.css" type="text/css" />
</head>
<body bgcolor="#FFFFFF" link="#666699" vlink="#666699" alink="#333366">

<div id="header">
<a href="http://pki.fedoraproject.org/" title="Visit pki.fedoraproject.org for more information about Dogtag products and services"><img src="/pki/img/logo_header.gif" alt="Dogtag" id="myLogo" /></a>
<div id="headertitle">
<a href="/" title="Dogtag Network homepage">Dogtag<sup><font size="-2">&reg;</font></sup> Certificate System</a>
</div>
<div id="account">
<dl><dt><span></span></dt><dd></dd></dl>
</div>
</div>

<div id="mainNavOuter">
<div id="mainNav">
<div id="mainNavInner">

</div><!-- end mainNavInner -->
</div><!-- end mainNav -->
</div><!-- end mainNavOuter -->


<div id="bar">

<div id="systembar">
<div id="systembarinner">

<div>
-
</div>


</div>
</div>

</div>


<center>

<%
ServletContext caContext = getServletContext().getContext("/ca");
String caName = caContext.getServletContextName();
String caPath = caContext.getContextPath();
if (!"".equals(caPath)) {
%>
<p>
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
<%= caName %>
</font>
</p>

<table border="0" cellspacing="0" cellpadding="0">
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/ca/ee/ca">End Users Services</a></font>
</td>
</tr>
<%
if (request.isSecure()) {
%>
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/ca/agent/ca">Agent Services</a></font>
</td>
</tr>
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/ca/services">Admin Services</a></font>
</td>
</tr>
<%
}
%>
</table>

<br>

<%
}
ServletContext kraContext = getServletContext().getContext("/kra");
String kraName = kraContext.getServletContextName();
String kraPath = kraContext.getContextPath();
if (!"".equals(kraPath) && request.isSecure()) {
%>
<p>
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
<%= kraName %>
</font>
</p>

<table border="0" cellspacing="0" cellpadding="0">
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/kra/agent/kra">Agent Services</a></font>
</td>
</tr>
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/kra/services">Admin Services</a></font>
</td>
</tr>
</table>

<br>

<%
}
ServletContext ocspContext = getServletContext().getContext("/ocsp");
String ocspName = ocspContext.getServletContextName();
String ocspPath = ocspContext.getContextPath();
if (!"".equals(ocspPath) && request.isSecure()) {
%>
<p>
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
<%= ocspName %>
</font>
</p>

<table border="0" cellspacing="0" cellpadding="0">
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/ocsp/agent/ocsp">Agent Services</a></font>
</td>
</tr>
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/ocsp/services">Admin Services</a></font>
</td>
</tr>
</table>

<br>

<%
}
ServletContext tksContext = getServletContext().getContext("/tks");
String tksName = tksContext.getServletContextName();
String tksPath = tksContext.getContextPath();
if (!"".equals(tksPath) && request.isSecure()) {
%>
<p>
<font size="+1" face="PrimaSans BT, Verdana, Arial, Helvetica, sans-serif">
<%= tksName %>
</font>
</p>

<table border="0" cellspacing="0" cellpadding="0">
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/tks/agent/tks">Agent Services</a></font>
</td>
</tr>
<tr valign="TOP">
<td>
<li><font size=4 face="PrimaSans BT, Verdana, sans-serif">
<a href="/tks/services">Admin Services</a></font>
</td>
</tr>
</table>

<br>

<%
}
%>

</center>

<div id="footer">
</div>

</body>
</html>
25 changes: 17 additions & 8 deletions base/deploy/src/scriptlets/instance_layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,22 @@ def spawn(self):
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(
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,
"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'])
Expand Down Expand Up @@ -168,11 +172,16 @@ def respawn(self):
"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'])
Expand Down
22 changes: 2 additions & 20 deletions base/deploy/src/scriptlets/pkiparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,9 @@ def compose_pki_master_dictionary():
"lib")
config.pki_master_dict['pki_tomcat_systemd'] =\
config.PKI_DEPLOYMENT_TOMCAT_SYSTEMD
config.pki_master_dict['pki_source_webapps_path'] =\
config.pki_master_dict['pki_shared_webapps_path'] =\
os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
config.pki_master_dict['pki_subsystem'].lower(),
"shared",
"webapps")
config.pki_master_dict['pki_source_catalina_properties'] =\
os.path.join(config.pki_master_dict['pki_source_shared_path'],
Expand All @@ -425,15 +425,6 @@ def compose_pki_master_dictionary():
config.pki_master_dict['pki_source_tomcat_conf'] =\
os.path.join(config.pki_master_dict['pki_source_shared_path'],
"tomcat.conf")
config.pki_master_dict['pki_source_index_jsp'] =\
os.path.join(config.pki_master_dict['pki_source_webapps_path'],
"ROOT",
"index.jsp")
config.pki_master_dict['pki_source_webapps_root_web_xml'] =\
os.path.join(config.pki_master_dict['pki_source_webapps_path'],
"ROOT",
"WEB-INF",
"web.xml")
if config.pki_master_dict['pki_subsystem'] == "CA":
config.pki_master_dict['pki_source_emails'] =\
os.path.join(config.PKI_DEPLOYMENT_SOURCE_ROOT,
Expand Down Expand Up @@ -573,11 +564,6 @@ def compose_pki_master_dictionary():
os.path.join(
config.pki_master_dict['pki_tomcat_webapps_root_path'],
"WEB-INF")
config.pki_master_dict['pki_tomcat_webapps_root_webinf_web_xml'] =\
os.path.join(
config.pki_master_dict\
['pki_tomcat_webapps_root_webinf_path'],
"web.xml")
config.pki_master_dict['pki_tomcat_work_path'] =\
os.path.join(config.pki_master_dict['pki_instance_path'],
"work")
Expand Down Expand Up @@ -1012,10 +998,6 @@ def compose_pki_master_dictionary():
os.path.join(
config.pki_master_dict['pki_instance_configuration_path'],
"tomcat.conf")
config.pki_master_dict['pki_target_index_jsp'] =\
os.path.join(
config.pki_master_dict['pki_tomcat_webapps_root_path'],
"index.jsp")
# in-place slot substitution name/value pairs
config.pki_master_dict['pki_target_auth_properties'] =\
os.path.join(
Expand Down
Loading

0 comments on commit 7c622a4

Please sign in to comment.