cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[remm]

remm2005/03/16 03:37:44

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - Harmonize processing of the context.xml defaults with the way web.xml is 
processed.
  
  Revision  ChangesPath
  1.64  +65 -23
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.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- ContextConfig.java15 Mar 2005 13:06:30 -  1.63
  +++ ContextConfig.java16 Mar 2005 11:37:43 -  1.64
  @@ -618,19 +618,29 @@
   stream = null;
   source = null;
   
  -file = new File(getConfigBase(), Constants.HostWebXml);
  +String resourceName = getHostConfigPath(Constants.HostWebXml);
  +file = new File(getConfigBase(), resourceName);
   
   try {
  -   if (file.exists()) {
  +if ( ! file.exists() ) {
  +// Use getResource and getResourceAsStream
  +stream = getClass().getClassLoader()
  +.getResourceAsStream(resourceName);
  +if( stream != null ) {
  +source = new InputSource
  +(getClass().getClassLoader()
  +.getResource(resourceName).toString());
  +}
  +} else {
   source =
   new InputSource("file://" + file.getAbsolutePath());
   stream = new FileInputStream(file);
   }
   } catch (Exception e) {
   log.error(sm.getString("contextConfig.defaultMissing") 
  -  + " " + file , e);
  +  + " " + resourceName + " " + file , e);
   }
  -
  +
   if (stream != null) {
   processDefaultWebConfig(webDigester, stream, source);
   webRuleSet.recycle();
  @@ -644,6 +654,11 @@
*/
   protected void processDefaultWebConfig(Digester digester, InputStream 
stream, 
   InputSource source) {
  +
  +if (log.isDebugEnabled())
  +log.debug("Processing context [" + context.getName() 
  ++ "] web configuration resource " + 
source.getSystemId());
  +
   // Process the default web.xml file
   synchronized (digester) {
   try {
  @@ -696,11 +711,11 @@
   if( defaultContextXml==null ) getDefaultContextXml();
   
   if (!context.getOverride()) {
  -processContextConfig(new File(getBaseDir(), defaultContextXml));
  -processContextConfig(new File(getConfigBase(), 
Constants.HostContextXml));
  +processContextConfig(new File(getBaseDir()), defaultContextXml);
  +processContextConfig(getConfigBase(), 
getHostConfigPath(Constants.HostContextXml));
   }
   if (context.getConfigFile() != null)
  -processContextConfig(new File(context.getConfigFile()));
  +processContextConfig(new File(context.getConfigFile()), null);
   
   }
   
  @@ -708,28 +723,45 @@
   /**
* Process a context.xml.
*/
  -protected void processContextConfig(File file) {
  +protected void processContextConfig(File baseDir, String resourceName) {
   
   if (log.isDebugEnabled())
  -log.debug("Processing context [" + context.getName() + "] 
configuration file " + file);
  -
  -// Add as watched resource so that cascade reload occurs if a default
  -// config file is modified/added/removed
  -context.addWatchedResource(file.getAbsolutePath());
  +log.debug("Processing context [" + context.getName() 
  ++ "] configuration file " + baseDir + " " + 
resourceName);
   
   InputSource source = null;
   InputStream stream = null;
  +
  +File file = baseDir;
  +if (resourceName != null) {
  +file = new File(baseDir, resourceName);
  +}
  +
   try {
  -if (file.exists()) {
  -stream = new FileInputStream(file);
  +if ( !file.exists() ) {
  +if (resourceName != null) {
  +// Use getResource and getResourceAsStream
  +stream = getClass().getClassLoader()
  +.getResourceAsStream(resourceName);
  +if( stream != null ) {
  +source = new InputSource
  +(getClass().getClassLoader()
  +.getResource(resourceName).toString());
  +}
  +}

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java LocalStrings.properties

[Jan Luehe]

Remy,

Remy Maucherat wrote:
> [EMAIL PROTECTED] wrote:
>
>>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.)
>
>
> What's the use of that ? I see it could be useful to deviate from the
> standard, but that's it ...

Yes, this is useful for when your web module is deployed as part of a
J2EE application inside a J2EE container. According to J2EE.8.3.1
("Assembling a J2EE Application"), step 3:

  The deployment descriptors for the J2EE modules must be edited to link
  internally satisfied dependencies and eliminate any redundant security
  role names. An optional element alt-dd [...] may be used when it is
  desirable to preserve the original deployment descriptor. The element
  alt-dd specifies an alternate deployment descriptor to use at
  deployment time.

> I suppose the field was lying around from TC 4.0, and not actually used,
> right ?

According to cvs, this StandardContext property was added in
TOMCAT_5_0_1.


Jan




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java LocalStrings.properties

[Remy Maucherat]

[EMAIL PROTECTED] wrote:
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.)
What's the use of that ? I see it could be useful to deviate from the 
standard, but that's it ...
I suppose the field was lying around from TC 4.0, and not actually used, 
right ?

Rémy
-
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 ContextConfig.java LocalStrings.properties

[luehe]

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  ChangesPath
  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.java10 Feb 2005 22:25:55 -  1.61
  +++ ContextConfig.java14 Feb 2005 19:27:41 -  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 -   1.12
  +++ LocalStrings.properties   14 Feb 2005 19:27:41 -  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]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[luehe]

luehe   2005/02/10 14:25:55

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  Avoid allocating dummy LogConfig for every webapp that needs one.
  
  Revision  ChangesPath
  1.61  +6 -2  
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.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- ContextConfig.java14 Dec 2004 13:57:31 -  1.60
  +++ ContextConfig.java10 Feb 2005 22:25:55 -  1.61
  @@ -168,6 +168,10 @@
   protected static long deploymentCount = 0L;
   
   
  +private static final LoginConfig DUMMY_LOGIN_CONFIG =
  +new LoginConfig("NONE", null, null, null);
  +
  +
   // - 
Properties
   
   
  @@ -370,7 +374,7 @@
   return;
   LoginConfig loginConfig = context.getLoginConfig();
   if (loginConfig == null) {
  -loginConfig = new LoginConfig("NONE", null, null, null);
  +loginConfig = DUMMY_LOGIN_CONFIG;
   context.setLoginConfig(loginConfig);
   }
   
  
  
  

-
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 ContextConfig.java

[remm]

remm2004/10/02 02:22:18

  Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
   catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - Fix (again) the check for an uncompressed folder ending with ".war".
  
  Revision  ChangesPath
  1.150 +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- StandardContext.java  30 Sep 2004 19:29:04 -  1.149
  +++ StandardContext.java  2 Oct 2004 09:22:18 -   1.150
  @@ -3926,7 +3926,7 @@
   if (log.isDebugEnabled())
   log.debug("Configuring default Resources");
   try {
  -if ((docBase != null) && (docBase.endsWith(".war")) && (!(new 
File(docBase)).isDirectory()))
  +if ((docBase != null) && (docBase.endsWith(".war")) && (!(new 
File(getBasePath())).isDirectory()))
   setResources(new WARDirContext());
   else
   setResources(new FileDirContext());
  
  
  
  1.59  +2 -1  
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.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- ContextConfig.java24 Sep 2004 07:25:07 -  1.58
  +++ ContextConfig.java2 Oct 2004 09:22:18 -   1.59
  @@ -782,6 +782,7 @@
   } else {
   docBase = file.getCanonicalPath();
   }
  +file = new File(docBase);
   
   if (docBase.toLowerCase().endsWith(".war") && !file.isDirectory() && 
unpackWARs) {
   URL war = new URL("jar:" + (new File(docBase)).toURL() + "!/");
  
  
  

-
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 ContextConfig.java

[remm]

remm2004/09/24 01:23:30

  Modified:catalina/src/share/org/apache/catalina/startup Tag:
TOMCAT_5_0 ContextConfig.java
  Log:
  - Reset digester state.
  - Patch submitted by Scott Stark.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.44.2.2  +3 -1  
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.44.2.1
  retrieving revision 1.44.2.2
  diff -u -r1.44.2.1 -r1.44.2.2
  --- ContextConfig.java6 Sep 2004 18:57:06 -   1.44.2.1
  +++ ContextConfig.java24 Sep 2004 08:23:30 -  1.44.2.2
  @@ -285,7 +285,9 @@
   } catch (IOException e) {
   log.error(sm.getString("contextConfig.applicationClose"), e);
   }
  +webDigester.clear();
   webDigester.push(null);
  +webDigester.setErrorHandler(null);
   }
   }
   webRuleSet.recycle();
  
  
  

-
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 ContextConfig.java

[luehe]

luehe   2004/09/16 18:51:56

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  Formatting changes
  
  Revision  ChangesPath
  1.56  +6 -4  
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.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- ContextConfig.java16 Sep 2004 22:21:45 -  1.55
  +++ ContextConfig.java17 Sep 2004 01:51:56 -  1.56
  @@ -421,12 +421,14 @@
   authenticators = new Properties();
   authenticators.load(is);
   } else {
  -
log.error(sm.getString("contextConfig.authenticatorResources"));
  +log.error(sm.getString(
  +"contextConfig.authenticatorResources"));
   ok=false;
   return;
   }
   } catch (IOException e) {
  -log.error(sm.getString("contextConfig.authenticatorResources"), 
e);
  +log.error(sm.getString(
  +"contextConfig.authenticatorResources"), e);
   ok = false;
   return;
   }
  @@ -463,7 +465,7 @@
   if (log.isDebugEnabled()) {
   log.debug(sm.getString(
   "contextConfig.authenticatorConfigured",
  - loginConfig.getAuthMethod()));
  +loginConfig.getAuthMethod()));
   }
   }
   }
  
  
  

