cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java LocalStrings.properties SetContextPropertiesRule.java
remm2005/05/12 02:29:54
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
SetContextPropertiesRule.java
Log:
- 34840: Found a way to tweak behavior when using an external WAR.
- Ignore docBase if the context is inside the host appBase, as it is
duplicated by the context file name. Not doing so creates a mess in some cases.
Revision ChangesPath
1.60 +20 -7
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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- HostConfig.java 14 Mar 2005 11:52:04 - 1.59
+++ HostConfig.java 12 May 2005 09:29:54 - 1.60
@@ -53,7 +53,6 @@
* @author Remy Maucherat
* @version $Revision$ $Date$
*/
-
public class HostConfig
implements LifecycleListener {
@@ -575,15 +574,27 @@
context.setPath(contextPath);
// Add the associated docBase to the redeployed list if it's a
WAR
boolean isWar = false;
+boolean isExternal = false;
if (context.getDocBase() != null) {
File docBase = new File(context.getDocBase());
if (!docBase.isAbsolute()) {
docBase = new File(appBase(), context.getDocBase());
}
-deployedApp.redeployResources.put(docBase.getAbsolutePath(),
+// If external docBase, register .xml as redeploy first
+if
(!docBase.getAbsolutePath().startsWith(appBase().getAbsolutePath())) {
+isExternal = true;
+deployedApp.redeployResources.put
+(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
+
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
new Long(docBase.lastModified()));
-if
(docBase.getAbsolutePath().toLowerCase().endsWith(.war)) {
-isWar = true;
+if
(docBase.getAbsolutePath().toLowerCase().endsWith(.war)) {
+isWar = true;
+}
+} else {
+
log.warn(sm.getString(hostConfig.deployDescriptor.localDocBaseSpecified,
+ docBase));
+// Ignore specified docBase
+context.setDocBase(null);
}
}
host.addChild(context);
@@ -628,8 +639,10 @@
addWatchedResources(deployedApp, null, context);
}
// Add the context XML to the list of files which should
trigger a redeployment
-deployedApp.redeployResources.put
-(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
+if (!isExternal) {
+deployedApp.redeployResources.put
+(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
+}
}
} catch (Throwable t) {
log.error(sm.getString(hostConfig.deployDescriptor.error,
1.15 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LocalStrings.properties 15 Feb 2005 15:42:58 - 1.14
+++ LocalStrings.properties 12 May 2005 09:29:54 - 1.15
@@ -47,6 +47,7 @@
hostConfig.deploy=Deploying web application directory {0}
hostConfig.deployDescriptor=Deploying configuration descriptor {0}
hostConfig.deployDescriptor.error=Error deploying configuration descriptor
{0}
+hostConfig.deployDescriptor.localDocBaseSpecified=A docBase {0} inside the
host appBase has been specified, and will be ignored
hostConfig.deployDir=Deploying web application directory {0}
hostConfig.deployDir.error=Error deploying web application directory {0}
hostConfig.deployJar=Deploying web application archive {0}
1.2 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/SetContextPropertiesRule.java
Index: SetContextPropertiesRule.java
===
RCS file:
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java LocalStrings.properties
remm2005/01/03 08:10:19
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
Log:
- 32771: Cannot undeploy/deploy misconfigured app after tomcat startup.
- Submitted by Gabriele Garuglieri.
Revision ChangesPath
1.52 +5 -3
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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- HostConfig.java 1 Dec 2004 11:06:22 - 1.51
+++ HostConfig.java 3 Jan 2005 16:10:19 - 1.52
@@ -554,8 +554,8 @@
// Assume this is a configuration descriptor and deploy it
log.debug(sm.getString(hostConfig.deployDescriptor, file));
+Context context = null;
try {
-Context context = null;
synchronized (digester) {
try {
context = (Context) digester.parse(contextXml);
@@ -654,7 +654,9 @@
file), t);
}
-deployed.put(contextPath, deployedApp);
+if (context != null host.findChild(context.getName()) != null) {
+deployed.put(contextPath, deployedApp);
+}
}
1.11 +4 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LocalStrings.properties 1 Dec 2004 11:06:22 - 1.10
+++ LocalStrings.properties 3 Jan 2005 16:10:19 - 1.11
@@ -16,6 +16,8 @@
contextConfig.defaultMissing=Missing default web.xml, using application
web.xml only
contextConfig.defaultParse=Parse error in default web.xml
contextConfig.defaultPosition=Occurred at line {0} column {1}
+contextConfig.fixDocBase=Exception fixing docBase: {0}
+contextConfig.init=ContextConfig: Initializing
contextConfig.missingRealm=No Realm has been configured to authenticate
against
contextConfig.role.auth=WARNING: Security role name {0} used in an
auth-constraint without being defined in a security-role
contextConfig.role.link=WARNING: Security role name {0} used in a
role-link without being defined in a security-role
@@ -57,7 +59,8 @@
hostConfig.reload=Reloading context [{0}]
hostConfig.removeXML=Context [{0}] is undeployed
hostConfig.removeDIR=Directory {0} is undeployed
-hostConfig.removeWAR=War {0} is undeployedhostConfig.start=HostConfig:
Processing START
+hostConfig.removeWAR=War {0} is undeployed
+hostConfig.start=HostConfig: Processing START
hostConfig.stop=HostConfig: Processing STOP
hostConfig.undeploy=Undeploying web application at context path {0}
hostConfig.undeploy.error=Error undeploying web application at context path
{0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java LocalStrings.properties
remm2004/11/17 15:21:13
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
Log:
- Add info log when reloading a context.
Revision ChangesPath
1.50 +2 -1
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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- HostConfig.java 12 Nov 2004 00:48:41 - 1.49
+++ HostConfig.java 17 Nov 2004 23:21:13 - 1.50
@@ -1055,6 +1055,7 @@
if ((!resource.exists() lastModified != 0L)
|| (resource.lastModified() != lastModified)) {
// Reload application
+log.info(sm.getString(hostConfig.reload, app.name));
Container context = host.findChild(app.name);
try {
((Lifecycle) context).stop();
1.9 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalStrings.properties 23 Oct 2004 16:54:23 - 1.8
+++ LocalStrings.properties 17 Nov 2004 23:21:13 - 1.9
@@ -49,6 +49,7 @@
hostConfig.expand=Expanding web application archive {0}
hostConfig.expand.error=Exception while expanding web application archive {0}
hostConfig.expanding=Expanding discovered web application archives
+hostConfig.reload=Reloading context [{0}]
hostConfig.context.restart=Error during context {0} restart
hostConfig.removeXML=Context {0} is undeployed
hostConfig.removeDIR=Directory {0} is undeployed
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java LocalStrings.properties
remm2004/01/13 08:31:35
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java LocalStrings.properties
Log:
- Small cleanup of the class.
- Add some i18n.
- Use reload with a standard context (it might do stuff once again someday).
- Init deployer on startup to avoid possible CL issues when embedded.
Revision ChangesPath
1.26 +34 -28
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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- HostConfig.java 23 Sep 2003 06:35:52 - 1.25
+++ HostConfig.java 13 Jan 2004 16:31:35 - 1.26
@@ -88,6 +88,7 @@
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Logger;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.util.StringManager;
import org.apache.naming.resources.ResourceAttributes;
@@ -459,6 +460,9 @@
if (!(host instanceof Deployer))
return;
+// Initialize the deployer
+((Deployer) host).findDeployedApps();
+
File appBase = appBase();
if (!appBase.exists() || !appBase.isDirectory())
return;
@@ -888,31 +892,33 @@
boolean result = true;
log.info(restartContext( + context.getName() + ));
-/*
-try {
-StandardContext sctx=(StandardContext)context;
-sctx.reload();
-} catch( Exception ex ) {
-log.warn(Erorr stopping context + context.getName() ++
-ex.toString());
-}
-*/
-try {
-((Lifecycle) context).stop();
-} catch( Exception ex ) {
-log.warn(Erorr stopping context + context.getName() ++
-ex.toString());
-}
-// if the context was not started ( for example an error in web.xml)
-// we'll still get to try to start
-try {
-((Lifecycle) context).start();
-} catch (Exception e) {
-log.warn(Error restarting context + context.getName() + +
-e.toString());
-result = false;
+if (context instanceof StandardContext) {
+try {
+StandardContext sctx = (StandardContext)context;
+sctx.reload();
+} catch( Exception e ) {
+log.warn(sm.getString
+ (hostConfig.context.restart, context.getName()), e);
+result = false;
+}
+} else {
+try {
+((Lifecycle) context).stop();
+} catch( Exception ex ) {
+log.warn(sm.getString
+ (hostConfig.context.restart, context.getName()), e);
+}
+// If the context was not started (for example an error
+// in web.xml) we'll still get to try to start
+try {
+((Lifecycle) context).start();
+} catch (Exception e) {
+log.warn(sm.getString
+ (hostConfig.context.restart, context.getName()), e);
+result = false;
+}
}
-
+
return result;
}
1.4 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings.properties 16 Jan 2003 21:45:25 - 1.3
+++ LocalStrings.properties 13 Jan 2004 16:31:35 - 1.4
@@ -47,6 +47,7 @@
hostConfig.expand=Expanding web application archive {0}
hostConfig.expand.error=Exception while expanding web application archive {0}
hostConfig.expanding=Expanding discovered web application archives
+hostConfig.context.restart=Error during context {0} restart
hostConfig.start=HostConfig: Processing START
hostConfig.stop=HostConfig: Processing STOP
hostConfig.undeploy=Undeploying web application at context path {0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
