costin 01/07/15 16:55:07 Modified: src/etc modules.xml server.xml Log: - added the "internal" dir for trusted apps and modules - Added a (commented-out) ApacheConfig module - removed jasper34 ( it'll be added as an add-on, it'll not be part of the release since it's not ready ) Revision Changes Path 1.7 +0 -49 jakarta-tomcat/src/etc/modules.xml Index: modules.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/etc/modules.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- modules.xml 2001/06/09 00:15:50 1.6 +++ modules.xml 2001/07/15 23:55:06 1.7 @@ -499,55 +499,6 @@ <addContext/> </module> -<module name="JspInterceptor34" javaClass="org.apache.jasper34.tomcat33.JspInterceptor"> -<category name="facade"/> -<doc>Not yet</doc> -<attribute name="keepGenerated"> -<doc>Not yet</doc> -</attribute> -<attribute name="largeFile"> -<doc>Not yet</doc> -</attribute> -<attribute name="mappedFile"> -<doc>Not yet</doc> -</attribute> -<attribute name="sendErrToClient"> -<doc>Not yet</doc> -</attribute> -<attribute name="iEClassId"> -<doc>Not yet</doc> -</attribute> -<attribute name="classPath"> -<doc>Not yet</doc> -</attribute> -<attribute name="scratchdir"> -<doc>Not yet</doc> -</attribute> -<attribute name="jspCompilerPath"> -<doc>Not yet</doc> -</attribute> -<attribute name="jspCompilerPlugin"> -<doc>Not yet</doc> -</attribute> -<attribute name="classDebugInfo"> -<doc>Not yet</doc> -</attribute> -<attribute name="property"> -<doc>Not yet</doc> -</attribute> -<attribute name="useJspServlet"> -<doc>Not yet</doc> -</attribute> -<attribute name="jspServlet"> -<doc>Not yet</doc> -</attribute> -<attribute name="javaCompiler"> -<doc>Not yet</doc> -</attribute> -<addContext/> -</module> - - <module name="Servlet22Interceptor" javaClass="org.apache.tomcat.facade.Servlet22Interceptor"> <category name="facade"/> <doc>Not yet</doc> 1.82 +9 -1 jakarta-tomcat/src/etc/server.xml Index: server.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- server.xml 2001/06/25 08:04:35 1.81 +++ server.xml 2001/07/15 23:55:06 1.82 @@ -26,6 +26,11 @@ <AutoWebApp dir="webapps" host="DEFAULT" /> + <AutoDeploy source="internal" target="internal" + redeploy="true" /> + + <AutoWebApp dir="internal" host="DEFAULT" trusted="true"/> + <PolicyLoader securityManagerClass="java.lang.SecurityManager" policyFile="conf/tomcat.policy" /> @@ -148,7 +153,10 @@ <SessionId cookiesFirst="true" noCookies="false" /> - + <!-- Uncoment for the automatic apache config generator + <ApacheConfig forwardAll="true" useJkMount="true" + noRoot="false" /> + --> <!-- ==================== Connectors ==================== -->