-
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 ContextConfig.java

[remm]

remm2004/09/16 08:30:33

  Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
   catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - Add check for directory before considering something is a compressed WAR.
  
  Revision  ChangesPath
  1.146 +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -r1.145 -r1.146
  --- StandardContext.java  1 Sep 2004 22:55:48 -   1.145
  +++ StandardContext.java  16 Sep 2004 15:30:32 -  1.146
  @@ -3921,7 +3921,7 @@
   if (log.isDebugEnabled())
   log.debug("Configuring default Resources");
   try {
  -if ((docBase != null) && (docBase.endsWith(".war")))
  +if ((docBase != null) && (docBase.endsWith(".war")) && ((new 
File(docBase)).isFile()))
   setResources(new WARDirContext());
   else
   setResources(new FileDirContext());
  
  
  
  1.54  +2 -2  
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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- ContextConfig.java6 Sep 2004 15:02:07 -   1.53
  +++ ContextConfig.java16 Sep 2004 15:30:33 -  1.54
  @@ -752,7 +752,7 @@
   docBase = file.getCanonicalPath();
   }
   
  -if (docBase.toLowerCase().endsWith(".war") && unpackWARs) {
  +if (docBase.toLowerCase().endsWith(".war") && file.isFile() && unpackWARs) {
   URL war = new URL("jar:" + (new File(docBase)).toURL() + "!/");
   String contextPath = context.getPath();
   if (contextPath.equals("")) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[www #45312] cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[WWW]

Greetings.  (This is an automated response.  There is no need to reply.)

Your message regarding:
  cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup 
ContextConfig.java
has been received and assigned a request number of 45312.

In order help us track the progress of this request, we ask that you
include the string [www #45312] in the subject line of any further mail
about this particular request.
For example:
Subject: [www #45312] cvs commit: 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup 
ContextConfig.java


-
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 ContextConfig.java

[markt]

markt   2004/09/06 11:57:06

  Modified:catalina/src/share/org/apache/catalina/startup Tag:
TOMCAT_5_0 ContextConfig.java
  Log:
  Add missing call to Digester to prevent it from retaining a reference to the context
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.44.2.1  +2 -1  
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.44
  retrieving revision 1.44.2.1
  diff -u -r1.44 -r1.44.2.1
  --- ContextConfig.java9 Apr 2004 21:47:04 -   1.44
  +++ ContextConfig.java6 Sep 2004 18:57:06 -   1.44.2.1
  @@ -534,6 +534,7 @@
   } catch (IOException e) {
   log.error(sm.getString("contextConfig.defaultClose"), e);
   }
  +webDigester.push(null);
   }
   }
   webRuleSet.recycle();
  
  
  

-
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 ContextConfig.java Constants.java

[remm]

remm2004/09/01 15:55:48

  Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java mbeans-descriptors.xml
   catalina/src/share/org/apache/catalina/startup
ContextConfig.java Constants.java
  Log:
  - Allow configuring the default context.xml.
  - Remove old descriptors.
  
  Revision  ChangesPath
  1.145 +25 -6 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- StandardContext.java  31 Aug 2004 15:07:23 -  1.144
  +++ StandardContext.java  1 Sep 2004 22:55:48 -   1.145
  @@ -280,8 +280,13 @@
   
   
   /** 
  - * Override the default web xml location. ContextConfig is not configurable
  - * so the setter is not used.
  + * Override the default context xml location.
  + */
  +private String defaultContextXml;
  +
  +
  +/** 
  + * Override the default web xml location.
*/
   private String defaultWebXml;
   
  @@ -1044,15 +1049,29 @@
   
   }
   
  +public String getDefaultContextXml() {
  +return defaultContextXml;
  +}
  +
  +/** 
  + * Set the location of the default context xml that will be used.
  + * If not absolute, it'll be made relative to the engine's base dir
  + * ( which defaults to catalina.base system property ).
  + *
  + * @param defaultWebXml The default web xml 
  + */
  +public void setDefaultContextXml(String defaultContextXml) {
  +this.defaultContextXml = defaultContextXml;
  +}
  +
   public String getDefaultWebXml() {
   return defaultWebXml;
   }
   
  -/** Set the location of the default web xml that will be used.
  +/** 
  + * Set the location of the default web xml that will be used.
* If not absolute, it'll be made relative to the engine's base dir
* ( which defaults to catalina.base system property ).
  - *
  - * XXX If a file is not found - we can attempt a getResource()
*
* @param defaultWebXml The default web xml 
*/
  
  
  
  1.33  +4 -103
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mbeans-descriptors.xml29 Jul 2004 06:22:52 -  1.32
  +++ mbeans-descriptors.xml1 Sep 2004 22:55:48 -   1.33
  @@ -1,109 +1,6 @@
   
   
   
  -  
  -
  -
  -
  -
  -  
  -
  -  
  -
  -  
  -
  -  
  -
  -  
  -
  -  
  -
  -   
  -
  -
  -
  -
  -
  -
  -
  - 
  -
  -  
  -  
  -
  -
  -
  -  
  -  
  -
  -
  -
  -  
  -
  -
  -
  -  
  -
  -
  -  
  -  
 
   
  +
  +   
   
  
  
  
  1.52  +39 -5 
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.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- ContextConfig.java27 Jul 2004 10:04:39 -  1.51
  +++ ContextConfig.java1 Sep 2004 22:55:48 -   1.52
  @@ -87,6 +87,12 @@
   
   
   /**
  + * The default web application's context file location.
  + */
  +protected String defaultContextXml = null;
  +
  +
  +/**
* The default web application's deployment descriptor location.
*/
   protected String defaultWebXml = null;
  @@ -179,6 +185,28 @@
   }
   
   
  +/**
  + * Return the location of the default context file
  + */
  +public String getDefaultContextXml() {
  +if( defaultContextXml == null ) 
defaultContextXml=Constants.DefaultContextXml;
  +return (this.defaultContextXml);
  +
  +}
  +
  +
  +/**
  + * Set the location of the default context file
  + *
  + * @param path Absolute/relative path to the default context.xml
  + */
  +public void setDefaultContextXml(String path) {
  +
  +this.defaultContextXml = path;
  +
  +}
  +
  +
   // 

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[remm]

remm2004/07/26 08:54:39

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - When using the antiLocking flag, attempt to remove as much of the temp files when 
stopping.
  - As it was the case before, remove the work dir when undeploying.
  
  Revision  ChangesPath
  1.50  +28 -3 
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.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- ContextConfig.java26 Jul 2004 10:56:54 -  1.49
  +++ ContextConfig.java26 Jul 2004 15:54:38 -  1.50
  @@ -103,6 +103,12 @@
