You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/06/25 00:37:06 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup SetDocBaseRule.java ContextRuleSet.java HostConfig.java
remm 2003/06/24 15:37:06
Modified: catalina/src/share/org/apache/catalina/startup
ContextRuleSet.java HostConfig.java
Added: catalina/src/share/org/apache/catalina/startup
SetDocBaseRule.java
Log:
- Update processing so that unpackWARs is respected even when deploying
a context file. In that case, the docBase is adjusted to reflect the unpacked WAR.
Also, using the unpacked docBase in the config file is valid, and will produce the
same result as pointing to the WAR file.
- This fixes bug 4829.
- If a context file is added for an existing context, or if a context file is updated, the
context will be redeployed (note: a special workaround of some sort will likely be
needed when the admin webapp commits changes, unless we accept this as
an acceptable side effect).
- This lacks testing, but is the final piece of the deployer refactoring (sorry for
breaking stuff ...).
Revision Changes Path
1.2 +6 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
Index: ContextRuleSet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextRuleSet.java 18 Jul 2002 16:47:48 -0000 1.1
+++ ContextRuleSet.java 24 Jun 2003 22:37:05 -0000 1.2
@@ -159,6 +159,8 @@
(digester,
"org.apache.catalina.startup.ContextConfig",
"configClass"));
+ digester.addRule(prefix + "Context",
+ new SetDocBaseRule(digester));
digester.addSetNext(prefix + "Context",
"addChild",
"org.apache.catalina.Container");
1.16 +27 -8 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HostConfig.java 21 Jun 2003 19:59:46 -0000 1.15
+++ HostConfig.java 24 Jun 2003 22:37:05 -0000 1.16
@@ -478,13 +478,16 @@
if (file.equals("ROOT")) {
contextPath = "";
}
- if (host.findChild(contextPath) != null) {
- continue;
- }
// Assume this is a configuration descriptor and deploy it
log.debug(sm.getString("hostConfig.deployDescriptor", files[i]));
try {
+ if (host.findChild(contextPath) != null) {
+ // If this is a newly added context file and
+ // it overrides a context with a simple path,
+ // undeploy the context
+ ((Deployer) host).remove(contextPath);
+ }
URL config =
new URL("file", null, dir.getCanonicalPath());
((Deployer) host).install(config, null);
@@ -696,7 +699,23 @@
} else {
if (lastModified.longValue() != newLastModified) {
contextXmlLastModified.remove(contextName);
- restartContext(context);
+ String fileName = contextName;
+ if (fileName.equals("")) {
+ fileName = "ROOT.xml";
+ } else {
+ fileName = fileName + ".war";
+ }
+ try {
+ deployed.remove(fileName);
+ if (host.findChild(contextName) != null) {
+ ((Deployer) host).remove(contextName);
+ }
+ } catch (Throwable t) {
+ log.error(sm.getString
+ ("hostConfig.undeployJar.error",
+ fileName), t);
+ }
+ deployApps();
}
}
}
1.1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java
Index: SetDocBaseRule.java
===================================================================
/*
* $Header: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetDocBaseRule.java,v 1.1 2003/06/24 22:37:05 remm Exp $
* $Revision: 1.1 $
* $Date: 2003/06/24 22:37:05 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.catalina.startup;
import java.io.File;
import java.lang.reflect.Method;
import java.net.URL;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.xml.sax.Attributes;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Deployer;
import org.apache.catalina.Host;
import org.apache.catalina.core.StandardHost;
/**
* <p>Rule that modifies the docBase of the host, setting it appropriately,
* before adding the Context to the parent Host.</p>
*
* @author Remy Maucherat
*/
public class SetDocBaseRule extends Rule {
// ----------------------------------------------------------- Constructors
/**
* Construct a new instance of this Rule.
*
* @param digester Digester we are associated with
*/
public SetDocBaseRule(Digester digester) {
super(digester);
}
// ----------------------------------------------------- Instance Variables
// --------------------------------------------------------- Public Methods
/**
* Handle the beginning of an XML element.
*
* @param attributes The attributes of this element
*
* @exception Exception if a processing error occurs
*/
public void begin(Attributes attributes) throws Exception {
Context child = (Context) digester.peek(0);
Deployer parent = (Deployer) digester.peek(1);
Method method = parent.getClass().getMethod("getHost", null);
Host host = (Host) method.invoke(parent, null);
String appBase = host.getAppBase();
if (!(host instanceof StandardHost)) {
return;
}
if (!((StandardHost) host).isUnpackWARs()) {
return;
}
File canonicalAppBase =
new File(System.getProperty("catalina.base"), appBase)
.getCanonicalFile();
String docBase = child.getDocBase();
File file = new File(docBase);
if (!file.isAbsolute()) {
// Use the "appBase" property of this container
file = new File(appBase);
if (!file.isAbsolute())
file = canonicalAppBase;
docBase = (new File(file, docBase)).getPath();
} else {
docBase = file.getCanonicalPath();
}
if (docBase.toLowerCase().endsWith(".war")) {
URL war = new URL("jar:" + (new File(docBase)).toURL() + "!/");
docBase = ExpandWar.expand(host, war, child.getPath());
file = new File(docBase);
docBase = file.getCanonicalPath();
} else {
File docDir = new File(docBase);
if (!docDir.exists()) {
File warFile = new File(docBase + ".war");
if (warFile.exists()) {
URL war = new URL("jar:" + warFile.toURL() + "!/");
docBase = ExpandWar.expand(host, war, child.getPath());
file = new File(docBase);
docBase = file.getCanonicalPath();
}
}
}
if (docBase.startsWith(canonicalAppBase.getPath())) {
docBase = docBase.substring
(canonicalAppBase.getPath().length() + 1);
}
docBase = docBase.replace(File.separatorChar, '/');
child.setDocBase(docBase);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org