tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF web.xml
Date Mon, 16 Aug 2004 23:31:26 GMT
remm        2004/08/16 16:31:26

  Modified:    webapps/admin login.jsp build.xml
               webapps/admin/WEB-INF web.xml
  Log:
  - Implement Costin's trick to avoid having to load-on-startup the admin webapp.
  
  Revision  Changes    Path
  1.5       +4 -0      jakarta-tomcat-catalina/webapps/admin/login.jsp
  
  Index: login.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/login.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- login.jsp	27 Aug 2003 23:32:30 -0000	1.4
  +++ login.jsp	16 Aug 2004 23:31:25 -0000	1.5
  @@ -5,6 +5,10 @@
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
   
  +<% // Force the initialization of "action" servlet
  +   getServletContext().getNamedDispatcher("action").include(request,response);
  +%> 
  +
   <html:html locale="true">
   
   <!-- Make sure window is not in a frame -->
  
  
  
  1.13      +2 -1      jakarta-tomcat-catalina/webapps/admin/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	10 Aug 2004 22:42:37 -0000	1.12
  +++ build.xml	16 Aug 2004 23:31:25 -0000	1.13
  @@ -186,7 +186,8 @@
     <!-- ================ BUILD: Copy Static Files ========================== -->
     <target name="build-static" depends="flags,flags.display,build-prepare,copy-struts.jar">
       <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-beanutils.jar}"/>
  -    <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-collections.jar}"/>
  +    <copy tofile="${webapps.build}/${webapp.name}/WEB-INF/lib/commons-collections.jar"

  +    	file="${commons-collections.jar}"/>
       <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-digester.jar}"/>
       <copy todir="${webapps.build}/${webapp.name}">
         <fileset dir=".">
  
  
  
  1.11      +0 -2      jakarta-tomcat-catalina/webapps/admin/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/web.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- web.xml	23 Jul 2004 14:02:17 -0000	1.10
  +++ web.xml	16 Aug 2004 23:31:26 -0000	1.11
  @@ -99,8 +99,6 @@
         <param-name>domain</param-name>
         <param-value>Catalina</param-value>
       </init-param>
  -
  -    <load-on-startup>2</load-on-startup>
     </servlet>
   
     <!-- Action Servlet Mapping -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message