diff options
author | Endi S. Dewata <edewata@redhat.com> | 2015-04-22 18:33:11 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2015-04-23 01:08:38 -0400 |
commit | 4d3049c36d8e6a5a0c999daaa6fdd856af00525c (patch) | |
tree | ea67c617e5a5a08af4e19358cc02f9b860fda83d /base/server/tomcat8 | |
parent | 982bfec653fc6993839eaacb42dc62a57a7fafd5 (diff) | |
download | pki-4d3049c36d8e6a5a0c999daaa6fdd856af00525c.tar.gz pki-4d3049c36d8e6a5a0c999daaa6fdd856af00525c.tar.xz pki-4d3049c36d8e6a5a0c999daaa6fdd856af00525c.zip |
Added direct deployment for theme.
The deployment tool has been modified to deploy the theme files
directly from /usr/share/pki. New deployment descriptors have been
added for admin templates and JS library.
https://fedorahosted.org/pki/ticket/499
Diffstat (limited to 'base/server/tomcat8')
4 files changed, 66 insertions, 2 deletions
diff --git a/base/server/tomcat8/conf/Catalina/localhost/ROOT.xml b/base/server/tomcat8/conf/Catalina/localhost/ROOT.xml index e70dd2055..f7659800c 100644 --- a/base/server/tomcat8/conf/Catalina/localhost/ROOT.xml +++ b/base/server/tomcat8/conf/Catalina/localhost/ROOT.xml @@ -22,7 +22,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<Context crossContext="true"> +<Context docBase="/usr/share/pki/server/webapps/ROOT" crossContext="true"> <Manager secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/> diff --git a/base/server/tomcat8/conf/Catalina/localhost/pki#admin.xml b/base/server/tomcat8/conf/Catalina/localhost/pki#admin.xml new file mode 100644 index 000000000..16db43605 --- /dev/null +++ b/base/server/tomcat8/conf/Catalina/localhost/pki#admin.xml @@ -0,0 +1,32 @@ +<?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 docBase="/usr/share/pki/server/webapps/pki/admin" crossContext="true"> + + <Manager + secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/> + + <Resources allowLinking="true" /> + +</Context> diff --git a/base/server/tomcat8/conf/Catalina/localhost/pki#js.xml b/base/server/tomcat8/conf/Catalina/localhost/pki#js.xml new file mode 100644 index 000000000..9b0903ddf --- /dev/null +++ b/base/server/tomcat8/conf/Catalina/localhost/pki#js.xml @@ -0,0 +1,32 @@ +<?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 docBase="/usr/share/pki/server/webapps/pki/js" crossContext="true"> + + <Manager + secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/> + + <Resources allowLinking="true" /> + +</Context> diff --git a/base/server/tomcat8/conf/Catalina/localhost/pki.xml b/base/server/tomcat8/conf/Catalina/localhost/pki.xml index e70dd2055..1e87c1cd5 100644 --- a/base/server/tomcat8/conf/Catalina/localhost/pki.xml +++ b/base/server/tomcat8/conf/Catalina/localhost/pki.xml @@ -22,7 +22,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<Context crossContext="true"> +<Context docBase="/usr/share/pki/common-ui" crossContext="true"> <Manager secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/> |