You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2004/09/02 00:53:25 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/conf server-minimal.xml web.xml context.xml
remm 2004/09/01 15:53:25
Modified: catalina/src/conf server-minimal.xml web.xml context.xml
Log:
- Default config update.
Revision Changes Path
1.6 +2 -1 jakarta-tomcat-catalina/catalina/src/conf/server-minimal.xml
Index: server-minimal.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server-minimal.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- server-minimal.xml 26 Jul 2004 19:34:59 -0000 1.5
+++ server-minimal.xml 1 Sep 2004 22:53:25 -0000 1.6
@@ -1,4 +1,5 @@
<Server port="8005" shutdown="SHUTDOWN">
+
<GlobalNamingResources>
<!-- Used by Manager webapp -->
<Resource name="UserDatabase" auth="Container"
@@ -17,8 +18,8 @@
<Engine name="Catalina" defaultHost="localhost">
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase" />
-
<Host name="localhost" appBase="webapps" />
</Engine>
+
</Service>
</Server>
1.43 +2 -2 jakarta-tomcat-catalina/catalina/src/conf/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/web.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- web.xml 24 Aug 2004 22:59:28 -0000 1.42
+++ web.xml 1 Sep 2004 22:53:25 -0000 1.43
@@ -146,12 +146,12 @@
<!-- -->
<!-- mappedfile Should we generate static content with one -->
<!-- print statement per input line, to ease -->
- <!-- debugging? [true] -->
+ <!-- debugging? [true] -->
<!-- -->
<!-- trimSpaces Should white spaces in template text between -->
<!-- actions or directives be trimmed? [false] -->
<!-- -->
- <!-- reloading Should Jasper check for modified JSPs? [true] -->
+ <!-- reloading Should Jasper check for modified JSPs? [false] -->
<!-- -->
<!-- suppressSmap Should the generation of SMAP info for JSR45 -->
<!-- debugging be suppressed? [false] -->
1.2 +9 -0 jakarta-tomcat-catalina/catalina/src/conf/context.xml
Index: context.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/context.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- context.xml 26 Jul 2004 08:09:20 -0000 1.1
+++ context.xml 1 Sep 2004 22:53:25 -0000 1.2
@@ -1,4 +1,13 @@
+<!-- The contents of this file will be loaded for each web application -->
<Context>
+
+ <!-- Default set of monitored resources -->
<WatchedResource>WEB-INF/web.xml</WatchedResource>
<WatchedResource>META-INF/context.xml</WatchedResource>
+
+ <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+ <!--
+ <Manager pathname="" />
+ -->
+
</Context>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org