luehe 2005/02/14 11:27:41
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java LocalStrings.properties
Log:
Use configuration from alt-dd if specified.
(Setter for alt-dd had been added to StandardContext, but this info was never
used.)
Revision Changes Path
1.62 +27 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ContextConfig.java 10 Feb 2005 22:25:55 -0000 1.61
+++ ContextConfig.java 14 Feb 2005 19:27:41 -0000 1.62
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -32,6 +33,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
+import org.apache.catalina.Globals;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
@@ -272,12 +274,27 @@
*/
protected void applicationWebConfig() {
+ String altDDName = null;
+
// Open the application web.xml file, if it exists
InputStream stream = null;
ServletContext servletContext = context.getServletContext();
- if (servletContext != null)
- stream = servletContext.getResourceAsStream
- (Constants.ApplicationWebXml);
+ if (servletContext != null) {
+ altDDName = (String)servletContext.getAttribute(
+ Globals.ALT_DD_ATTR);
+ if (altDDName != null) {
+ try {
+ stream = new FileInputStream(altDDName);
+ } catch (FileNotFoundException e) {
+ log.error(sm.getString("contextConfig.altDDNotFound",
+ altDDName));
+ }
+ }
+ else {
+ stream = servletContext.getResourceAsStream
+ (Constants.ApplicationWebXml);
+ }
+ }
if (stream == null) {
log.info(sm.getString("contextConfig.applicationMissing") + " "
+ context);
return;
@@ -293,8 +310,12 @@
// Process the application web.xml file
synchronized (webDigester) {
try {
- url =
- servletContext.getResource(Constants.ApplicationWebXml);
+ if (altDDName != null) {
+ url = new File(altDDName).toURL();
+ } else {
+ url = servletContext.getResource(
+ Constants.ApplicationWebXml);
+ }
if( url!=null ) {
InputSource is = new InputSource(url.toExternalForm());
is.setByteStream(stream);
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LocalStrings.properties 1 Feb 2005 13:12:31 -0000 1.12
+++ LocalStrings.properties 14 Feb 2005 19:27:41 -0000 1.13
@@ -29,6 +29,7 @@
contextConfig.tldJarException=Exception processing JAR at resource path {0}
in context {1}
contextConfig.tldResourcePath=Invalid TLD resource path {0}
contextConfig.unavailable=Marking this application unavailable due to
previous error(s)
+contextConfig.altDDNotFound=alt-dd file {0} not found
embedded.alreadyStarted=Embedded service has already been started
embedded.noEngines=No engines have been defined yet
embedded.notmp=Cannot find specified temporary folder at {0}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
