*** ApacheConfig.java.orig	Sun Jul  1 17:37:34 2001
--- ApacheConfig.java	Sun Jul  1 17:50:56 2001
***************
*** 711,723 ****
              mod_jk.println();
  
  
-             mod_jk.println("#");        
-             mod_jk.println("# Root context mounts for Tomcat");
-             mod_jk.println("#");        
-             mod_jk.println("JkMount /*.jsp " + JkMount[jkConnector]);
-             mod_jk.println("JkMount /servlet/* " + JkMount[jkConnector]);
-             mod_jk.println();
- 
      	    // Set up contexts
      	    // XXX deal with Virtual host configuration !!!!
      	    Enumeration  enum = cm.getContexts();
--- 711,716 ----
***************
*** 732,738 ****
                      // XXX
                      continue;
                  }
-                 if( path.length() > 1) {
  
                      // It's not the root context
                      // assert path.startsWith( "/" )
--- 725,730 ----
***************
*** 746,751 ****
--- 738,744 ----
                  	if (File.separatorChar == '\\')
                  		docBase = docBase.replace('\\','/');// use separator preferred by Apache
  
+ 		if(path.length() > 1) {
                      // Static files will be served by Apache
                      pw.println("Alias " + path + " \"" + docBase + "\"");
                      pw.println("<Directory \"" + docBase + "\">");
***************
*** 755,760 ****
--- 748,754 ----
                      // Dynamic /servet pages go to Tomcat
                      pw.println("ApJServMount " + path +"/servlet" + " " + path);
  
+ 		}
                      // Deny serving any files from WEB-INF
                      pw.println("<Location \"" + path + "/WEB-INF/\">");
                      pw.println("    AllowOverride None");
***************
*** 789,794 ****
--- 783,789 ----
                      mod_jk.println("#########################################################");		    
                      mod_jk.println();
  
+ 	    if(path.length() > 1) {
                      mod_jk.println("#");		    
                      mod_jk.println("# The following line makes apache aware of the location of the " + path + " context");
                      mod_jk.println("#");                        
***************
*** 797,819 ****
                      mod_jk.println("    Options Indexes FollowSymLinks");
                      mod_jk.println("</Directory>");
                      mod_jk.println();            
! 
                      // Dynamic /servet pages go to Tomcat
                      mod_jk.println("#");		    
                      mod_jk.println("# The following line mounts all JSP files and the /servlet/ uri to tomcat");
                      mod_jk.println("#");                        
                      mod_jk.println("JkMount " + path +"/servlet/* " + JkMount[jkConnector]);
!                     mod_jk.println("JkMount " + path +"/*.jsp " + JkMount[jkConnector]);
! 		    mod_jk.println("# The following line mounts the " +
! 				   "form-based authenticator for the "+
! 				   path+" context");
! 		    mod_jk.println("#");
! 		    mod_jk.println("JkMount " + path +
! 				   "/*j_security_check " +
! 				   JkMount[jkConnector]);
  
- 
- 
                      // Deny serving any files from WEB-INF
                      mod_jk.println();            
                      mod_jk.println("#");		    
--- 792,811 ----
                      mod_jk.println("    Options Indexes FollowSymLinks");
                      mod_jk.println("</Directory>");
                      mod_jk.println();            
! 	    }
                      // Dynamic /servet pages go to Tomcat
                      mod_jk.println("#");		    
                      mod_jk.println("# The following line mounts all JSP files and the /servlet/ uri to tomcat");
                      mod_jk.println("#");                        
                      mod_jk.println("JkMount " + path +"/servlet/* " + JkMount[jkConnector]);
!             Enumeration ctxMaps = context.getContainerLocations();
!               while(ctxMaps.hasMoreElements()) {
!                 String cxpath = (String)ctxMaps.nextElement();
!                 if(!cxpath.startsWith("/"))
!                    cxpath = "/"+cxpath;
!                 mod_jk.println("JkMount " + path + cxpath +" "+ JkMount[jkConnector]);
!              }
  
                      // Deny serving any files from WEB-INF
                      mod_jk.println();            
                      mod_jk.println("#");		    
***************
*** 872,882 ****
                     // XXX ErrorDocument
  
                      // XXX mime types - AddEncoding, AddLanguage, TypesConfig
-                 } else {
-                     // the root context
-                     // XXX use a non-conflicting name
-                     pw.println("ApJServMount /servlet /ROOT");
-                 }
  
      	    }//end while(enum)
  
--- 864,869 ----