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 2006/07/12 19:18:36 UTC
svn commit: r421328 [2/2] - in /tomcat/tc6.0.x/trunk: ./ conf/ res/
res/confinstall/ res/deployer/ res/procrun/ webapps/docs/META-INF/
webapps/host-manager/META-INF/ webapps/manager/META-INF/
Added: tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml?rev=421328&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml (added)
+++ tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml Wed Jul 12 10:18:35 2006
@@ -0,0 +1,287 @@
+ maxHttpHeaderSize="8192"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true" />
+ <!-- Note : To disable connection timeouts, set connectionTimeout value
+ to 0 -->
+
+ <!-- Note : To use gzip compression you could set the following properties :
+
+ compression="on"
+ compressionMinSize="2048"
+ noCompressionUserAgents="gozilla, traviata"
+ compressableMimeType="text/html,text/xml"
+ -->
+
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
+ <!--
+ <Connector port="8443" maxHttpHeaderSize="8192"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" disableUploadTimeout="true"
+ acceptCount="100" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS" />
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port 8009 -->
+ <Connector port="8009"
+ enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
+
+ <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
+ <!-- See proxy documentation for more information about using this. -->
+ <!--
+ <Connector port="8082"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" acceptCount="100" connectionTimeout="20000"
+ proxyPort="80" disableUploadTimeout="true" />
+ -->
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ 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 AJP ie :
+ <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+
+ <!-- Define the top level container in our container hierarchy -->
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <!-- The request dumper valve dumps useful debugging information about
+ the request headers and cookies that were received, and the response
+ headers and cookies that were sent, for all requests received by
+ this instance of Tomcat. If you care only about requests to a
+ particular virtual host, or a particular application, nest this
+ element inside the corresponding <Host> or <Context> entry instead.
+
+ For a similar mechanism that is portable to all Servlet 2.4
+ containers, check out the "RequestDumperFilter" Filter in the
+ example application (the source for this filter may be found in
+ "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+
+ Request dumping is disabled by default. Uncomment the following
+ element to enable it. -->
+ <!--
+ <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+ -->
+
+ <!-- Because this Realm is here, an instance will be shared globally -->
+
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+
+ <!-- Comment out the old realm but leave here for now in case we
+ need to go back quickly -->
+ <!--
+ <Realm className="org.apache.catalina.realm.MemoryRealm" />
+ -->
+
+ <!-- Replace the above Realm with one of the following to get a Realm
+ stored in a database and accessed via JDBC -->
+
+ <!--
+ <Realm className="org.apache.catalina.realm.JDBCRealm"
+ driverName="org.gjt.mm.mysql.Driver"
+ connectionURL="jdbc:mysql://localhost/authority"
+ connectionName="test" connectionPassword="test"
+ userTable="users" userNameCol="user_name" userCredCol="user_pass"
+ userRoleTable="user_roles" roleNameCol="role_name" />
+ -->
+
+ <!--
+ <Realm className="org.apache.catalina.realm.JDBCRealm"
+ driverName="oracle.jdbc.driver.OracleDriver"
+ connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
+ connectionName="scott" connectionPassword="tiger"
+ userTable="users" userNameCol="user_name" userCredCol="user_pass"
+ userRoleTable="user_roles" roleNameCol="role_name" />
+ -->
+
+ <!--
+ <Realm className="org.apache.catalina.realm.JDBCRealm"
+ driverName="sun.jdbc.odbc.JdbcOdbcDriver"
+ connectionURL="jdbc:odbc:CATALINA"
+ userTable="users" userNameCol="user_name" userCredCol="user_pass"
+ userRoleTable="user_roles" roleNameCol="role_name" />
+ -->
+
+ <!-- Define the default virtual host
+ Note: XML Schema validation will not work with Xerces 2.2.
+ -->
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false">
+
+ <!-- Defines a cluster for this node,
+ By defining this element, means that every manager will be changed.
+ So when running a cluster, only make sure that you have webapps in there
+ that need to be clustered and remove the other ones.
+ A cluster has the following parameters:
+
+ className = the fully qualified name of the cluster class
+
+ name = a descriptive name for your cluster, can be anything
+
+ 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
+
+ mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
+
+ tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes
+
+ tcpListenAddress = the listen address (bind address) for TCP cluster request on this host,
+ in case of multiple ethernet cards.
+ auto means that address becomes
+ InetAddress.getLocalHost().getHostAddress()
+
+ tcpListenPort = the tcp listen port
+
+ tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
+ has a wakup bug in java.nio. Set to 0 for no timeout
+
+ printToScreen = true means that managers will also print to std.out
+
+ expireSessionsOnShutdown = true means that
+
+ useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
+ false means to replicate the session after each request.
+ false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
+ <%
+ HashMap map = (HashMap)session.getAttribute("map");
+ map.put("key","value");
+ %>
+ replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
+ * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
+ * Synchronous means that the thread that executes the request, is also the
+ thread the replicates the data to the other nodes, and will not return until all
+ nodes have received the information.
+ * Asynchronous means that there is a specific 'sender' thread for each cluster node,
+ so the request thread will queue the replication request into a "smart" queue,
+ and then return to the client.
+ The "smart" queue is a queue where when a session is added to the queue, and the same session
+ already exists in the queue from a previous request, that session will be replaced
+ in the queue instead of replicating two requests. This almost never happens, unless there is a
+ large network delay.
+ -->
+ <!--
+ When configuring for clustering, you also add in a valve to catch all the requests
+ coming in, at the end of the request, the session may or may not be replicated.
+ A session is replicated if and only if all the conditions are met:
+ 1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
+ 2. a session exists (has been created)
+ 3. the request is not trapped by the "filter" attribute
+
+ The filter attribute is to filter out requests that could not modify the session,
+ hence we don't replicate the session after the end of this request.
+ The filter is negative, ie, anything you put in the filter, you mean to filter out,
+ ie, no replication will be done on requests that match one of the filters.
+ The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
+
+ 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
+ -->
+
+ <!--
+ <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
+ managerClassName="org.apache.catalina.cluster.session.DeltaManager"
+ expireSessionsOnShutdown="false"
+ useDirtyFlag="true"
+ notifyListenersOnReplication="true">
+
+ <Membership
+ className="org.apache.catalina.cluster.mcast.McastService"
+ mcastAddr="228.0.0.4"
+ mcastPort="45564"
+ mcastFrequency="500"
+ mcastDropTime="3000"/>
+
+ <Receiver
+ className="org.apache.catalina.cluster.tcp.ReplicationListener"
+ tcpListenAddress="auto"
+ tcpListenPort="4001"
+ tcpSelectorTimeout="100"
+ tcpThreadCount="6"/>
+
+ <Sender
+ className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
+ replicationMode="pooled"
+ ackTimeout="15000"/>
+
+ <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>
+ -->
+
+
+
+ <!-- Normally, users must authenticate themselves to each web app
+ individually. Uncomment the following entry if you would like
+ a user to be authenticated the first time they encounter a
+ resource protected by a security constraint, and then have that
+ user identity maintained across *all* web applications contained
+ in this virtual host. -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all requests for this virtual host. By
+ default, 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.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
+ directory="logs" prefix="localhost_access_log." suffix=".txt"
+ pattern="common" resolveHosts="false"/>
+ -->
+
+ <!-- Access log processes all requests for this virtual host. By
+ default, 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.
+ This access log implementation is optimized for maximum performance,
+ but is hardcoded to support only the "common" and "combined" patterns.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+ directory="logs" prefix="localhost_access_log." suffix=".txt"
+ pattern="common" resolveHosts="false"/>
+ -->
+
+ </Host>
+
+ </Engine>
+
+ </Service>
+
+</Server>
Propchange: tomcat/tc6.0.x/trunk/res/confinstall/server_2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml?rev=421328&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml (added)
+++ tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml Wed Jul 12 10:18:35 2006
@@ -0,0 +1,6 @@
+<!--
+ NOTE: By default, no user is included in the "manager" role required
+ to operate the "/manager" web application. If you wish to use this app,
+ you must define such a user - the username and password are arbitrary.
+-->
+<tomcat-users>
Propchange: tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml?rev=421328&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml (added)
+++ tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml Wed Jul 12 10:18:35 2006
@@ -0,0 +1,4 @@
+ <user name="tomcat" password="tomcat" roles="tomcat" />
+ <user name="role1" password="tomcat" roles="role1" />
+ <user name="both" password="tomcat" roles="tomcat,role1" />
+</tomcat-users>
Propchange: tomcat/tc6.0.x/trunk/res/confinstall/tomcat-users_2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/res/deployer/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/deployer/build.xml?rev=421328&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/deployer/build.xml (added)
+++ tomcat/tc6.0.x/trunk/res/deployer/build.xml Wed Jul 12 10:18:35 2006
@@ -0,0 +1,101 @@
+<project name="Deployer" default="compile" basedir=".">
+
+ <property file="deployer.properties"/>
+
+ <!-- Configure the directory into which the web application is built -->
+ <property name="build" value="${basedir}/build"/>
+
+ <!-- Configure the folder and context path for this application -->
+ <property name="webapp" value="myapp"/>
+ <property name="path" value="/myapp"/>
+
+ <!-- Configure properties to access the Manager application -->
+ <property name="url" value="http://localhost:8080/manager"/>
+ <property name="username" value="tomcat"/>
+ <property name="password" value="tomcat"/>
+
+ <property name="webapp.path" value="${build}/webapp${path}"/>
+
+ <path id="deployer.classpath">
+ <fileset dir="${basedir}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Configure the custom Ant tasks for the Manager application -->
+ <taskdef resource="org/apache/catalina/ant/catalina.tasks"
+ classpathref="deployer.classpath"/>
+
+ <!-- Executable Targets -->
+ <target name="clean" description="Removes build directory">
+ <delete dir="${build}" />
+ </target>
+
+ <target name="compile" description="Compile web application"
+ depends="clean">
+
+ <copy todir="${webapp.path}">
+ <fileset dir="${webapp}" />
+ </copy>
+
+ <jasper2 validateXml="false"
+ uriroot="${webapp.path}"
+ webXmlFragment="${webapp.path}/WEB-INF/generated_web.xml"
+ addWebXmlMappings="true"
+ outputDir="${webapp.path}/WEB-INF/classes" />
+
+ <validator path="${webapp.path}" />
+
+ <mkdir dir="${webapp.path}/WEB-INF/classes"/>
+ <mkdir dir="${webapp.path}/WEB-INF/lib"/>
+
+ <javac destdir="${webapp.path}/WEB-INF/classes"
+ optimize="off"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ failonerror="false"
+ srcdir="${webapp.path}/WEB-INF/classes"
+ encoding="UTF-8"
+ excludes="**/*.smap">
+ <classpath>
+ <fileset dir="${webapp.path}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${basedir}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <include name="**" />
+ <exclude name="tags/**" />
+ </javac>
+
+ <jar destfile="${webapp.path}.war"
+ basedir="${webapp.path}" />
+
+ </target>
+
+ <target name="deploy" description="Deploy web application">
+ <deploy url="${url}" username="${username}" password="${password}"
+ path="${path}" war="${webapp.path}.war" update="true" />
+ </target>
+
+ <target name="undeploy" description="Undeploy web application">
+ <undeploy url="${url}" username="${username}" password="${password}"
+ path="${path}"/>
+ </target>
+
+ <!-- Webapp lifecycle control -->
+ <target name="start" description="Start web application">
+ <start url="${url}" username="${username}" password="${password}"
+ path="${path}"/>
+ </target>
+ <target name="reload" description="Reload web application">
+ <reload url="${url}" username="${username}" password="${password}"
+ path="${path}"/>
+ </target>
+ <target name="stop" description="Stop web application">
+ <stop url="${url}" username="${username}" password="${password}"
+ path="${path}"/>
+ </target>
+
+</project>
Propchange: tomcat/tc6.0.x/trunk/res/deployer/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/res/header.bmp
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/header.bmp?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/header.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/tc6.0.x/trunk/res/jvm.ini
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/jvm.ini?rev=421328&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/jvm.ini (added)
+++ tomcat/tc6.0.x/trunk/res/jvm.ini Wed Jul 12 10:18:35 2006
@@ -0,0 +1,18 @@
+[Settings]
+NumFields=2
+
+[Field 1]
+Type=Label
+Text=Please select the path of a J2SE 5.0 JRE installed on your system:
+left=0
+right=300
+top=5
+bottom=20
+
+[Field 2]
+Type=DirRequest
+Left=0
+Right=-1
+Top=65
+Bottom=78
+
Added: tomcat/tc6.0.x/trunk/res/main.ico
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/main.ico?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/main.ico
------------------------------------------------------------------------------
svn:mime-type = image/x-icon
Added: tomcat/tc6.0.x/trunk/res/procrun/tomcat6.exe
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/procrun/tomcat6.exe?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/procrun/tomcat6.exe
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/tc6.0.x/trunk/res/procrun/tomcat6w.exe
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/procrun/tomcat6w.exe?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/procrun/tomcat6w.exe
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/tc6.0.x/trunk/res/side_left.bmp
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/side_left.bmp?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/side_left.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/tc6.0.x/trunk/res/tickno.bmp
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tickno.bmp?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/tickno.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/tc6.0.x/trunk/res/tickyes.bmp
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tickyes.bmp?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/tickyes.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/tc6.0.x/trunk/res/tomcat.ico
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.ico?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/tomcat.ico
------------------------------------------------------------------------------
svn:mime-type = image/x-icon
Added: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=421328&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (added)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Wed Jul 12 10:18:35 2006
@@ -0,0 +1,686 @@
+
+; Tomcat script for Nullsoft Installer
+; $Id: tomcat.nsi 393199 2006-04-11 12:17:55Z remm $
+
+ ;Compression options
+ CRCCheck on
+ SetCompress force
+ SetCompressor lzma
+ SetDatablockOptimize on
+
+ Name "Apache Tomcat"
+
+ ;Product information
+ VIAddVersionKey ProductName "Apache Tomcat"
+ VIAddVersionKey CompanyName "Apache Software Foundation"
+ VIAddVersionKey LegalCopyright "Copyright (c) 1999-2006 The Apache Software Foundation"
+ VIAddVersionKey FileDescription "Apache Tomcat Installer"
+ VIAddVersionKey FileVersion "2.0"
+ VIAddVersionKey ProductVersion "@VERSION@"
+ VIAddVersionKey Comments "tomcat.apache.org"
+ VIAddVersionKey InternalName "apache-tomcat-@VERSION@.exe"
+ VIProductVersion @VERSION_NUMBER@
+
+!include "MUI.nsh"
+!include "StrFunc.nsh"
+${StrRep}
+ Var "JavaHome"
+
+
+
+;--------------------------------
+;Configuration
+
+ !define MUI_HEADERIMAGE
+ !define MUI_HEADERIMAGE_RIGHT
+ !define MUI_HEADERIMAGE_BITMAP header.bmp
+ !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp
+ !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\webapps\ROOT\RELEASE-NOTES.txt"
+ !define MUI_FINISHPAGE_RUN $INSTDIR\bin\tomcat6w.exe
+ !define MUI_FINISHPAGE_RUN_PARAMETERS //MR//Tomcat6
+ !define MUI_FINISHPAGE_NOREBOOTSUPPORT
+
+ !define MUI_ABORTWARNING
+
+ !define TEMP1 $R0
+ !define TEMP2 $R1
+
+ !define MUI_ICON tomcat.ico
+ !define MUI_UNICON tomcat.ico
+
+ ;General
+ OutFile tomcat-installer.exe
+
+ ;Install Options pages
+ LangString TEXT_JVM_TITLE ${LANG_ENGLISH} "Java Virtual Machine"
+ LangString TEXT_JVM_SUBTITLE ${LANG_ENGLISH} "Java Virtual Machine path selection."
+ LangString TEXT_JVM_PAGETITLE ${LANG_ENGLISH} ": Java Virtual Machine path selection"
+
+ LangString TEXT_CONF_TITLE ${LANG_ENGLISH} "Configuration"
+ LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
+ LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
+
+ ;Install Page order
+ !insertmacro MUI_PAGE_WELCOME
+ !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
+ !insertmacro MUI_PAGE_COMPONENTS
+ !insertmacro MUI_PAGE_DIRECTORY
+ Page custom SetConfiguration Void "$(TEXT_CONF_PAGETITLE)"
+ Page custom SetChooseJVM Void "$(TEXT_JVM_PAGETITLE)"
+ !insertmacro MUI_PAGE_INSTFILES
+ Page custom CheckUserType
+ !insertmacro MUI_PAGE_FINISH
+
+ ;Uninstall Page order
+ !insertmacro MUI_UNPAGE_CONFIRM
+ !insertmacro MUI_UNPAGE_INSTFILES
+
+ ;License dialog
+ LicenseData License.rtf
+
+ ;Component-selection page
+ ;Descriptions
+ LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet container."
+ 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_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs Tomcat native .dll for better performance and scalability in production environments."
+; LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat source code."
+ 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
+
+ ;Folder-select dialog
+ InstallDir "$PROGRAMFILES\Apache Software Foundation\Tomcat 6.0"
+
+ ;Install types
+ InstType Normal
+ InstType Minimum
+ InstType Full
+
+ ; Main registry key
+ InstallDirRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" ""
+
+ !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+ ReserveFile "jvm.ini"
+ ReserveFile "config.ini"
+
+;--------------------------------
+;Installer Sections
+
+SubSection "Tomcat" SecTomcat
+
+Section "Core" SecTomcatCore
+
+ SectionIn 1 2 3 RO
+
+ IfSilent +2 0
+ Call checkJvm
+
+ SetOutPath $INSTDIR
+ File tomcat.ico
+ File LICENSE
+ File /r lib
+ File /nonfatal /r logs
+ 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\webapps
+ File /r webapps\ROOT
+ File /r webapps\host-manager
+ File /r webapps\manager
+
+ Call configure
+ Call findJavaPath
+ Pop $2
+
+ IfSilent +2 0
+ !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
+
+ StrCpy "$JavaHome" $2
+ Call findJVMPath
+ Pop $2
+
+ DetailPrint "Using Jvm: $2"
+
+ InstallRetry:
+ ClearErrors
+ nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //IS//Tomcat6 --DisplayName "Apache Tomcat" --Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" --LogPath "$INSTDIR\logs" --Install "$INSTDIR\bin\tomcat6.exe" --Jvm "$2" --StartPath "$INSTDIR" --StopPath "$INSTDIR"'
+ Pop $0
+ StrCmp $0 "0" InstallOk
+ MessageBox MB_ABORTRETRYIGNORE|MB_ICONSTOP \
+ "Failed to install Tomcat6 service.$\r$\nCheck your settings and permissions$\r$\nIgnore and continue anyway (not recommended)?" \
+ /SD IDIGNORE IDIGNORE InstallOk IDRETRY InstallRetry
+ Quit
+ InstallOk:
+ ClearErrors
+
+SectionEnd
+
+Section "Service" SecTomcatService
+
+ SectionIn 3
+
+ IfSilent 0 +3
+ Call findJavaPath
+ Pop $2
+
+ IfSilent +2 0
+ !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
+
+ StrCpy "$JavaHome" $2
+ Call findJVMPath
+ Pop $2
+
+ nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Startup auto'
+ ; Bahave like Apache Httpd (put the icon in try on login)
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor" '"$INSTDIR\bin\tomcat6w.exe" //MS//Tomcat6'
+
+ ClearErrors
+
+SectionEnd
+
+Section "Native" SecTomcatNative
+
+ SectionIn 3
+
+ NSISdl::download /TIMEOUT=30000 http://tomcat.heanet.ie/native/1.1.3/binaries/win32/tcnative-1.dll $INSTDIR\bin\tcnative-1.dll
+ Pop $0
+ StrCmp $0 success success
+ SetDetailsView show
+ DetailPrint "download failed from http://tomcat.heanet.ie/native/1.1.3/binaries/win32/tcnative-1.dll: $0"
+ success:
+
+ ClearErrors
+
+SectionEnd
+
+;Section "Source Code" SecTomcatSource
+;
+; SectionIn 3
+; SetOutPath $INSTDIR
+; File /r src
+;
+;SectionEnd
+
+SubSectionEnd
+
+Section "Start Menu Items" SecMenu
+
+ SectionIn 1 2 3
+
+ !insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
+
+ SetOutPath "$SMPROGRAMS\Apache Tomcat 6.0"
+
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Home Page.lnk" \
+ "http://tomcat.apache.org/"
+
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Welcome.lnk" \
+ "http://127.0.0.1:$R0/"
+
+; IfFileExists "$INSTDIR\webapps\admin" 0 NoAdminApp
+;
+; CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Administration.lnk" \
+; "http://127.0.0.1:$R0/admin/"
+;NoAdminApp:
+
+ IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp
+
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Manager.lnk" \
+ "http://127.0.0.1:$R0/manager/html"
+
+NoManagerApp:
+
+ IfFileExists "$INSTDIR\webapps\webapps\tomcat-docs" 0 NoDocumentaion
+
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Documentation.lnk" \
+ "$INSTDIR\webapps\tomcat-docs\index.html"
+
+NoDocumentaion:
+
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Uninstall Tomcat 6.0.lnk" \
+ "$INSTDIR\Uninstall.exe"
+
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat 6.0 Program Directory.lnk" \
+ "$INSTDIR"
+
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Monitor Tomcat.lnk" \
+ "$INSTDIR\bin\tomcat6w.exe" \
+ '//MS//Tomcat6' \
+ "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
+
+ CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Configure Tomcat.lnk" \
+ "$INSTDIR\bin\tomcat6w.exe" \
+ '//ES//Tomcat6' \
+ "$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
+
+SectionEnd
+
+Section "Documentation" SecDocs
+
+ SectionIn 1 3
+ SetOutPath $INSTDIR\webapps
+ File /r webapps\docs
+
+SectionEnd
+
+Section "Examples" SecExamples
+
+ SectionIn 3
+
+ SetOverwrite on
+ SetOutPath $INSTDIR\webapps
+ File /r webapps\examples
+
+SectionEnd
+
+;Section "Administration" SecAdmin
+;
+; SectionIn 3
+;
+; SetOutPath $INSTDIR\webapps
+; File /r webapps\admin
+; SetOutPath $INSTDIR\conf\Catalina\localhost
+; File conf\Catalina\localhost\admin.xml
+;
+;SectionEnd
+
+Section "Webapps" SecWebapps
+
+ SectionIn 3
+
+ SetOutPath $INSTDIR\webapps
+ File /nonfatal /r webapps\balancer
+ File /nonfatal /r webapps\webdav
+
+SectionEnd
+
+;Section "Compatibility" SecCompat
+;
+; SetOutPath $INSTDIR
+; File /oname=bin\jmx.jar ..\compat\bin\jmx.jar
+; File /oname=common\endorsed\xercesImpl.jar ..\compat\common\endorsed\xercesImpl.jar
+; File /oname=common\endorsed\xml-apis.jar ..\compat\common\endorsed\xml-apis.jar
+;
+;SectionEnd
+
+Section -post
+ nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --Classpath "$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm'
+ nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //US//Tomcat6 --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\common\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties" --StdOutput auto --StdError auto'
+
+ WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+ WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" "InstallPath" $INSTDIR
+ WriteRegStr HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0" "Version" @VERSION@
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 6.0" \
+ "DisplayName" "Apache Tomcat 6.0 (remove only)"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 6.0" \
+ "UninstallString" '"$INSTDIR\Uninstall.exe"'
+
+SectionEnd
+
+Function .onInit
+
+ ;Extract Install Options INI Files
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "config.ini"
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "jvm.ini"
+
+FunctionEnd
+
+Function SetChooseJVM
+ !insertmacro MUI_HEADER_TEXT "$(TEXT_JVM_TITLE)" "$(TEXT_JVM_SUBTITLE)"
+ Call findJavaPath
+ Pop $3
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "jvm.ini" "Field 2" "State" $3
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "jvm.ini"
+FunctionEnd
+
+Function SetConfiguration
+ !insertmacro MUI_HEADER_TEXT "$(TEXT_CONF_TITLE)" "$(TEXT_CONF_SUBTITLE)"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "config.ini"
+FunctionEnd
+
+Function Void
+FunctionEnd
+
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcat} $(DESC_SecTomcat)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatCore} $(DESC_SecTomcatCore)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatService} $(DESC_SecTomcatService)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatNative} $(DESC_SecTomcatNative)
+; !insertmacro MUI_DESCRIPTION_TEXT ${SecTomcatSource} $(DESC_SecTomcatSource)
+; !insertmacro MUI_DESCRIPTION_TEXT ${SecCompat} $(DESC_SecCompat)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecMenu} $(DESC_SecMenu)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecDocs} $(DESC_SecDocs)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} $(DESC_SecExamples)
+; !insertmacro MUI_DESCRIPTION_TEXT ${SecAdmin} $(DESC_SecAdmin)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecWebapps} $(DESC_SecWebapps)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+
+; =====================
+; CheckUserType Function
+; =====================
+;
+; Check the user type, and warn if it's not an administrator.
+; Taken from Examples/UserInfo that ships with NSIS.
+Function CheckUserType
+ ClearErrors
+ UserInfo::GetName
+ IfErrors Win9x
+ Pop $0
+ UserInfo::GetAccountType
+ Pop $1
+ StrCmp $1 "Admin" 0 +3
+ ; This is OK, do nothing
+ Goto done
+
+ MessageBox MB_OK|MB_ICONEXCLAMATION 'Note: the current user is not an administrator. \
+ To run Tomcat as a Windows service, you must be an administrator. \
+ You can still run Tomcat from the command-line as this type of user.'
+ Goto done
+
+ Win9x:
+ # This one means you don't need to care about admin or
+ # not admin because Windows 9x doesn't either
+ MessageBox MB_OK "Error! This DLL can't run under Windows 9x!"
+
+ done:
+FunctionEnd
+
+
+; =====================
+; FindJavaPath Function
+; =====================
+;
+; Find the JAVA_HOME used on the system, and put the result on the top of the
+; stack
+; Will return an empty string if the path cannot be determined
+;
+Function findJavaPath
+
+ ;ClearErrors
+
+ ;ReadEnvStr $1 JAVA_HOME
+
+ ;IfErrors 0 FoundJDK
+
+ ClearErrors
+
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "JavaHome"
+ ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "RuntimeLib"
+
+ ;FoundJDK:
+
+ IfErrors 0 NoErrors
+ StrCpy $1 ""
+
+NoErrors:
+
+ ClearErrors
+
+ ; Put the result in the stack
+ Push $1
+
+FunctionEnd
+
+
+; ====================
+; FindJVMPath Function
+; ====================
+;
+; Find the full JVM path, and put the result on top of the stack
+; Argument: JVM base path (result of findJavaPath)
+; Will return an empty string if the path cannot be determined
+;
+Function findJVMPath
+
+ ClearErrors
+
+ ;Step one: Is this a JRE path (Program Files\Java\XXX)
+ StrCpy $1 "$JavaHome"
+
+ StrCpy $2 "$1\bin\hotspot\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\server\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\client\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\classic\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+
+ ;Step two: Is this a JDK path (Program Files\XXX\jre)
+ StrCpy $1 "$JavaHome\jre"
+
+ StrCpy $2 "$1\bin\hotspot\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\server\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\client\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+ StrCpy $2 "$1\bin\classic\jvm.dll"
+ IfFileExists "$2" FoundJvmDll
+
+ ClearErrors
+ ;Step tree: Read defaults from registry
+
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$1" "RuntimeLib"
+
+ IfErrors 0 FoundJvmDll
+ StrCpy $2 ""
+
+ FoundJvmDll:
+ ClearErrors
+
+ ; Put the result in the stack
+ Push $2
+
+FunctionEnd
+
+
+; ====================
+; CheckJvm Function
+; ====================
+;
+Function checkJvm
+
+ !insertmacro MUI_INSTALLOPTIONS_READ $3 "jvm.ini" "Field 2" "State"
+ IfFileExists "$3\bin\java.exe" NoErrors1
+ MessageBox MB_OK|MB_ICONSTOP "No Java Virtual Machine found in folder:$\r$\n$3"
+ Quit
+NoErrors1:
+ StrCpy "$JavaHome" $3
+ Call findJVMPath
+ Pop $4
+ StrCmp $4 "" 0 NoErrors2
+ MessageBox MB_OK|MB_ICONSTOP "No Java Virtual Machine found in folder:$\r$\n$3"
+ Quit
+NoErrors2:
+
+FunctionEnd
+
+; ==================
+; Configure Function
+; ==================
+;
+; Display the configuration dialog boxes, read the values entered by the user,
+; and build the configuration files
+;
+Function configure
+
+ !insertmacro MUI_INSTALLOPTIONS_READ $R0 "config.ini" "Field 2" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $R1 "config.ini" "Field 5" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $R2 "config.ini" "Field 7" "State"
+
+ IfSilent 0 +2
+ StrCpy $R4 'port="8080"'
+
+ IfSilent +2 0
+ StrCpy $R4 'port="$R0"'
+
+ IfSilent 0 +2
+ StrCpy $R5 ''
+
+ IfSilent Silent 0
+
+ ; Escape XML
+ Push $R1
+ Call xmlEscape
+ Pop $R1
+ Push $R2
+ Call xmlEscape
+ Pop $R2
+
+ StrCpy $R5 '<user name="$R1" password="$R2" roles="admin,manager" />'
+
+Silent:
+ DetailPrint 'HTTP/1.1 Connector configured on port "$R0"'
+ DetailPrint 'Admin user added: "$R1"'
+
+ SetOutPath $TEMP
+ File /r confinstall
+
+ ; Build final server.xml
+ Delete "$INSTDIR\conf\server.xml"
+ FileOpen $R9 "$INSTDIR\conf\server.xml" w
+
+ Push "$TEMP\confinstall\server_1.xml"
+ Call copyFile
+ FileWrite $R9 $R4
+ Push "$TEMP\confinstall\server_2.xml"
+ Call copyFile
+
+ FileClose $R9
+
+ DetailPrint "server.xml written"
+
+ ; Build final tomcat-users.xml
+
+ Delete "$INSTDIR\conf\tomcat-users.xml"
+ FileOpen $R9 "$INSTDIR\conf\tomcat-users.xml" w
+
+ Push "$TEMP\confinstall\tomcat-users_1.xml"
+ Call copyFile
+ FileWrite $R9 $R5
+ Push "$TEMP\confinstall\tomcat-users_2.xml"
+ Call copyFile
+
+ FileClose $R9
+
+ DetailPrint "tomcat-users.xml written"
+
+ RMDir /r "$TEMP\confinstall"
+
+FunctionEnd
+
+
+Function xmlEscape
+ Pop $0
+ ${StrRep} $0 $0 "&" "&"
+ ${StrRep} $0 $0 "$\"" """
+ ${StrRep} $0 $0 "<" "<"
+ ${StrRep} $0 $0 ">" ">"
+ Push $0
+FunctionEnd
+
+
+; =================
+; CopyFile Function
+; =================
+;
+; Copy specified file contents to $R9
+;
+Function copyFile
+
+ ClearErrors
+
+ Pop $0
+
+ FileOpen $1 $0 r
+
+ NoError:
+
+ FileRead $1 $2
+ IfErrors EOF 0
+ FileWrite $R9 $2
+
+ IfErrors 0 NoError
+
+ EOF:
+
+ FileClose $1
+
+ ClearErrors
+
+FunctionEnd
+
+
+;--------------------------------
+;Uninstaller Section
+
+Section Uninstall
+
+ Delete "$INSTDIR\modern.exe"
+ Delete "$INSTDIR\Uninstall.exe"
+
+ ; Stop Tomcat service monitor if running
+ nsExec::ExecToLog '"$INSTDIR\bin\tomcat6w.exe" //MQ//Tomcat6'
+ ; Delete Tomcat service
+ nsExec::ExecToLog '"$INSTDIR\bin\tomcat6.exe" //DS//Tomcat6'
+ ClearErrors
+
+ DeleteRegKey HKCR "JSPFile"
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 6.0"
+ DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\6.0"
+ DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor"
+ RMDir /r "$SMPROGRAMS\Apache Tomcat 6.0"
+ Delete "$INSTDIR\tomcat.ico"
+ Delete "$INSTDIR\LICENSE"
+ RMDir /r "$INSTDIR\bin"
+ RMDir /r "$INSTDIR\lib"
+ Delete "$INSTDIR\conf\*.dtd"
+ RMDir "$INSTDIR\logs"
+ RMDir /r "$INSTDIR\webapps\balancer"
+ RMDir /r "$INSTDIR\webapps\docs"
+ RMDir /r "$INSTDIR\webapps\examples"
+ RMDir /r "$INSTDIR\webapps\webdav"
+ RMDir /r "$INSTDIR\work"
+ RMDir /r "$INSTDIR\temp"
+ RMDir /r "$INSTDIR\src"
+ RMDir "$INSTDIR"
+
+ IfSilent Removed 0
+
+ ; if $INSTDIR was removed, skip these next ones
+ IfFileExists "$INSTDIR" 0 Removed
+ MessageBox MB_YESNO|MB_ICONQUESTION \
+ "Remove all files in your Tomcat 6.0 directory? (If you have anything \
+ you created that you want to keep, click No)" IDNO Removed
+ RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user hits no
+ RMDir "$INSTDIR\webapps"
+ Delete "$INSTDIR\*.*"
+ RMDir /r "$INSTDIR"
+ Sleep 500
+ IfFileExists "$INSTDIR" 0 Removed
+ MessageBox MB_OK|MB_ICONEXCLAMATION \
+ "Note: $INSTDIR could not be removed."
+ Removed:
+
+SectionEnd
+
+;eof
Added: tomcat/tc6.0.x/trunk/res/uninst.ico
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/uninst.ico?rev=421328&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc6.0.x/trunk/res/uninst.ico
------------------------------------------------------------------------------
svn:mime-type = image/x-icon
Modified: tomcat/tc6.0.x/trunk/res/welcome.bin.html
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/welcome.bin.html?rev=421328&r1=421327&r2=421328&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/welcome.bin.html (original)
+++ tomcat/tc6.0.x/trunk/res/welcome.bin.html Wed Jul 12 10:18:35 2006
@@ -10,8 +10,8 @@
<ul>
<li><a href="RELEASE-NOTES">Release notes</a>, with important information
about known issues</li>
-<li><a href="http://tomcat.apache.org/tomcat-5.5-doc/changelog.html">Changelog</a></li>
-<li><a href="http://tomcat.apache.org/tomcat-5.5-doc/status.html">Status</a></li>
+<li><a href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html">Changelog</a></li>
+<li><a href="http://tomcat.apache.org/tomcat-6.0-doc/status.html">Status</a></li>
</ul>
</p>
@@ -20,7 +20,7 @@
of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
these files.</b></P>
-<p><font color="red">Tomcat 5.5 requires JRE 5.0 by default. Read the
+<p><font color="red">Tomcat 6.0 requires JRE 5.0. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
</font></p>
@@ -29,9 +29,7 @@
<li>apache-tomcat-[version].zip or .tar.gz: base distro, all non-embedded users download this.</li>
<li>apache-tomcat-[version].exe: Windows installer for Tomcat. Please note that while this distribution includes the vast majority of the base distribution, some of the command-line scripts for launching Tomcat are not included. This distribution is intended for those users planning to launch Tomcat through the Windows shortcuts or services.</li>
<li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat Administration webapp only.</li>
- <li>apache-tomcat-[version]-compat.zip or .tar.gz: required in addition to the base distro for using Tomcat with a Java 1.4 environment.</li>
<li>apache-tomcat-[version]-deployer.zip or .tar.gz: the standalone Tomcat Web Application Deployer.</li>
- <li>apache-tomcat-[version]-embed.zip or .tar.gz: for using Tomcat only as an embedded servlet container.</li>
</ul>
</p>
Modified: tomcat/tc6.0.x/trunk/res/welcome.main.html
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/welcome.main.html?rev=421328&r1=421327&r2=421328&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/welcome.main.html (original)
+++ tomcat/tc6.0.x/trunk/res/welcome.main.html Wed Jul 12 10:18:35 2006
@@ -10,8 +10,8 @@
<ul>
<li><a href="RELEASE-NOTES">Release notes</a>, with important information
about known issues</li>
-<li><a href="http://tomcat.apache.org/tomcat-5.5-doc/changelog.html">Changelog</a></li>
-<li><a href="http://tomcat.apache.org/tomcat-5.5-doc/status.html">Status</a></li>
+<li><a href="http://tomcat.apache.org/tomcat-6.0-doc/changelog.html">Changelog</a></li>
+<li><a href="http://tomcat.apache.org/tomcat-6.0-doc/status.html">Status</a></li>
</ul>
</p>
@@ -20,7 +20,7 @@
of <CODE>tar</CODE> on Solaris and Mac OS X will not work with
these files.</b></P>
-<p><font color="red">Tomcat 5.5 requires JRE 5.0 by default. Read the
+<p><font color="red">Tomcat 6.0 requires JRE 5.0. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
</font></p>
@@ -29,9 +29,7 @@
<li>apache-tomcat-[version].zip or .tar.gz: base distro, all non-embedded users download this.</li>
<li>apache-tomcat-[version].exe: Windows installer with base distro contents + Windows installation.</li>
<li>apache-tomcat-[version]-admin.zip or .tar.gz: the Tomcat Administration webapp only.</li>
- <li>apache-tomcat-[version]-compat.zip or .tar.gz: required in addition to the base distro for using tomcat with a Java 1.4 environment.</li>
<li>apache-tomcat-[version]-deployer.zip or .tar.gz: the standalone Tomcat Web Application Deployer.</li>
- <li>apache-tomcat-[version]-embed.zip or .tar.gz: for using Tomcat only as an embedded servlet container.</li>
</ul>
</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/META-INF/context.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/META-INF/context.xml?rev=421328&r1=421327&r2=421328&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/META-INF/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/META-INF/context.xml Wed Jul 12 10:18:35 2006
@@ -1,12 +1 @@
-<!--
-
- 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 303123 2004-08-26 17:03:35Z remm $
-
--->
-
-
<Context antiResourceLocking="false" />
Added: tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml?rev=421328&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml Wed Jul 12 10:18:35 2006
@@ -0,0 +1 @@
+<Context antiResourceLocking="false" privileged="true" />
Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/META-INF/context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml?rev=421328&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml Wed Jul 12 10:18:35 2006
@@ -0,0 +1 @@
+<Context antiResourceLocking="false" privileged="true" />
Propchange: tomcat/tc6.0.x/trunk/webapps/manager/META-INF/context.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org