*/
   protected SAXParseException parseException = null;
   
  +
  +/**
  + * Original docBase.
  + */
  +protected String originalDocBase = null;
  +
   
   /**
* The string resources for this package.
  @@ -753,6 +759,11 @@
   String docBase = context.getDocBase();
   if (docBase == null)
   return;
  +if (originalDocBase == null) {
  +originalDocBase = docBase;
  +} else {
  +docBase = originalDocBase;
  +}
   File docBaseFile = new File(docBase);
   if (!docBaseFile.isAbsolute()) {
   docBaseFile = new File(appBase, docBase);
  @@ -773,7 +784,7 @@
   }
   
   File file = null;
  -if (context.getDocBase().toLowerCase().endsWith(".war")) {
  +if (docBase.toLowerCase().endsWith(".war")) {
   file = new File(System.getProperty("java.io.tmpdir"),
   deploymentCount++ + "-" + docBase + ".war");
   } else {
  @@ -1057,6 +1068,18 @@
   context.removeWrapperListener(wrapperListeners[i]);
   }
   
  +// Remove (partially) folders and files created by antiLocking
  +Host host = (Host) context.getParent();
  +String appBase = host.getAppBase();
  +String docBase = context.getDocBase();
  +if ((docBase != null) && (originalDocBase != null)) {
  +File docBaseFile = new File(docBase);
  +if (!docBaseFile.isAbsolute()) {
  +docBaseFile = new File(appBase, docBase);
  +}
  +ExpandWar.delete(docBaseFile);
  +}
  +
   ok = true;
   
   }
  @@ -1069,7 +1092,9 @@
   // Called from StandardContext.destroy()
   if (log.isDebugEnabled())
   log.debug(sm.getString("contextConfig.destroy"));
  -
  +String workDir = ((StandardContext) context).getWorkDir();
  +if (workDir != null)
  +ExpandWar.delete(new File(workDir));
   }
   
   
  
  
  

-
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 ContextConfig.java

[remm]

remm2004/04/09 14:47:04

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - If there's a non fatal exception (with validation), no exception will be
rethrown by the digester. This will make the webapp startup fail if
the XML is invalid and XML validation is enabled, even if the error
isn't fatal (= the webapp would run without errors if validation was
disabled).
  
  Revision  ChangesPath
  1.44  +37 -1 
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.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- ContextConfig.java25 Mar 2004 22:31:46 -  1.43
  +++ ContextConfig.java9 Apr 2004 21:47:04 -   1.44
  @@ -50,6 +50,7 @@
   import org.apache.catalina.session.StandardManager;
   import org.apache.catalina.util.StringManager;
   import org.apache.commons.digester.Digester;
  +import org.xml.sax.ErrorHandler;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXParseException;
   
  @@ -103,6 +104,12 @@
   
   
   /**
  + * Any parse error which occurred while parsing XML descriptors.
  + */
  +private SAXParseException parseException = null;
  +
  +
  +/**
* The string resources for this package.
*/
   private static final StringManager sm =
  @@ -252,7 +259,11 @@
   ((StandardContext) context).setReplaceWelcomeFiles(true);
   }
   webDigester.push(context);
  +webDigester.setErrorHandler(new ContextErrorHandler());
   webDigester.parse(is);
  +if (parseException != null) {
  +ok = false;
  +}
   } else {
   log.info("No web.xml, using defaults " + context );
   }
  @@ -266,6 +277,7 @@
   log.error(sm.getString("contextConfig.applicationParse"), e);
   ok = false;
   } finally {
  +parseException = null;
   try {
   if (stream != null) {
   stream.close();
  @@ -499,7 +511,11 @@
   //log.info( "Using cl: " + webDigester.getClassLoader());
   webDigester.setUseContextClassLoader(false);
   webDigester.push(context);
  +webDigester.setErrorHandler(new ContextErrorHandler());
   webDigester.parse(source);
  +if (parseException != null) {
  +ok = false;
  +}
   } catch (SAXParseException e) {
   log.error(sm.getString("contextConfig.defaultParse"), e);
   log.error(sm.getString("contextConfig.defaultPosition",
  @@ -510,6 +526,7 @@
   log.error(sm.getString("contextConfig.defaultParse"), e);
   ok = false;
   } finally {
  +parseException = null;
   try {
   if (stream != null) {
   stream.close();
  @@ -838,5 +855,24 @@
   }
   
   }
  +
  +
  +private class ContextErrorHandler
  +implements ErrorHandler {
  +
  +public void error(SAXParseException exception) {
  +parseException = exception;
  +}
  +
  +public void fatalError(SAXParseException exception) {
  +parseException = exception;
  +}
  +
  +public void warning(SAXParseException exception) {
  +parseException = exception;
  +}
  +
  +}
  +
   
   }
  
  
  

-
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 ContextConfig.java

[jfarcand]

jfarcand2004/03/25 14:31:46

  Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
   catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  Fix bugtraq : javax.naming.NamingException after a Stop/Start cycle of a web app
  
  Using jmx, if you stop/start the Context, listener and applicationListeners are 
removed when calling stop and never re-added.
  
  Revision  ChangesPath
  1.122 +4 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- StandardContext.java  24 Mar 2004 20:00:22 -  1.121
  +++ StandardContext.java  25 Mar 2004 22:31:46 -  1.122
  @@ -4542,6 +4542,9 @@
   broadcaster.sendNotification(notification);
   } 
   super.destroy();
  +
  +instanceListeners = new String[0];
  +applicationListeners = new String[0];
   }
   
   private void resetContext() throws Exception, MBeanRegistrationException {
  
  
  
  1.43  +1 -13 
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.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- ContextConfig.java24 Mar 2004 20:00:22 -  1.42
  +++ ContextConfig.java25 Mar 2004 22:31:46 -  1.43
  @@ -659,12 +659,6 @@
   context.removeChild(children[i]);
   }
   
  -// Removing application listeners
  -String[] applicationListeners = context.findApplicationListeners();
  -for (i = 0; i < applicationListeners.length; i++) {
  -context.removeApplicationListener(applicationListeners[i]);
  -}
  -
   // Removing application parameters
   /*
   ApplicationParameter[] applicationParameters =
  @@ -713,12 +707,6 @@
   FilterMap[] filterMaps = context.findFilterMaps();
   for (i = 0; i < filterMaps.length; i++) {
   context.removeFilterMap(filterMaps[i]);
  -}
  -
  -// Removing instance listeners
  -String[] instanceListeners = context.findInstanceListeners();
  -for (i = 0; i < instanceListeners.length; i++) {
  -context.removeInstanceListener(instanceListeners[i]);
   }
   
   // Removing local ejbs
  
  
  

-
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 ContextConfig.java TldConfig.java

[jfarcand]

jfarcand2004/03/24 12:00:22

  Modified:catalina/src/share/org/apache/catalina Context.java
   catalina/src/share/org/apache/catalina/core
StandardContext.java
   catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
   catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
  Log:
  Add support for xml validation/namespaceAware at the  level. The new 
attributes override the ones set on the  element.
  
  Add a "dummy" method for jmx calls (until the admin starts supporting the new sets 
of attributes)
  
  Revision  ChangesPath
  1.11  +69 -1 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java
  
  Index: Context.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Context.java  27 Feb 2004 14:58:38 -  1.10
  +++ Context.java  24 Mar 2004 20:00:22 -  1.11
  @@ -1128,4 +1128,72 @@
   public void removeWrapperListener(String listener);
   
   
  +/**
  + * Get the server.xml  attribute's xmlNamespaceAware.
  + * @return true if namespace awarenes is enabled.
  + *
  + */
  +public boolean getXmlNamespaceAware();
  +
  +
  +/**
  + * Get the server.xml  attribute's xmlValidation.
  + * @return true if validation is enabled.
  + *
  + */
  +public boolean getXmlValidation();
  +
  +
  +/**
  + * Set the validation feature of the XML parser used when
  + * parsing xml instances.
  + * @param xmlValidation true to enable xml instance validation
  + */
  +public void setXmlValidation(boolean xmlValidation);
  +
  +
  +   /**
  + * Set the namespace aware feature of the XML parser used when
  + * parsing xml instances.
  + * @param xmlNamespaceAware true to enable namespace awareness
  + */
  +public void setXmlNamespaceAware(boolean xmlNamespaceAware);
  +/**
  + * Get the server.xml  attribute's xmlValidation.
  + * @return true if validation is enabled.
  + */
  + 
  +
  +/**
  + * Set the validation feature of the XML parser used when
  + * parsing tlds files. 
  + * @param tldXmlValidation true to enable xml instance validation
  + */
  +public void setTldValidation(boolean tldValidation);
  +
  +
  +/**
  + * Get the server.xml  attribute's webXmlValidation.
  + * @return true if validation is enabled.
  + *
  + */
  +public boolean getTldValidation();
  +
  +
  +/**
  + * Get the server.xml  attribute's xmlNamespaceAware.
  + * @return true if namespace awarenes is enabled.
  + */
  +public boolean getTldNamespaceAware();
  +
  +
  +/**
  + * Set the namespace aware feature of the XML parser used when
  + * parsing xml instances.
  + * @param xmlNamespaceAware true to enable namespace awareness
  + */
  +public void setTldNamespaceAware(boolean tldNamespaceAware);
  +
  +
   }
  +
  
  
  
  1.121 +126 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- StandardContext.java  22 Mar 2004 12:45:55 -  1.120
  +++ StandardContext.java  24 Mar 2004 20:00:22 -  1.121
  @@ -575,12 +575,38 @@
   private long startTime;
   private long tldScanTime;
   
  -/** Name of the engine. If null, the domain is used.
  +/** 
  + * Name of the engine. If null, the domain is used.
*/ 
   private String engineName = null;
   private String j2EEApplication="none";
   private String j2EEServer="none";
   
  +
  +/**
  + * Attribute value used to turn on/off XML validation
  + */
  + private boolean webXmlValidation = false;
  +
  +
  +/**
  + * Attribute value used to turn on/off XML namespace validation
  + */
  + private boolean webXmlNamespaceAware = false;
  +
  +
  +/**
  + * Attribute value used to turn on/off XML validation
  + */
  + private boolean tldValidation = false;
  +
  +
  +/**
  + * Attribute value used to turn on/off TLD XML namespace validation
  + */
  + private boolean tldNamespaceAware = false;
  +
  +
   // - Context Properties
   
   public void setName( String name ) {
  @@ -4179,10 +4205,24 @@
   // Read tldListeners. XXX Option to disable
 

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java TldConfig.java

[jfarcand]

jfarcand2003/09/25 12:27:59

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
  Log:
  Follow a 101 Tranning course on how to use Xerces 2.3/2.5 and fix the schema 
validation problem. The fix will only works for Xerces when schema are supported 
(Crimson will still work).
  
  Changes between 2.1/2.3 seems to have modified the way the parser is working. Those 
private property will be added to the next release of jaxp.
  
  Thanks to ramesh mandava at sun for is teaching lesson :-)
  
  Revision  ChangesPath
  1.36  +23 -4 
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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ContextConfig.java23 Sep 2003 21:37:00 -  1.35
  +++ ContextConfig.java25 Sep 2003 19:27:59 -  1.36
  @@ -300,7 +300,7 @@
   if (context instanceof StandardContext) {
   ((StandardContext) context).setReplaceWelcomeFiles(true);
   }
  -webDigester.setUseContextClassLoader(true);
  +webDigester.setUseContextClassLoader(false);
   webDigester.push(context);
   webDigester.parse(is);
   } else {
  @@ -497,12 +497,31 @@
   webDigester = patchXerces(webDigester);
   }
   
  -url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
  +url = ContextConfig.class.
  +getResource(Constants.WebSchemaResourcePath_24);
  +
   SchemaResolver webEntityResolver = new SchemaResolver(url.toString(),
 webDigester);
   
   if (validation) {
  -webDigester.setSchema(url.toString());
  +if (webDigester.getFactory().getClass()
  +.getName().indexOf("xerces")!=-1) {
  +try{
  +webDigester.setFeature(
  +"http://apache.org/xml/features/validation/dynamic";,
  +true);
  +webDigester.setFeature(
  +"http://apache.org/xml/features/validation/schema";,
  +true);
  +} catch(ParserConfigurationException e){
  +// log("contextConfig.registerLocalSchema", e);
  +} catch(SAXNotRecognizedException e){
  +// log("contextConfig.registerLocalSchema", e);
  +} catch(SAXNotSupportedException e){
  +// log("contextConfig.registerLocalSchema", e);
  +}
  +
  +}
   }
   
   url = ContextConfig.class.getResource(Constants.WebDtdResourcePath_22);
  
  
  
  1.29  +18 -1 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- TldConfig.java23 Sep 2003 21:37:00 -  1.28
  +++ TldConfig.java25 Sep 2003 19:27:59 -  1.29
  @@ -409,7 +409,24 @@
 tldDigester);
   
   if (xmlValidation) {
  -tldDigester.setSchema(url.toString());
  +if (tldDigester.getFactory().getClass()
  +.getName().indexOf("xerces")!=-1) {
  +try{
  +tldDigester.setFeature(
  +"http://apache.org/xml/features/validation/dynamic";,
  +true);
  +tldDigester.setFeature(
  +"http://apache.org/xml/features/validation/schema";,
  +true);
  +} catch(ParserConfigurationException e){
  +// log("contextConfig.registerLocalSchema", e);
  +} catch(SAXNotRecognizedException e){
  +// log("contextConfig.registerLocalSchema", e);
  +} catch(SAXNotSupportedException e){
  +// log("contextConfig.registerLocalSchema", e);
  +}
  +
  +}
   }
   
   url = TldConfig.class.getResource(Constants.TldDtdResourcePath_11);
  
  
  

