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/docs/META-INF context.xml
Date Thu, 26 Aug 2004 17:03:35 GMT
remm        2004/08/26 10:03:35

  Modified:    .        build.xml tomcat.nsi
               resources/confinstall server_1.xml server_2.xml
               resources jvm.ini
               webapps/admin admin.xml
               webapps/manager manager.xml
  Added:       webapps/balancer/META-INF context.xml
               webapps/docs/META-INF context.xml
  Removed:     webapps/balancer balancer.xml
  Log:
  - Tweak webapps configurations.
  - Update installer.
  
  Revision  Changes    Path
  1.201     +0 -2      jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.200
  retrieving revision 1.201
  diff -u -r1.200 -r1.201
  --- build.xml	26 Aug 2004 00:21:10 -0000	1.200
  +++ build.xml	26 Aug 2004 17:03:34 -0000	1.201
  @@ -725,8 +725,6 @@
            todir="${tomcat.build}/conf/Catalina/localhost" />
       <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
            todir="${tomcat.build}/conf/Catalina/localhost" />
  -    <copy file="${tomcat.build}/webapps/balancer/balancer.xml"
  -         todir="${tomcat.build}/conf/Catalina/localhost" />
   
     </target>
   
  
  
  
  1.48      +46 -15    jakarta-tomcat-5/tomcat.nsi
  
  Index: tomcat.nsi
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- tomcat.nsi	21 Aug 2004 15:31:53 -0000	1.47
  +++ tomcat.nsi	26 Aug 2004 17:03:34 -0000	1.48
  @@ -76,9 +76,11 @@
       LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet container
core."
       LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start Tomcat when the
computer is started. This requires Windows NT 4.0, Windows 2000 or Windows XP."
       LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat source code."
  -    LangString DESC_SecTomcatDocs ${LANG_ENGLISH} "Install the Tomcat documentation bundle.
This include documentation on the servlet container and its configuration options, on the
Jasper JSP page compiler, as well as on the native webserver connectors."
       LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group for Tomcat."
  +    LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation bundle. This
include documentation on the servlet container and its configuration options, on the Jasper
JSP page compiler, as well as on the native webserver connectors."
       LangString DESC_SecExamples ${LANG_ENGLISH} "Installs some examples web applications."
  +    LangString DESC_SecAdmin ${LANG_ENGLISH} "Installs the administration web application."
  +    LangString DESC_SecWebapps ${LANG_ENGLISH} "Installs other utility web applications
