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

2001-04-21 Thread Craig R. McClanahan 



On Sat, 21 Apr 2001, Torgeir Veimo wrote:

> [EMAIL PROTECTED] wrote:
> > 
> > craigmcc01/04/18 11:59:30
> > 
> >   Modified:catalina/src/share/org/apache/catalina/startup Catalina.java
> > ContextConfig.java EngineConfig.java
> > HostConfig.java
> >   Log:
> >   Catalina:  Restore the recognition of , , and 
> >   elements nested inside a .  They were only being recognized
> >   inside a .
> > 
> >   {Context,Engine,Host}Config: Inherit the debugging detail level of the
> >   owning component to assist in debugging problems like this.
> > 
> >   PR: Bugzilla #1370
> >   Submitted by: Larry Karnowski <[EMAIL PROTECTED]>
> 
> Does this mean that one can now use a Context specific Realm,

Yes, but ...

> that lives
> in the same classloader as the rest of the context?
> 

the Realm implementation class needs to live in "server/classes" or in a
JAR file in "server/lib", because it has to be loaded by the Catalina
class loader.  Such classes are not visible to the web app class loader.

> -- 
> - Torgeir
> 

Craig

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

2001-04-21 Thread Torgeir Veimo 

[EMAIL PROTECTED] wrote:
> 
> craigmcc01/04/18 11:59:30
> 
>   Modified:catalina/src/share/org/apache/catalina/startup Catalina.java
> ContextConfig.java EngineConfig.java
> HostConfig.java
>   Log:
>   Catalina:  Restore the recognition of , , and 
>   elements nested inside a .  They were only being recognized
>   inside a .
> 
>   {Context,Engine,Host}Config: Inherit the debugging detail level of the
>   owning component to assist in debugging problems like this.
> 
>   PR: Bugzilla #1370
>   Submitted by: Larry Karnowski <[EMAIL PROTECTED]>

Does this mean that one can now use a Context specific Realm, that lives
in the same classloader as the rest of the context?

-- 
- Torgeir

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

2001-04-18 Thread craigmcc 

craigmcc01/04/18 11:59:30

  Modified:catalina/src/share/org/apache/catalina/startup Catalina.java
ContextConfig.java EngineConfig.java
HostConfig.java
  Log:
  Catalina:  Restore the recognition of , , and 
  elements nested inside a .  They were only being recognized
  inside a .
  
  {Context,Engine,Host}Config: Inherit the debugging detail level of the
  owning component to assist in debugging problems like this.
  
  PR: Bugzilla #1370
  Submitted by: Larry Karnowski <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  1.20  +43 -37
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Catalina.java 2001/04/07 10:26:05 1.19
  +++ Catalina.java 2001/04/18 18:59:22 1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
 1.19 2001/04/07 10:26:05 kief Exp $
  - * $Revision: 1.19 $
  - * $Date: 2001/04/07 10:26:05 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
 1.20 2001/04/18 18:59:22 craigmcc Exp $
  + * $Revision: 1.20 $
  + * $Date: 2001/04/18 18:59:22 $
*
* 
*
  @@ -97,7 +97,7 @@
* 
*
* @author Craig R. McClanahan
  - * @version $Revision: 1.19 $ $Date: 2001/04/07 10:26:05 $
  + * @version $Revision: 1.20 $ $Date: 2001/04/18 18:59:22 $
*/
   
   public class Catalina {
  @@ -454,7 +454,9 @@
"configClass"));
mapper.addRule(prefix + "", mapper.addChild
   ("addChild", "org.apache.catalina.Container"));
  +
createContextCommon(prefix, mapper);
  +
   }
   
   
  @@ -474,28 +476,9 @@
   mapper.addRule(prefix + "", mapper.setProperties());
mapper.addRule(prefix + "", mapper.addChild
  ("addDefaultContext", 
"org.apache.catalina.core.DefaultContext"));
  -mapper.addRule(prefix + "/Logger", mapper.objectCreate
  -   (null, "className"));
  -mapper.addRule(prefix + "/Logger",
  -   mapper.setProperties());
  -mapper.addRule(prefix + "/Logger", mapper.addChild
  -   ("setLogger", "org.apache.catalina.Logger"));
  -
  -mapper.addRule(prefix + "/Realm", mapper.objectCreate
  -   (null, "className"));
  -mapper.addRule(prefix + "/Realm",
  -   mapper.setProperties());
  -mapper.addRule(prefix + "/Realm", mapper.addChild
  -   ("setRealm", "org.apache.catalina.Realm"));
  -
  -mapper.addRule(prefix + "/Valve", mapper.objectCreate
  -   (null, "className"));
  -mapper.addRule(prefix + "/Valve",
  -   mapper.setProperties());
  -mapper.addRule(prefix + "/Valve", mapper.addChild
  -   ("addValve", "org.apache.catalina.Valve"));
   
   createContextCommon(prefix, mapper);
  +
   }
   
   
  @@ -507,19 +490,6 @@
* @param mapper The mapper we are updating
*/
   protected void createContextCommon(String prefix, XmlMapper mapper) {
  -mapper.addRule(prefix + "/ResourceParams", mapper.objectCreate
  -   ("org.apache.catalina.deploy.ResourceParams"));
  -mapper.addRule(prefix + "/ResourceParams",
  -   mapper.setProperties());
  -mapper.addRule(prefix + "/ResourceParams", mapper.addChild
  -   ("addResourceParams",
  -"org.apache.catalina.deploy.ResourceParams"));
  - mapper.addRule(prefix + "/ResourceParams/parameter",
  -mapper.methodSetter("addParameter", 2));
  - mapper.addRule(prefix + "/ResourceParams/parameter/name",
  -mapper.methodParam(0));
  - mapper.addRule(prefix + "/ResourceParams/parameter/value",
  -mapper.methodParam(1));
   
   mapper.addRule(prefix + "/Ejb", mapper.objectCreate
  ("org.apache.catalina.deploy.ContextEjb"));
  @@ -557,6 +527,13 @@
mapper.addRule(prefix + "/Loader", mapper.addChild
   ("setLoader", "org.apache.catalina.Loader"));
   
  +mapper.addRule(prefix + "/Logger", mapper.objectCreate
  +   (null, "className"));
  +mapper.addRule(prefix + "/Logger",
  +   mapper.setProperties());
  +mapper.addRule(prefix + "/Logger", mapper.addChild
  +   ("setLogger", "org.apach