-
To unsubscribe, e-mail:

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java TldConfig.java

[Jean-Francois Arcand]

Remy Maucherat wrote:
[EMAIL PROTECTED] wrote:

jfarcand2003/09/23 14:37:01

Modified:catalina/src/share/org/apache/catalina/startup 
ContextConfig.java TldConfig.java Log: Revert my previous patch since
it force validation even when the value is set to false (for schema).


I didn't upgrade back to X 2.5, but with X 2.1, this didn't force 
validation.

I'm sure it's a bit hard to follow for everyone. Can you do a recap on 
tomcat-dev of what's wrong with Xerces, and what is being done about it ?
Curently, schema validation doesn't work when you turns it on in 
server.xml. The problem resides in ContextConfig.java when you do 
webDigester.setSchema(). For a reason I'm trying to find, the schema 
file is not loaded by Xerces. I suspect a classloader issue but the 
validation task suffer the same problem.

I'm trying to resolve the problem right now with the jaxp team, but if 
someone wants to create a test case and file a bug againts Xerces, I 
will be more that happy. Knowing how they work, without a little test 
case, they will never looks at it ;-)

-- Jeanfrancois



Thanks,
Remy


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java TldConfig.java

[Remy Maucherat]

[EMAIL PROTECTED] wrote:

jfarcand2003/09/23 14:37:01

Modified:catalina/src/share/org/apache/catalina/startup 
ContextConfig.java TldConfig.java Log: Revert my previous patch since
it force validation even when the value is set to false (for schema).
I didn't upgrade back to X 2.5, but with X 2.1, this didn't force 
validation.

I'm sure it's a bit hard to follow for everyone. Can you do a recap on 
tomcat-dev of what's wrong with Xerces, and what is being done about it ?

Thanks,
Remy


-
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 ContextConfig.java TldConfig.java

[jfarcand]

jfarcand2003/09/23 14:37:01

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
  Log:
  Revert my previous patch since it force validation even when the value is set to 