(WebDAV, balancer, etc)."
   
     ;Language
     !insertmacro MUI_LANGUAGE English
  @@ -113,17 +115,26 @@
     SetOutPath $INSTDIR
     File tomcat.ico
     File LICENSE
  -  File /r bin
     File /r common
  -  File /r conf
     File /nonfatal /r shared
     File /nonfatal /r logs
  -  File /r server
     File /nonfatal /r work
     File /nonfatal /r temp
  +  SetOutPath $INSTDIR\bin
  +  File bin\bootstrap.jar
  +  File bin\commons-logging-api.jar
  +  File bin\*.exe
  +  SetOutPath $INSTDIR\conf
  +  File conf\*.*
  +  SetOutPath $INSTDIR\server
  +  File /r server\lib
  +  File /nonfatal /r server\classes
  +  SetOutPath $INSTDIR\server\webapps
  +  File /r server\webapps\manager
     SetOutPath $INSTDIR\webapps
  -  File /r webapps\balancer
     File /r webapps\ROOT
  +  SetOutPath $INSTDIR\conf\Catalina\localhost
  +  File conf\Catalina\localhost\manager.xml
   
     IfSilent 0 +3
     Call findJavaPath
  @@ -182,14 +193,6 @@
   
   SectionEnd
   
  -Section "Documentation" SecTomcatDocs
  -
  -  SectionIn 1 3
  -  SetOutPath $INSTDIR\webapps
  -  File /r webapps\tomcat-docs
  -
  -SectionEnd
  -
   SubSectionEnd
   
   Section "Start Menu Items" SecMenu
  @@ -234,14 +237,42 @@
   
   SectionEnd
   
  -Section "Examples" SecExamples
  +Section "Documentation" SecDocs
   
     SectionIn 1 3
  +  SetOutPath $INSTDIR\webapps
  +  File /r webapps\tomcat-docs
  +
  +SectionEnd
  +
  +Section "Examples" SecExamples
  +
  +  SectionIn 3
   
     SetOverwrite on
     SetOutPath $INSTDIR\webapps
     File /r webapps\jsp-examples
     File /r webapps\servlets-examples
  +
  +SectionEnd
  +
  +Section "Administration" SecAdmin
  +
  +  SectionIn 3
  +
  +  SetOutPath $INSTDIR\server\webapps
  +  File /r server\webapps\admin
  +  SetOutPath $INSTDIR\conf\Catalina\localhost
  +  File conf\Catalina\localhost\admin.xml
  +
  +SectionEnd
  +
  +Section "Webapps" SecWebapps
  +
  +  SectionIn 3
  +
  +  SetOutPath $INSTDIR\webapps
  +  File /r webapps\balancer
     File /r webapps\webdav
   
   SectionEnd
  
  
  
  1.8       +4 -14     jakarta-tomcat-5/resources/confinstall/server_1.xml
  
  Index: server_1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_1.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- server_1.xml	14 Jan 2004 13:13:30 -0000	1.7
  +++ server_1.xml	26 Aug 2004 17:03:34 -0000	1.8
  @@ -35,18 +35,9 @@
            UserDatabaseRealm to authenticate users -->
       <Resource name="UserDatabase" auth="Container"
                 type="org.apache.catalina.UserDatabase"
  -       description="User database that can be updated and saved">
  -    </Resource>
  -    <ResourceParams name="UserDatabase">
  -      <parameter>
  -        <name>factory</name>
  -        <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value>
  -      </parameter>
  -      <parameter>
  -        <name>pathname</name>
  -        <value>conf/tomcat-users.xml</value>
  -      </parameter>
  -    </ResourceParams>
  +       description="User database that can be updated and saved"
  +           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
  +          pathname="conf/tomcat-users.xml" />
   
     </GlobalNamingResources>
   
  @@ -88,6 +79,5 @@
            IP address of the remote client.
       -->
   
  -    <!-- Define a non-SSL Coyote HTTP/1.1 Connector on the port specified
  -         during installation  -->
  +    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
       <Connector 
  
  
  
  1.16      +24 -18    jakarta-tomcat-5/resources/confinstall/server_2.xml
  
  Index: server_2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_2.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- server_2.xml	14 Feb 2004 09:55:29 -0000	1.15
  +++ server_2.xml	26 Aug 2004 17:03:34 -0000	1.16
  @@ -13,7 +13,7 @@
   			   compressableMimeType="text/html,text/xml"
   	-->
   
  -    <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
  +    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
       <!--
       <Connector port="8443" 
                  maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
  @@ -22,7 +22,7 @@
                  clientAuth="false" sslProtocol="TLS" />
       -->
   
  -    <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
  +    <!-- Define an AJP 1.3 Connector on port 8009 -->
       <Connector port="8009" 
                  enableLookups="false" redirectPort="8443" debug="0"
                  protocol="AJP/1.3" />
  @@ -42,7 +42,7 @@
            analyzes the HTTP headers included with the request, and passes them
            on to the appropriate Host (virtual host). -->
   
  -    <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
  +    <!-- You should set jvmRoute to support load-balancing via AJP ie :
       <Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1">
        
       --> 
            
  @@ -67,11 +67,6 @@
         <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
         -->
   
  -      <!-- Global logger unless overridden at lower levels -->
  -      <Logger className="org.apache.catalina.logger.FileLogger"
  -              prefix="catalina_log." suffix=".txt"
  -              timestamp="true"/>
  -
         <!-- Because this Realm is here, an instance will be shared globally -->
   
         <!-- This Realm uses the UserDatabase configured in the global JNDI
  @@ -138,6 +133,12 @@
                mcastAddr = the multicast address, has to be the same for all the nodes
   
                mcastPort = the multicast port, has to be the same for all the nodes
  +             
  +             mcastBindAddr = bind the multicast socket to a specific address
  +             
  +             mcastTTL = the multicast TTL if you want to limit your broadcast
  +             
  +             mcastSoTimeout = the multicast readtimeout 
   
                mcastFrequency = the number of milliseconds in between sending a "I'm alive"
heartbeat
   
  @@ -195,6 +196,15 @@
   
               filter=".*\.gif;.*\.js;" means that we will not replicate the session after
