costin 01/09/08 13:14:11
Modified: src/share/org/apache/tomcat/modules/config AutoDeploy.java
Log:
Expand the WAR files earlier. This reduce the ordering problems - modules can
expect the apps to be deployed on addContext.
Note that expanding .war files declared in server.xml is not supported ( and never
worked ).
This feature can be added later by another module.
Revision Changes Path
1.6 +9 -3
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoDeploy.java
Index: AutoDeploy.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/AutoDeploy.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AutoDeploy.java 2001/04/22 05:37:31 1.5
+++ AutoDeploy.java 2001/09/08 20:14:11 1.6
@@ -129,14 +129,20 @@
//-------------------- Implementation --------------------
/**
- * Find all wars, expand them, register dependency.
+ * Find all wars and expand them.
+ * Do this as early as possible - we don't need anything from the engine.
*/
- public void engineInit(ContextManager cm) throws TomcatException {
-
+ public void addInterceptor(ContextManager cm, Context ctx,
+ BaseInterceptor module)
+ throws TomcatException
+ {
+ // checkHooks(cm, ctx, module);
+ if( this != module ) return;
// For all contexts in <server.xml > or loaded by differen means,
// check if the docBase ends with .war - and expand it if so,
// after that replace the docBase with the dir. See bug 427.
/* XXX not ready yet.
+ // XXX Should be done on addContext hook too
Enumeration loadedCtx=cm.getContexts();
while( loadedCtx.hasMoreElements() ) {
Context ctx=(Context)loadedCtx.nextElement();