false (for schema).
  
  Revision  ChangesPath
  1.35  +2 -5  
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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ContextConfig.java23 Sep 2003 18:43:12 -  1.34
  +++ ContextConfig.java23 Sep 2003 21:37:00 -  1.35
  @@ -459,8 +459,6 @@
   try{
   digester.setFeature(
   "http://apache.org/xml/features/allow-java-encodings";, true);
  -digester.setFeature(
  -"http://apache.org/xml/features/validation/schema";, true);
   } catch(ParserConfigurationException e){
   // log("contextConfig.registerLocalSchema", e);
   } catch(SAXNotRecognizedException e){
  @@ -492,7 +490,6 @@
   boolean validation) {
   URL url = null;
   Digester webDigester = new Digester();
  -webDigester.setUseContextClassLoader(false);
   webDigester.setNamespaceAware(namespaceAware);
   webDigester.setValidating(validation);
  
  @@ -507,7 +504,7 @@
   if (validation) {
   webDigester.setSchema(url.toString());
   }
  -
  +
   url = ContextConfig.class.getResource(Constants.WebDtdResourcePath_22);
   webEntityResolver.register(Constants.WebDtdPublicId_22,
  url.toString());
  
  
  
  1.28  +0 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- TldConfig.java23 Sep 2003 20:06:07 -  1.27
  +++ TldConfig.java23 Sep 2003 21:37:00 -  1.28
  @@ -437,8 +437,6 @@
   try{
   digester.setFeature(
   "http://apache.org/xml/features/allow-java-encodings";, true);
  -digester.setFeature(
  -"http://apache.org/xml/features/validation/schema";, true);
   } catch(ParserConfigurationException e){
   // log("contextConfig.registerLocalSchema", e);
   } catch(SAXNotRecognizedException e){
  
  
  

-
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 ContextConfig.java TldConfig.java

[jfarcand]

jfarcand2003/09/23 11:43:12

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
  Log:
  Partial fix for xml validation. At least DTD works now and the stack trace for 
schema is no longer 1 km long.
  
  Revision  ChangesPath
  1.34  +4 -1  
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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ContextConfig.java9 Sep 2003 15:27:00 -   1.33
  +++ ContextConfig.java23 Sep 2003 18:43:12 -  1.34
  @@ -459,6 +459,8 @@
   try{
   digester.setFeature(
   "http://apache.org/xml/features/allow-java-encodings";, true);
  +digester.setFeature(
  +"http://apache.org/xml/features/validation/schema";, true);
   } catch(ParserConfigurationException e){
   // log("contextConfig.registerLocalSchema", e);
   } catch(SAXNotRecognizedException e){
  @@ -490,6 +492,7 @@
   boolean validation) {
   URL url = null;
   Digester webDigester = new Digester();
  +webDigester.setUseContextClassLoader(false);
   webDigester.setNamespaceAware(namespaceAware);
   webDigester.setValidating(validation);
  
  
  
  
  1.24  +2 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TldConfig.java22 Sep 2003 23:56:11 -  1.23
  +++ TldConfig.java23 Sep 2003 18:43:12 -  1.24
  @@ -416,6 +416,8 @@
   try{
   digester.setFeature(
   "http://apache.org/xml/features/allow-java-encodings";, true);
  +digester.setFeature(
  +"http://apache.org/xml/features/validation/schema";, true);
   } catch(ParserConfigurationException e){
   // log("contextConfig.registerLocalSchema", e);
   } catch(SAXNotRecognizedException e){
  
  
  

-
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 ContextConfig.java

[remm]

remm2003/09/09 08:27:00

  Modified:catalina/src/share/org/apache/catalina Cluster.java
   catalina/src/share/org/apache/catalina/core
StandardContext.java
   catalina/src/share/org/apache/catalina/session
StandardManager.java
   catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - Refactor manager initialization, and move it into ContextConfig.
  - Remove Cluster.setDistributable.
  
  Revision  ChangesPath
  1.5   +5 -12 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Cluster.java
  
  Index: Cluster.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Cluster.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Cluster.java  16 Apr 2003 04:06:53 -  1.4
  +++ Cluster.java  9 Sep 2003 15:27:00 -   1.5
  @@ -221,13 +221,6 @@
*  the web application
*/
   public void stop(String contextPath) throws IOException;
  -
  -/**
  - * Notifies the cluster if a context is distributable or not
  - * @param contextName - the name of the registed context
  - * @param distributable - true means that the sessions will be replicated
  - */
  -public void setDistributable(String contextName, boolean distributable);
  -
  +
   
   }
  
  
  
  1.90  +8 -31 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- StandardContext.java  8 Sep 2003 15:25:18 -   1.89
  +++ StandardContext.java  9 Sep 2003 15:27:00 -   1.90
  @@ -964,12 +964,9 @@
   public void setDistributable(boolean distributable) {
   boolean oldDistributable = this.distributable;
   this.distributable = distributable;
  -if ( getCluster() != null ) 
getCluster().setDistributable(getName(),distributable);
   support.firePropertyChange("distributable",
  new Boolean(oldDistributable),
  new Boolean(this.distributable));
  -
  -
   }
   
   
  @@ -3923,7 +3920,7 @@
   }
   }
   
  -if (getLoader() == null) {  // (2) Required by Manager
  +if (getLoader() == null) {
   if (getPrivileged()) {
   if (log.isDebugEnabled())
   log.debug("Configuring privileged default Loader");
  @@ -3934,28 +3931,6 @@
   setLoader(new WebappLoader(getParentClassLoader()));
   }
   }
  -if (getManager() == null) { // (3) After prerequisites
  -if (log.isDebugEnabled())
  -log.debug("Configuring default Manager");
  -if (getCluster() != null) {
  -try {
  -//The setDistributable is set after the context is started, 
hence 
  -//this doesn't work :(
  -//if ( this.getDistributable() ) {
  -log.debug("Creating clustering manager for 
context="+getName());
  -setManager(getCluster().createManager(getName()));
  -//} else {
  -//log.info("Ignoring clustering manager for 
context="+getName()+ " element  not present in web.xml");
  -//setManager(new StandardManager());
  -//}
  -} catch ( Exception x ) {
  -log.warn("Clustering disabled for context:"+getName()+" 
reason:"+x.getMessage());
  -setManager(new StandardManager());
  -}
  -} else {
  -setManager(new StandardManager());
  -}
  -}
   
   // Initialize character set mapper
   getCharsetMapper();
  @@ -4045,8 +4020,10 @@
   // Read tldListeners. XXX Option to disable
   TldConfig tldConfig = new TldConfig();
   tldConfig.setContext(this);
  -tldConfig.setXmlValidation(((StandardHost) 
getParent()).getXmlValidation());
  -tldConfig.setXmlNamespaceAware(((StandardHost) 
getParent()).getXmlNamespaceAware());
  +tldConfig.setXmlValidation
  +(((StandardHost) getParent()).getXmlValidation());
  +tldConfig.setXmlNamespaceAware
  +(((StandardHost) getParent()).getXmlNamespaceAware());
   tr

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java TldConfig.java

[remm]

remm2003/08/26 01:39:59

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
  Log:
  - Reenable validation (there are still problems validating TLDs, even with
Xerces 2.1).
  
  Revision  ChangesPath
  1.31  +2 -3  
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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ContextConfig.java20 Aug 2003 08:35:43 -  1.30
  +++ ContextConfig.java26 Aug 2003 08:39:59 -  1.31
  @@ -493,8 +493,7 @@
   SchemaResolver webEntityResolver = new SchemaResolver(url.toString(),
 webDigester);
   
  -// FIXME: if (validation) {
  -if (false) {
  +if (validation) {
   webDigester.setSchema(url.toString());
   }
   
  
  
  
  1.19  +1 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- TldConfig.java26 Aug 2003 07:17:43 -  1.18
  +++ TldConfig.java26 Aug 2003 08:39:59 -  1.19
  @@ -388,8 +388,7 @@
   SchemaResolver tldEntityResolver = new SchemaResolver(url.toString(), 
 tldDigester);
   
  -// FIXME: if (xmlValidation) {
  -if (false) {
  +if (xmlValidation) {
   tldDigester.setSchema(url.toString());
   }
   
  
  
  

-
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 ContextConfig.java TldConfig.java

[remm]

remm2003/08/20 01:35:43

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
  Log:
  - Disable schema validation for now.
  - Validation attempts of 2.4 style web.xml or TLD files will fail.
  
  Revision  ChangesPath
  1.30  +4 -2  
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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- ContextConfig.java18 Aug 2003 17:44:20 -  1.29
  +++ ContextConfig.java20 Aug 2003 08:35:43 -  1.30
  @@ -492,7 +492,9 @@
   url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
   SchemaResolver webEntityResolver = new SchemaResolver(url.toString(),
 webDigester);
  -if (validation) {
  +
  +// FIXME: if (validation) {
  +if (false) {
   webDigester.setSchema(url.toString());
   }
   
  
  
  
  1.16  +3 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- TldConfig.java12 Aug 2003 16:15:52 -  1.15
  +++ TldConfig.java20 Aug 2003 08:35:43 -  1.16
  @@ -381,7 +381,9 @@
   url = TldConfig.class.getResource(Constants.TldSchemaResourcePath_20);
   SchemaResolver tldEntityResolver = new SchemaResolver(url.toString(), 
 tldDigester);
  -if( xmlValidation ) {
  +
  +// FIXME: if (xmlValidation) {
  +if (false) {
   tldDigester.setSchema(url.toString());
   }
   
  
  
  

-
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 ContextConfig.java

[remm]

remm2003/08/18 10:44:20

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - Fix cut & paste bug.
  - Schema validation is now consistently broken between the deployer validator
task and the integrated Tomcat validation.
  - I'll disable schema validation in 5.0.8 if this is not fixed.
  
  Revision  ChangesPath
  1.29  +3 -3  
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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ContextConfig.java19 Jul 2003 16:13:36 -  1.28
  +++ ContextConfig.java18 Aug 2003 17:44:20 -  1.29
  @@ -67,7 +67,7 @@
   import java.io.FileNotFoundException;
   import java.io.InputStream;
   import java.io.IOException;
  -import java.net.JarURLConnection;
  +import java.net.URLConnection;
   import java.net.URL;
   import java.util.Enumeration;
   import java.util.HashSet;
  @@ -492,7 +492,7 @@
   url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
   SchemaResolver webEntityResolver = new SchemaResolver(url.toString(),
 webDigester);
  -if( xmlValidation ) {
  +if (validation) {
   webDigester.setSchema(url.toString());
   }
   
  
  
  

-
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 ContextConfig.java

[remm]

remm2003/07/19 09:13:36

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - Like some of the other resources, application parameters must not be reset
on a context stop, as they come from a  element. Regular parameters
read from web.xml should be fine.
  
  Revision  ChangesPath
  1.28  +3 -1  
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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ContextConfig.java15 Jun 2003 07:41:12 -  1.27
  +++ ContextConfig.java19 Jul 2003 16:13:36 -  1.28
  @@ -775,12 +775,14 @@
   }
   
   // Removing application parameters
  +/*
   ApplicationParameter[] applicationParameters =
   context.findApplicationParameters();
   for (i = 0; i < applicationParameters.length; i++) {
   context.removeApplicationParameter
   (applicationParameters[i].getName());
   }
  +*/
   
   // Removing security constraints
   SecurityConstraint[] securityConstraints = context.findConstraints();
  
  
  

-
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 ContextConfig.java TldConfig.java

[remm]

remm2003/06/15 00:41:12

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java TldConfig.java
  Log:
  - Address bug 20758.
  - Cleanup digester after processing.
  
  Revision  ChangesPath
  1.27  +3 -5  
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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ContextConfig.java6 Jun 2003 02:46:41 -   1.26
  +++ ContextConfig.java15 Jun 2003 07:41:12 -  1.27
  @@ -309,14 +309,11 @@
   if( url!=null ) {
   InputSource is = new InputSource(url.toExternalForm());
   is.setByteStream(stream);
  +webDigester.clear();
   webDigester.setDebug(getDebug());
   if (context instanceof StandardContext) {
   ((StandardContext) context).setReplaceWelcomeFiles(true);
   }
  -webDigester.clear();
  -//ClassLoader cl=Thread.currentThread().getContextClassLoader();
  -//if( cl!=null )
  -//webDigester.setClassLoader(cl);
   webDigester.setUseContextClassLoader(true);
   webDigester.push(context);
   webDigester.parse(is);
  @@ -340,6 +337,7 @@
   } catch (IOException e) {
   log.error(sm.getString("contextConfig.applicationClose"), e);
   }
  +webDigester.push(null);
   }
   }
   webRuleSet.recycle();
  
  
  
  1.12  +7 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
  
  Index: TldConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TldConfig.java12 Jun 2003 22:41:19 -  1.11
  +++ TldConfig.java15 Jun 2003 07:41:12 -  1.12
  @@ -533,9 +533,13 @@
   }
   
   synchronized (tldDigester) {
  -tldDigester.clear();
  -tldDigester.push(this);
  -tldDigester.parse(resourceStream);
  +try {
  +tldDigester.push(this);
  +tldDigester.parse(resourceStream);
  +} finally {
  +tldDigester.push(null);
  +tldDigester.clear();
  +}
   }
   
   }
  
  
  

-
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 ContextConfig.java

[costin]

costin  2003/03/20 15:33:44

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  No default web.xml.
  
  We should pack the default ( or a minimized ) web.xml in catalina.jar ( but not
  in root - probably o/a/c/deploy ).
  
  Revision  ChangesPath
  1.22  +10 -4 
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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ContextConfig.java12 Mar 2003 21:19:26 -  1.21
  +++ ContextConfig.java20 Mar 2003 23:33:44 -  1.22
  @@ -660,9 +660,15 @@
   // Use getResource and getResourceAsStream
   stream = getClass().getClassLoader()
   .getResourceAsStream(defaultWebXml);
  -source = new InputSource
  -(getClass().getClassLoader()
  - .getResource(defaultWebXml).toString());
  +if( stream != null ) {
  +source = new InputSource
  +(getClass().getClassLoader()
  +.getResource(defaultWebXml).toString());
  +} else {
  +log.info("No default web.xml");
  +// no default web.xml
  +return;
  +}
   } else {
   source =
   new InputSource("file://" + file.getAbsolutePath());
  
  
  

-
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 ContextConfig.java

[remm]

remm2003/03/12 13:19:26

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - Also use the CL to load the default config.
  
  Revision  ChangesPath
  1.21  +19 -18
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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ContextConfig.java12 Mar 2003 07:12:28 -  1.20
  +++ ContextConfig.java12 Mar 2003 21:19:26 -  1.21
  @@ -653,20 +653,24 @@
   }
   
   InputStream stream = null;
  -//if( ! file.exists() ) {
  -// try using resource ??
  +InputSource source = null;
   
  -//}
   try {
  -// XXX why all this instead of exists() ?
  -stream = new FileInputStream(file.getCanonicalPath());
  -stream.close();
  -stream = null;
  -} catch (FileNotFoundException e) {
  -log.error(sm.getString("contextConfig.defaultMissing") + " " + file);
  -return;
  -} catch (IOException e) {
  -log.error(sm.getString("contextConfig.defaultMissing") + " " + file , 
e);
  +if ( ! file.exists() ) {
  +// Use getResource and getResourceAsStream
  +stream = getClass().getClassLoader()
  +.getResourceAsStream(defaultWebXml);
  +source = new InputSource
  +(getClass().getClassLoader()
  + .getResource(defaultWebXml).toString());
  +} else {
  +source =
  +new InputSource("file://" + file.getAbsolutePath());
  +stream = new FileInputStream(file);
  +}
  +} catch (Exception e) {
  +log.error(sm.getString("contextConfig.defaultMissing") 
  +  + " " + defaultWebXml + " " + file , e);
   return;
   }
   
  @@ -677,10 +681,7 @@
   // Process the default web.xml file
   synchronized (webDigester) {
   try {
  -InputSource is =
  -new InputSource("file://" + file.getAbsolutePath());
  -stream = new FileInputStream(file);
  -is.setByteStream(stream);
  +source.setByteStream(stream);
   webDigester.setDebug(getDebug());
   
   if (context instanceof StandardContext)
  @@ -690,7 +691,7 @@
   //log.info( "Using cl: " + webDigester.getClassLoader());
   webDigester.setUseContextClassLoader(false);
   webDigester.push(context);
  -webDigester.parse(is);
  +webDigester.parse(source);
   } catch (SAXParseException e) {
   log.error(sm.getString("contextConfig.defaultParse"), e);
   log.error(sm.getString("contextConfig.defaultPosition",
  
  
  

-
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 ContextConfig.java

[costin]

costin  2003/03/11 23:12:28

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - cleanup imports
  - use a normal properties for authenticators - what's with the resource bundle ???
  - use the cleaner API in digester to use the thread CL
  - remove the debug message for timing - the info will be visible in JMX
  - use getBaseDir and check the engine - instead of system property ( that's the 
fallback)
  - use the container class loader when loading the default web.xml
  
  Revision  ChangesPath
  1.20  +59 -48
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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ContextConfig.java5 Mar 2003 21:42:22 -   1.19
  +++ ContextConfig.java12 Mar 2003 07:12:28 -  1.20
  @@ -67,19 +67,13 @@
   import java.io.FileNotFoundException;
   import java.io.InputStream;
   import java.io.IOException;
  -import java.lang.reflect.InvocationTargetException;
  -import java.lang.reflect.Method;
   import java.net.JarURLConnection;
  -import java.net.MalformedURLException;
   import java.net.URL;
  -import java.util.ArrayList;
   import java.util.Enumeration;
   import java.util.HashSet;
   import java.util.Iterator;
  -import java.util.MissingResourceException;
  -import java.util.ResourceBundle;
   import java.util.Set;
  -import java.util.Stack;
  +import java.util.Properties;
   import java.util.jar.JarEntry;
   import java.util.jar.JarFile;
   import javax.naming.NamingException;
  @@ -94,9 +88,7 @@
   import org.apache.catalina.Connector;
   import org.apache.catalina.Container;
   import org.apache.catalina.Context;
  -import org.apache.catalina.DefaultContext;
   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;
  @@ -108,12 +100,8 @@
   import org.apache.catalina.Wrapper;
   import org.apache.catalina.core.ContainerBase;
   import org.apache.catalina.core.StandardContext;
  +import org.apache.catalina.core.StandardEngine;
   import org.apache.catalina.deploy.ApplicationParameter;
  -import org.apache.catalina.deploy.ContextEjb;
  -import org.apache.catalina.deploy.ContextEnvironment;
  -import org.apache.catalina.deploy.ContextLocalEjb;
  -import org.apache.catalina.deploy.ContextResource;
  -import org.apache.catalina.deploy.ContextResourceLink;
   import org.apache.catalina.deploy.ErrorPage;
   import org.apache.catalina.deploy.FilterDef;
   import org.apache.catalina.deploy.FilterMap;
  @@ -121,10 +109,8 @@
   import org.apache.catalina.deploy.SecurityConstraint;
   import org.apache.catalina.util.StringManager;
   import org.apache.catalina.util.SchemaResolver;
  -import org.apache.catalina.valves.ValveBase;
   import org.apache.commons.digester.Digester;
   import org.xml.sax.InputSource;
  -import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXNotRecognizedException;
   import org.xml.sax.SAXNotSupportedException;
   import org.xml.sax.SAXParseException;
  @@ -151,7 +137,7 @@
* the name of the implemented authentication method, and the value is
* the fully qualified Java class name of the corresponding Valve.
*/
  -private static ResourceBundle authenticators = null;
  +private static Properties authenticators = null;
   
   
   /**
  @@ -169,7 +155,7 @@
   /**
* The default web application's deployment descriptor location.
*/
  -private String defaultWebXml = Constants.DefaultWebXml;
  +private String defaultWebXml = null;
   
   
   /**
  @@ -244,7 +230,7 @@
* Return the location of the default deployment descriptor
*/
   public String getDefaultWebXml() {
  -
  +if( defaultWebXml == null ) defaultWebXml=Constants.DefaultWebXml;
   return (this.defaultWebXml);
   
   }
  @@ -334,6 +320,10 @@
   ((StandardContext) context).setReplaceWelcomeFiles(true);
   }
   webDigester.clear();
  +//ClassLoader cl=Thread.currentThread().getContextClassLoader();
  +//if( cl!=null )
  +//webDigester.setClassLoader(cl);
  +webDigester.setUseContextClassLoader(true);
   webDigester.push(context);
   webDigester.parse(is);
   } else {
  @@ -361,10 +351,9 @@
   webRuleSet.recycle();
   
   long t2=System.currentTimeMillis();
  -if( (t2-t1 ) > 200 ) 
  -log.debug("Processed  " + url + " "  + ( 

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java WebRuleSet.java

[jfarcand]

jfarcand2003/03/05 13:42:22

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java WebRuleSet.java
  Log:
  New Servlet 2.4 PDF 2 features:
  
  - remove web.xml extensibility support
  - add support for SRV.12.3:
  
  
  The sub elements under web-app can be in an arbitrary order in this version of the 
specification. Because of the restriction of XML Schema, The multiplicity of the 
elements distributable, session-config, welcome-file-list, jsp-config, login-config, 
and locale-encoding-mapping-list was changed from optional to 0 or more. The 
containers must inform the developer with a descriptive error message when the 
deployment descriptor contains more than one element of session-config, jsp-con-fig, 
and login-config. The container must concatenate the items in welcome-file-list and 
locale-encoding-mapping-list when there are multiple occurrences. The multiple 
occurrence of distributable must be treated exactly in the same way as the single 
occurrence of distributable.
  
  
  Revision  ChangesPath
  1.19  +12 -2 
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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ContextConfig.java29 Jan 2003 23:02:38 -  1.18
  +++ ContextConfig.java5 Mar 2003 21:42:22 -   1.19
  @@ -196,6 +196,12 @@
* deployment descriptor files.
*/
   private static Digester webDigester = null;
  +
  +
  +/**
  + * The Rule used to parse the web.xml
  + */
  +private static WebRuleSet webRuleSet = new WebRuleSet();
   
   /**
* Attribute value used to turn on/off XML validation
  @@ -352,6 +358,8 @@
   }
   }
   }
  +webRuleSet.recycle();
  +
   long t2=System.currentTimeMillis();
   if( (t2-t1 ) > 200 ) 
   log.debug("Processed  " + url + " "  + ( t2-t1));
  @@ -619,7 +627,7 @@
   webEntityResolver = registerLocalSchema(webEntityResolver);
   
   webDigester.setEntityResolver(webEntityResolver);
  -webDigester.addRuleSet(new WebRuleSet());
  +webDigester.addRuleSet(webRuleSet);
   return (webDigester);
   }
   
  @@ -686,6 +694,8 @@
   }
   }
   }
  +webRuleSet.recycle();
  +
   long t2=System.currentTimeMillis();
   if( (t2-t1) > 200 )
   log.debug("Processed default web.xml " + file + " "  + ( t2-t1));
  
  
  
  1.8   +93 -27
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java
  
  Index: WebRuleSet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/WebRuleSet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WebRuleSet.java   23 Aug 2002 14:54:48 -  1.7
  +++ WebRuleSet.java   5 Mar 2003 21:42:22 -   1.8
  @@ -91,6 +91,24 @@
* The matching pattern prefix to use for recognizing our elements.
*/
   protected String prefix = null;
  +
  +
  +/**
  + * The SetSessionConfig rule used to parse the web.xml
  + */
  +protected SetSessionConfig sessionConfig;
  +
  +
  +/**
  + * The SetLoginConfig rule used to parse the web.xml
  + */
  +protected SetLoginConfig loginConfig;
  +
  +
  +/**
  + * The SetJspConfig rule used to parse the web.xml
  + */
  +protected SetJspConfig jspConfig;
   
   
   //  Constructor
  @@ -136,7 +154,10 @@
*  should be added.
*/
   public void addRuleInstances(Digester digester) {
  -
  +sessionConfig = new SetSessionConfig(digester);
  +jspConfig = new SetJspConfig(digester);
  +loginConfig = new SetLoginConfig(digester);
  +
   digester.addRule(prefix + "web-app",
new SetPublicIdRule(digester, "setPublicId"));
   
  @@ -145,9 +166,6 @@
   digester.addCallParam(prefix + "web-app/context-param/param-name", 0);
   digester.addCallParam(prefix + "web-app/context-param/param-value", 1);
   
  -digester.addRule(prefix + "web-app/deployment-extension",
  - new CheckDeploymentExtensionRule(digester));
  -
   digester.addCallMethod(prefix + "web-app/display-name",
  "setDisplayName", 0);
   
  @@ -264,12 +282,18 @@
   
digester.addCallMethod(prefix + "web-app/listener/listener-class"

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[amyroh]

amyroh  2003/01/29 15:02:38

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  Fix bugzilla  7564 - Avoid hardcoding the default deployment descriptor location.
  
  Revision  ChangesPath
  1.18  +35 -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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ContextConfig.java16 Jan 2003 21:44:17 -  1.17
  +++ ContextConfig.java29 Jan 2003 23:02:38 -  1.18
  @@ -165,7 +165,13 @@
*/
   private int debug = 0;
   
  -
  +
  +/**
  + * The default web application's deployment descriptor location.
  + */
  +private String defaultWebXml = Constants.DefaultWebXml;
  +
  +
   /**
* Track any fatal errors during startup configuration processing.
*/
  @@ -202,7 +208,7 @@
*/
   private static boolean xmlNamespaceAware = false;
   
  -
  +
   // - Properties
   
   
  @@ -226,6 +232,28 @@
   this.debug = debug;
   
   }
  +
  +
  +/**
  + * Return the location of the default deployment descriptor
  + */
  +public String getDefaultWebXml() {
  +
  +return (this.defaultWebXml);
  +
  +}
  +
  +
  +/**
  + * Set the location of the default deployment descriptor
  + *
  + * @param path Absolute/relative path to the default web.xml
  + */
  +public void setDefaultWebXml(String path) {
  +
  +this.defaultWebXml = path;
  +
  +}
   
   
   // - Public Methods
  @@ -603,10 +631,11 @@
   long t1=System.currentTimeMillis();
   
   // Open the default web.xml file, if it exists
  -File file = new File(Constants.DefaultWebXml);
  -if (!file.isAbsolute())
  +File file = new File(this.defaultWebXml);
  +if (!file.isAbsolute()) {
   file = new File(System.getProperty("catalina.base"),
  -Constants.DefaultWebXml);
  +this.defaultWebXml);
  +}
   FileInputStream stream = null;
   try {
   stream = new FileInputStream(file.getCanonicalPath());
  
  
  

-
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 ContextConfig.java

[costin]

costin  2003/01/16 13:44:18

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  Better messages ( I hope )
  
  Revision  ChangesPath
  1.17  +10 -13
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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ContextConfig.java29 Oct 2002 08:21:29 -  1.16
  +++ ContextConfig.java16 Jan 2003 21:44:17 -  1.17
  @@ -1,7 +1,4 @@
   /*
  - * $Header$
  - * $Revision$
  - * $Date$
*
* 
*
  @@ -413,7 +410,8 @@
   Pipeline pipeline = ((ContainerBase) context).getPipeline();
   if (pipeline != null) {
   ((ContainerBase) context).addValve(authenticator);
  -log.info(sm.getString("contextConfig.authenticatorConfigured",
  +if( log.isDebugEnabled() )
  +
log.debug(sm.getString("contextConfig.authenticatorConfigured",
loginConfig.getAuthMethod()));
   }
   }
  @@ -491,6 +489,7 @@
   ((ContainerBase) context).addValve(certificates);
   log.error(sm.getString
   ("contextConfig.certificatesConfig.added"));
  +
   }
   }
   } catch (Throwable t) {
  @@ -565,7 +564,6 @@
* web application deployment descriptor (web.xml).
*/
   private static Digester createWebDigester() {
  -long t1=System.currentTimeMillis();
   URL url = null;
   Digester webDigester = new Digester();
   webDigester.setNamespaceAware(xmlNamespaceAware);
  @@ -594,8 +592,6 @@
   
   webDigester.setEntityResolver(webEntityResolver);
   webDigester.addRuleSet(new WebRuleSet());
  -long t2=System.currentTimeMillis();
  -//log.info("Create web digester " + ( t2-t1));
   return (webDigester);
   }
   
  @@ -1071,14 +1067,15 @@
   // FIXME - Closing the JAR file messes up the class loader???
   //jarFile.close();
   } catch (Exception e) {
  +// XXX Why do we wrap it ? The signature is 'throws Exception'
   if (name == null) {
   throw new ServletException
   (sm.getString("contextConfig.tldJarException",
  -  resourcePath), e);
  +  resourcePath, context.getPath()), e);
   } else {
   throw new ServletException
   (sm.getString("contextConfig.tldEntryException",
  -  name, resourcePath), e);
  +  name, resourcePath, context.getPath()), e);
   }
   } finally {
   if (inputStream != null) {
  @@ -1156,9 +1153,9 @@
   inputStream.close();
   inputStream = null;
   } catch (Exception e) {
  -throw new ServletException
  -(sm.getString("contextConfig.tldFileException", resourcePath),
  - e);
  + throw new ServletException
  + (sm.getString("contextConfig.tldFileException", resourcePath, 
context.getPath()),
  +  e);
   } finally {
   if (inputStream != null) {
   try {
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[remm]

remm2002/10/29 00:21:29

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  - Port patch.
  
  Revision  ChangesPath
  1.16  +5 -5  
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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ContextConfig.java7 Oct 2002 17:41:43 -   1.15
  +++ ContextConfig.java29 Oct 2002 08:21:29 -  1.16
  @@ -1201,7 +1201,7 @@
   // FIXME - Servlet 2.4 DTD implies that the location MUST be
   // a context-relative path starting with '/'?
   if (!resourcePath.startsWith("/")) {
  -resourcePath = "/WEB-INF/web.xml/../" + resourcePath;
  +resourcePath = "/WEB-INF/" + resourcePath;
   }
   if (log.isTraceEnabled()) {
   log.trace("   Adding path '" + resourcePath +
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java Catalina.java

[bobh]

bobh2002/09/10 20:24:05

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java Catalina.java
  Log:
  - This quick fix allows compiling in my environment
  
  Revision  ChangesPath
  1.13  +6 -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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ContextConfig.java10 Sep 2002 19:40:25 -  1.12
  +++ ContextConfig.java11 Sep 2002 03:24:05 -  1.13
  @@ -329,7 +329,7 @@
   }
   long t2=System.currentTimeMillis();
   if( (t2-t1 ) > 200 ) 
  -log.log("Processed  " + url + " "  + ( t2-t1));
  +log.info("Processed  " + url + " "  + ( t2-t1));
   
   
   }
  @@ -663,7 +663,7 @@
   }
   long t2=System.currentTimeMillis();
   if( (t2-t1) > 200 )
  -log.log("Processed default web.xml " + file + " "  + ( t2-t1));
  +log.info("Processed default web.xml " + file + " "  + ( t2-t1));
   }
   
   
  
  
  
  1.4   +7 -7  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Catalina.java 10 Sep 2002 19:41:40 -  1.3
  +++ Catalina.java 11 Sep 2002 03:24:05 -  1.4
  @@ -363,7 +363,7 @@
 parentClassLoader));
   
   long t2=System.currentTimeMillis();
  -log.log("Digester for server.xml created " + ( t2-t1 ));
  +log.info("Digester for server.xml created " + ( t2-t1 ));
   return (digester);
   
   }
  @@ -456,7 +456,7 @@
   System.exit(1);
   }
   long t2=System.currentTimeMillis();
  -log.log( "Server.xml processed " + (t2-t1 ));
  +log.info( "Server.xml processed " + (t2-t1 ));
   
   // Setting additional variables
   if (!useNaming) {
  @@ -515,7 +515,7 @@
   server.initialize();
   ((Lifecycle) server).start();
   long t4=System.currentTimeMillis();
  -log.log( "server.start " + server + " " + (t4-t3 ));
  +log.info( "server.start " + server + " " + (t4-t3 ));
   try {
   // Register shutdown hook
   Runtime.getRuntime().addShutdownHook(shutdownHook);
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[Steve Downey]

Broken build, please revert this. Log has no log method. 
(Second time today. Bound to happen once in while.)


On Tuesday 10 September 2002 03:40 pm, [EMAIL PROTECTED] wrote:
> jfarcand2002/09/10 12:40:25
>
>   Modified:catalina/src/share/org/apache/catalina/startup
> ContextConfig.java
>   Log:
>   Change the logging levelo from Info to Log when performance information
> are displayed.CVS:
> --


--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[jfarcand]

jfarcand2002/09/10 12:40:25

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  Change the logging levelo from Info to Log when performance information are 
displayed.CVS: --
  
  Revision  ChangesPath
  1.12  +6 -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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ContextConfig.java24 Aug 2002 02:27:27 -  1.11
  +++ ContextConfig.java10 Sep 2002 19:40:25 -  1.12
  @@ -329,7 +329,7 @@
   }
   long t2=System.currentTimeMillis();
   if( (t2-t1 ) > 200 ) 
  -log.info("Processed  " + url + " "  + ( t2-t1));
  +log.log("Processed  " + url + " "  + ( t2-t1));
   
   
   }
  @@ -663,7 +663,7 @@
   }
   long t2=System.currentTimeMillis();
   if( (t2-t1) > 200 )
  -log.info("Processed default web.xml " + file + " "  + ( t2-t1));
  +log.log("Processed default web.xml " + file + " "  + ( t2-t1));
   }
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[costin]