requests with the URI
               ending with .gif and .js are intercepted.
  +            
  +            The deployer element can be used to deploy apps cluster wide.
  +            Currently the deployment only deploys/undeploys to working members in the cluster
  +            so no WARs are copied upons startup of a broken node.
  +            The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
  +            When a new war file is added the war gets deployed to the local instance,
  +            and then deployed to the other instances in the cluster.
  +            When a war file is deleted from the watchDir the war is undeployed locally

  +            and cluster wide
           -->
           
           <!--
  @@ -223,6 +233,12 @@
   
               <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
                      filter=".*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;"/>
  +                   
  +            <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
  +                      tempDir="/tmp/war-temp/"
  +                      deployDir="/tmp/war-deploy/"
  +                      watchDir="/tmp/war-listen/"
  +                      watchEnabled="false"/>
           </Cluster>
           -->        
   
  @@ -250,16 +266,6 @@
                    directory="logs"  prefix="localhost_access_log." suffix=".txt"
                    pattern="common" resolveHosts="false"/>
           -->
  -
  -        <!-- Logger shared by all Contexts related to this virtual host.  By
  -             default (when using FileLogger), log files are created in the "logs"
  -             directory relative to $CATALINA_HOME.  If you wish, you can specify
  -             a different directory with the "directory" attribute.  Specify either a
  -             relative (to $CATALINA_HOME) or absolute path to the desired
  -             directory.-->
  -        <Logger className="org.apache.catalina.logger.FileLogger"
  -                 directory="logs"  prefix="localhost_log." suffix=".txt"
  -            timestamp="true"/>
   
         </Host>
   
  
  
  
  1.3       +1 -1      jakarta-tomcat-5/resources/jvm.ini
  
  Index: jvm.ini
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/resources/jvm.ini,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jvm.ini	16 Feb 2003 18:27:03 -0000	1.2
  +++ jvm.ini	26 Aug 2004 17:03:34 -0000	1.3
  @@ -3,7 +3,7 @@
   
   [Field 1]
   Type=Label
  -Text=Please select the path of the JVM installed on your system:
  +Text=Please select the path of a J2SE 5.0 JRE installed on your system:
   left=0
   right=300
   top=5
  
  
  
  1.1                  jakarta-tomcat-catalina/webapps/balancer/META-INF/context.xml
  
  Index: context.xml
  ===================================================================
  <!--
  
      Context configuration file for the Tomcat Balancer Web App
      This is only needed to keep the distribution small and avoid duplicating
      commons libraries
  
      $Id: context.xml,v 1.1 2004/08/26 17:03:34 remm Exp $
  
  -->
  
  
  <Context privileged="true" antiResourceLocking="false" antiJARLocking="false" />
  
  
  
  1.5       +3 -3      jakarta-tomcat-catalina/webapps/admin/admin.xml
  
  Index: admin.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/admin.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- admin.xml	28 Jun 2004 02:14:50 -0000	1.4
  +++ admin.xml	26 Aug 2004 17:03:34 -0000	1.5
  @@ -7,8 +7,8 @@
   -->
   
   
  -<Context path="/admin" docBase="${catalina.home}/server/webapps/admin"
  -        debug="0" privileged="true">
  +<Context docBase="${catalina.home}/server/webapps/admin" privileged="true"
  +         antiResourceLocking="false" antiJARLocking="false">
   
     <!-- Uncomment this Valve to limit access to the Admin app to localhost
      for obvious security reasons. Allow may be a comma-separated list of
  
  
  
  1.3       +3 -3      jakarta-tomcat-catalina/webapps/manager/manager.xml
  
  Index: manager.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/manager.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- manager.xml	20 Feb 2004 17:09:29 -0000	1.2
  +++ manager.xml	26 Aug 2004 17:03:34 -0000	1.3
  @@ -7,8 +7,8 @@
   -->
   
   
  -<Context path="/manager" docBase="${catalina.home}/server/webapps/manager"
  -        debug="0" privileged="true">
  +<Context docBase="${catalina.home}/server/webapps/manager"
  +         privileged="true" antiResourceLocking="false" antiJARLocking="false">
   
     <!-- Link to the user database we will get roles from -->
     <ResourceLink name="users" global="UserDatabase"
  
  
  
  1.1                  jakarta-tomcat-catalina/webapps/docs/META-INF/context.xml
  
  Index: context.xml
  ===================================================================
  <!--
  
      Context configuration file for the Tomcat Balancer Web App
      This is only needed to keep the distribution small and avoid duplicating
      commons libraries
  
      $Id: context.xml,v 1.1 2004/08/26 17:03:35 remm Exp $
  
  -->
  
  
  <Context antiResourceLocking="false" />
  
  
  

---------------------------------------------------------------------
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