diff options
author | Endi S. Dewata <edewata@redhat.com> | 2013-11-27 11:53:57 -0500 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2013-12-16 19:15:42 -0500 |
commit | 5952a82975063c4ec27303091a44e586d1386933 (patch) | |
tree | 45e85faf77b727e608062eba7ff32b512286d0f8 /base/tks | |
parent | 706c37274c36a219ba6b0ece995bb36e7072b5e8 (diff) | |
download | pki-5952a82975063c4ec27303091a44e586d1386933.tar.gz pki-5952a82975063c4ec27303091a44e586d1386933.tar.xz pki-5952a82975063c4ec27303091a44e586d1386933.zip |
Moved web application context file.
The location of web application context file has been changed from
<instance>/webapps/<name>/META-INF/context.xml
into
<instance>/conf/Catalina/localhost/<name>.xml.
This will eventually allow deploying the web application directly
from the shared folder.
A new upgrade script has been added to move the context files in
the existing instances.
Ticket #499
Diffstat (limited to 'base/tks')
-rw-r--r-- | base/tks/shared/conf/Catalina/localhost/tks.xml (renamed from base/tks/shared/webapps/tks/META-INF/context.xml) | 0 | ||||
-rw-r--r-- | base/tks/shared/conf/context.xml | 40 |
2 files changed, 0 insertions, 40 deletions
diff --git a/base/tks/shared/webapps/tks/META-INF/context.xml b/base/tks/shared/conf/Catalina/localhost/tks.xml index e838503a6..e838503a6 100644 --- a/base/tks/shared/webapps/tks/META-INF/context.xml +++ b/base/tks/shared/conf/Catalina/localhost/tks.xml diff --git a/base/tks/shared/conf/context.xml b/base/tks/shared/conf/context.xml deleted file mode 100644 index 8b6fe4905..000000000 --- a/base/tks/shared/conf/context.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<!-- BEGIN COPYRIGHT BLOCK - Copyright (C) 2006-2010 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. ---> -<!-- The contents of this file will be loaded for each web application --> -<Context crossContext="true" allowLinking="true"> - - <!-- Default set of monitored resources --> - <WatchedResource>WEB-INF/web.xml</WatchedResource> - - <!-- Uncomment this to disable session persistence across Tomcat restarts --> - <!-- - <Manager pathname="" /> - --> - - <!-- Uncomment this to enable Comet connection tacking (provides events - on session expiration as well as webapp lifecycle) --> - <!-- - <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" /> - --> - -</Context> |