costin  2002/08/20 20:24:37

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  Patch from Jean-Francois Arcand to turn off validation.
  
  Also:
  -  start using commons-logging
  -  report the processing time for expensive operations ( right now a
  hard-coded limit of 200 ms ).
  
  Revision  ChangesPath
  1.10  +161 -109  
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ContextConfig.java20 Aug 2002 03:26:36 -  1.9
  +++ ContextConfig.java21 Aug 2002 03:24:37 -  1.10
  @@ -145,10 +145,11 @@
   public final class ContextConfig
   implements LifecycleListener {
   
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( ContextConfig.class );
   
   // - Instance Variables
   
  -
   /**
* The set of Authenticators that we know how to configure.  The key is
* the name of the implemented authentication method, and the value is
  @@ -181,21 +182,31 @@
   private static final StringManager sm =
   StringManager.getManager(Constants.Package);
   
  -
   /**
* The Digester we will use to process tag library
* descriptor files.
*/
  -private static Digester tldDigester = createTldDigester();
  +private static Digester tldDigester = null;
   
   
   /**
* The Digester we will use to process web application
* deployment descriptor files.
*/
  -private static Digester webDigester = createWebDigester();
  +private static Digester webDigester = null;
   
  +/**
  + * Attribute value used to turn on/off XML validation
  + */
  + private static boolean xmlValidation = false;
   
  +
  +/**
  + * Attribute value used to turn on/off XML namespace awarenes.
  + */
  +private static boolean xmlNamespaceAware = false;
  +
  +
   // - Properties
   
   
  @@ -234,16 +245,17 @@
   // Identify the context we are associated with
   try {
   context = (Context) event.getLifecycle();
  -if (context instanceof StandardContext) {
  -int contextDebug = ((StandardContext) context).getDebug();
  -if (contextDebug > this.debug)
  -this.debug = contextDebug;
  -}
  +// if (context instanceof StandardContext) {
  +// int contextDebug = ((StandardContext) context).getDebug();
  +// if (contextDebug > this.debug)
  +// this.debug = contextDebug;
  +// }
   } catch (ClassCastException e) {
  -log(sm.getString("contextConfig.cce", event.getLifecycle()), e);
  +log.error(sm.getString("contextConfig.cce", event.getLifecycle()), e);
   return;
   }
   
  +// Called from ContainerBase.addChild() -> StandardContext.start()
   // Process the event that has occurred
   if (event.getType().equals(Lifecycle.START_EVENT))
   start();
  @@ -268,35 +280,43 @@
   stream = servletContext.getResourceAsStream
   (Constants.ApplicationWebXml);
   if (stream == null) {
  -log(sm.getString("contextConfig.applicationMissing"));
  +log.error(sm.getString("contextConfig.applicationMissing") + " " + 
context);
   return;
   }
  +
  +long t1=System.currentTimeMillis();
   
  +if (webDigester == null){
  +webDigester = createWebDigester();
  +}
  +
  +URL url=null;
   // Process the application web.xml file
   synchronized (webDigester) {
   try {
  -URL url =
  +url =
   servletContext.getResource(Constants.ApplicationWebXml);
  -
  -InputSource is = new InputSource(url.toExternalForm());
  -is.setByteStream(stream);
  -webDigester.setDebug(getDebug());
  -if (context instanceof StandardContext) {
  -((StandardContext) context).setReplaceWelcomeFiles(true);
  +if( url!=null ) {
  +InputSource is = new InputSource(url.toExternalForm());
  +is.setByteStream(stream);
  +webDigester.setDebug(getDebug());
  +if (context instanceof StandardC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java

[amyroh]

amyroh  2002/08/02 18:02:07

  Modified:catalina/src/share/org/apache/catalina/startup
ContextConfig.java
  Log:
  Clean up the code and turn on automatically namespace validation when using schema.
  
  Patch submitted by Jean-francois Arcand.
  
  Revision  ChangesPath
  1.5   +9 -12 
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContextConfig.java1 Aug 2002 04:53:03 -   1.4
  +++ ContextConfig.java3 Aug 2002 01:02:07 -   1.5
  @@ -496,10 +496,6 @@
   tldDigester.register(Constants.J2eeSchemaPublicId_14,
url.toString());
   
  -url = ContextConfig.class.getResource(Constants.W3cSchemaResourcePath_10);
  -tldDigester.register(Constants.W3cSchemaPublicId_10,
  - url.toString());
  -
   url = ContextConfig.class.getResource(Constants.JspSchemaResourcePath_20);
   tldDigester.register(Constants.JspSchemaPublicId_20,
url.toString());
  @@ -512,6 +508,10 @@
   tldDigester.register(Constants.TldSchemaPublicId_20,
url.toString());
   
  +url = ContextConfig.class.getResource(Constants.WebSchemaResourcePath_24);
  +tldDigester.register(Constants.WebSchemaPublicId_24,
  + url.toString());
  +
   tldDigester.addRuleSet(new TldRuleSet());
   return (tldDigester);
   
  @@ -526,6 +526,7 @@
   
   URL url = null;
   Digester webDigester = new Digester();
  +webDigester.setNamespaceAware(true);
   webDigester.setValidating(true);
   url = ContextConfig.class.getResource(Constants.WebDtdResourcePath_22);
   webDigester.register(Constants.WebDtdPublicId_22,
  @@ -555,10 +556,6 @@
   
   url = ContextConfig.class.getResource(Constants.JspSchemaResourcePath_20);
   webDigester.register(Constants.JspSchemaPublicId_20,
  - url.toString());
  -
  -url = ContextConfig.class.getResource(Constants.W3cSchemaResourcePath_10);
  -webDigester.register(Constants.W3cSchemaPublicId_10,
url.toString());
   
   url = ContextConfig.class.getResource(Constants.TldSchemaResourcePath_20);
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: