<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/88133431d7d479a065daab56df9185f193fdabf3">https://github.com/macports/macports-ports/commit/88133431d7d479a065daab56df9185f193fdabf3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8813343 tomcat6, servlet25-api: delete EOL ports
</span>8813343 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 88133431d7d479a065daab56df9185f193fdabf3
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu Apr 25 07:29:22 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> tomcat6, servlet25-api: delete EOL ports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> End-of-lifed by upstream in 2016.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/25663
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/36792
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/37515
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/51099
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52449
</span>---
java/servlet25-api/Portfile | 43 ----
java/tomcat6/Portfile | 240 ----------------------
java/tomcat6/files/conf_setup.sh | 47 -----
java/tomcat6/files/patch-bin-catalina.sh | 14 --
java/tomcat6/files/patch-build.properties.default | 11 -
java/tomcat6/files/patch-build.xml.diff | 34 ---
java/tomcat6/files/patch-catalina.sh | 14 --
java/tomcat6/files/setenv.local | 11 -
java/tomcat6/files/setenv.sh | 44 ----
java/tomcat6/files/tomcat6.sh | 17 --
java/tomcat6/files/tomcatctl | 234 ---------------------
11 files changed, 709 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/servlet25-api/Portfile b/java/servlet25-api/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f20bb3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/servlet25-api/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name servlet25-api
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0.35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license Apache-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {blair @blair} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Java Servlet 2.5 and JSP 2.1 APIs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The Java Servlet and JavaServer Pages specifications are developed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- by Sun under the Java Community Process. This project provides \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the servlet and JSP API jars from Tomcat 6.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://jakarta.apache.org/tomcat/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir tomcat6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname apache-tomcat-${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites apache:tomcat/tomcat-6/v${version}/src/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 4d44a7e7610a83ebe930a781257a8b1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 1a47ad41d52a27757cfeddf7fa1627688ed4027a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d292b210fe62aafec4a074e3a626766585367a3e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib bin:java:kaffe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build bin:ant:apache-ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ANT_OPTS=-Xmx1024m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target download build-only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args -Dbase.path=${worksrcpath}/repository
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/java \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/output/build/lib/jsp-api.jar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/jsp21-api.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/output/build/lib/servlet-api.jar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/servlet25-api.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/Portfile b/java/tomcat6/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index de981db..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,240 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name tomcat6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0.53
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories java www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {blair @blair} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license Apache-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Tomcat 6 HTTP Server and Java Servlet Container.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Tomcat is the servlet container that is used in the official \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Reference Implementation for the Java Servlet and JavaServer Pages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- technologies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://tomcat.apache.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname apache-tomcat-${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites apache:tomcat/tomcat-6/v${version}/src/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 7c6bd23abcaa1b91c0fd5061945d97e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 307a5e5699904de924e8918527361d680d278bcd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0392a1d04554c91b8efc3c62becbda634de2031f0366925378047062a2098d30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-bin-catalina.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build.xml.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build bin:ant:apache-ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib bin:java:kaffe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin:jsvc:commons-daemon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jakarta-taglibs-standard-11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-beanutils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-collections \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-launcher \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-daemon \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-digester \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-el \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-logging \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-modeler \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-httpclient \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-pool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-dbcp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-fileupload \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-io \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jakarta-regexp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xercesj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jakarta-log4j \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mx4j \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:junit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:saxpath
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## port:jaxen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set javaLibs ${prefix}/share/java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set home share/java/tomcat6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set tomcatuser www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set tomcatgroup www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target download
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set antArgs [join "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dversion=${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dversion.build=[lindex [split ${version} .] 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dbase.path=${worksrcpath}/Repository
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dnsis.exe=${worksrcpath}/.bogus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-beanutils.jar=${javaLibs}/commons-beanutils.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-collections.jar=${javaLibs}/commons-collections.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-launcher.jar=${javaLibs}/commons-launcher.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-daemon.jar=${javaLibs}/commons-daemon.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-digester.jar=${javaLibs}/commons-digester.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-el.jar=${javaLibs}/commons-el.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-logging.jar=${javaLibs}/commons-logging.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-logging-api.jar=${javaLibs}/commons-logging-api.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-modeler.jar=${javaLibs}/commons-modeler.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-httpclient.jar=${javaLibs}/commons-httpclient.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-pool.jar=${javaLibs}/commons-pool.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-dbcp.jar=${javaLibs}/commons-dbcp.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcommons-fileupload.jar=${javaLibs}/commons-fileupload.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dregexp.jar=${javaLibs}/jakarta-regexp.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DxercesImpl.jar=${javaLibs}/xercesImpl.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dxml-apis.jar=${javaLibs}/xml-apis.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dlog4j.jar=${javaLibs}/jakarta-log4j.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Djmx.lib=${javaLibs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Djunit.jar=${javaLibs}/junit.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dsaxpath.jar=${javaLibs}/saxpath.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Djasper.home=${worksrcpath}/../jasper
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -Dstruts.lib=${javaLibs}/struts/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## -Djaxen.jar=${javaLibs}/jaxen.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args $antArgs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tomcat in this version requires ant 1.6.5.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If the current version of ant is not at least 1.6.5 then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # tell the user and fail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string length [auto_execok ant]] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set verOutput [exec ant -version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- regexp {version (\d+(\.\d+)*)} $verOutput -> antVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [vercmp $antVersion "1.6.5"] < 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "This version of tomcat requires ant version 1.6.5 or better. Please install a newer ant before proceeding."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make a bogus file to prevent nsis.exe from downloading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "touch ${worksrcpath}/.bogus"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set target ${destroot}${prefix}/${home}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure we've got needed directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# setting up needed dirs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/rc.d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create the tomcat user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addgroup ${tomcatgroup}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gid [existsgroup ${tomcatgroup}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_users ${tomcatuser} gid=${gid} realname={Web Server}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install Tomcat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# installing tomcat..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && ant $antArgs deploy"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## build space:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/output/build/bin ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/output/build/conf ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/output/build/lib ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/output/build/temp ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/output/build/webapps ${target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## and classes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/output/classes ${target}/shared/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add the jstl libs to tomcat6/shared/lib so that they're
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # available to all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# adding the jstl libs "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${target}/shared/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/share/java/jstl.jar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/share/java/standard.jar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/shared/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove unwanted files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -directory ${target}/bin *.bat] { file delete $f }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Maintain empty directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# maint. empty dirs... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${target}/work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${target}/logs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/logs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/temp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/work \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/shared/classes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/common/classes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install our scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# adding our scripts "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/tomcatctl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/conf_setup.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/setenv.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# adding our scripts 2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/setenv.local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add a symlink from bin directory to tomcatctl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${destroot}${prefix}/bin && ln -s ../${home}/bin/tomcatctl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Configure the scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|PREFIX=$|PREFIX=${prefix}| ${target}/bin/tomcatctl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|TOMCAT_USER=$|TOMCAT_USER=${tomcatuser}| ${target}/bin/tomcatctl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Rename certain files as .sample to avoid replacing them on update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # These will be "repaired" by conf_setup.sh on first run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catalina.policy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catalina.properties
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- server.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tomcat-users.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- web.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setenv.local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${target}/conf/${f} ${target}/conf/${f}.sample
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix ownership of some directories tomcat really needs to write to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chown -R ${tomcatuser}:${tomcatgroup} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/logs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/temp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/webapps \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${target}/work"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install the docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/webapps/docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-install {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "#"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# Configuration files in ${prefix}/${home}/conf have been"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# installed with a .sample extension so that they won't be replaced by a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# port update. Each will be copied to its proper location during the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# first startup of tomcat by catalina.sh or tomcatctl if you don't"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# do this yourself first. If this _is_ an update, you might do a diff to"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# verify that you're not missing anything in the newer .sample versions"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# of these files."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "#"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# The script ${prefix}/${home}/bin/tomcatctl has been installed to"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# facilitate start and stop of tomcat using the jsvc utility, which allows you to"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# start tomcat as a true daemon process. Once tomcat has acquired its TCP socket,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# jsvc will drop its root privileges and run as user ${tomcatuser}."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "#"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# Under Apple Java, control over the Java version used to launch ${name} is"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# through the shell variable JAVA_JVM_VERSION. This variable should be set"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# to a java version such as 1.5, 1.6, or CurrentJDK (for the default version)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "# You may set JAVA_JVM_VERSION in ${prefix}/${home}/bin/setenv.sh."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "#"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.executable "${prefix}/bin/tomcatctl" start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.pidfile clean "${prefix}/share/java/tomcat6/logs/${name}.pid"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}/download-60.cgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "apache-tomcat-(\\d+\\.\\d+(\\.\\d+)?)-src.tar.gz"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/conf_setup.sh b/java/tomcat6/files/conf_setup.sh
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 92eb682..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/conf_setup.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# conf_setup.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This file performs a self-repair sanity check on the tomcat configuration files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Any critical files that are missing will be replaced by sample files. This is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# particularly useful in first-run situations.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note that no effort is made to ensure the validity of file contents.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PRG=`basename $0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Look for $CATALINA_BASE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z "$CATALINA_BASE" -o ! -d "$CATALINA_BASE" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$PRG: CATALINA_BASE must be set in my environment"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Look for $CATALINA_BASE/conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CONF="${CATALINA_BASE}/conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ ! -d "${CONF}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$PRG: ${CONF} directory not found!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CONF_FILES=" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf/catalina.policy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf/catalina.properties \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf/server.xml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf/tomcat-users.xml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf/web.xml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf/setenv.local \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Try to repair any needed files in conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for FILE in $CONF_FILES; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SAMPLE="${FILE}.sample"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ! -f "${CATALINA_BASE}/${FILE}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ! -f "${CATALINA_BASE}/${SAMPLE}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$PRG: file ${FILE} is missing, but no corresponding ${SAMPLE} file was found to repair it!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$PRG: file ${FILE} is missing; copying ${SAMPLE} to its place."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -p "${CATALINA_BASE}/${SAMPLE}" "${CATALINA_BASE}/${FILE}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/patch-bin-catalina.sh b/java/tomcat6/files/patch-bin-catalina.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 965bc6b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/patch-bin-catalina.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/catalina.sh.orig 2010-06-29 07:33:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/catalina.sh 2010-07-13 08:47:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,6 +220,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Run conf_setup.sh to check and repair the conf directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if [ -x "$CATALINA_HOME/bin/conf_setup.sh" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CATALINA_BASE="$CATALINA_BASE" "$CATALINA_HOME/bin/conf_setup.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ----- Execute The Requested Command -----------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Bugzilla 37848: only output this if we have a TTY
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/patch-build.properties.default b/java/tomcat6/files/patch-build.properties.default
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ebace63..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/patch-build.properties.default
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../build/build.properties.default.orig 2006-09-12 11:12:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ../build/build.properties.default 2006-11-06 20:48:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jdt.home=${base.path}/eclipse/plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jdt.lib=${jdt.home}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.1.2.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+jdt.loc=http://archive.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ----- Tomcat native library -----
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/patch-build.xml.diff b/java/tomcat6/files/patch-build.xml.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 282f76f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/patch-build.xml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.xml.orig 2017-08-26 18:47:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build.xml 2017-08-26 18:48:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,6 +158,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!-- Compile internal server components -->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <javac srcdir="java" destdir="${tomcat.classes}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug="${compile.debug}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deprecation="${compile.deprecation}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source="${compile.source}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -574,6 +575,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <!-- Build classes for examples webapp -->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <javac srcdir="webapps/examples/WEB-INF/classes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug="${compile.debug}" deprecation="${compile.deprecation}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source="${compile.source}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -584,6 +586,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </javac>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <javac srcdir="webapps/examples/jsp/plugin/applet"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug="${compile.debug}" deprecation="${compile.deprecation}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source="${compile.source}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1065,6 +1068,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </move>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <mkdir dir="${tomcat-dbcp.home}/classes"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <javac destdir="${tomcat-dbcp.home}/classes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug="${compile.debug}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deprecation="${compile.deprecation}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- source="${compile.source}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/patch-catalina.sh b/java/tomcat6/files/patch-catalina.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b5bfb9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/patch-catalina.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../container/catalina/src/bin/catalina.sh.orig 2005-09-23 06:45:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ../container/catalina/src/bin/catalina.sh 2005-10-25 12:54:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,6 +146,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Run conf_setup.sh to check and repair the conf directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if [ -x "$CATALINA_HOME/bin/conf_setup.sh" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CATALINA_BASE="$CATALINA_BASE" "$CATALINA_HOME/bin/conf_setup.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ----- Execute The Requested Command -----------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Using CATALINA_BASE: $CATALINA_BASE"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/setenv.local b/java/tomcat6/files/setenv.local
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6c7e4b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/setenv.local
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# setenv.local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This script, if present, is executed by tomcatctl through setenv.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in order to set up any environment prior to executation of tomcat.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# For Apple Java, JAVA_JVM_VERSION may be used to specify a particular
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# java version to run. It should be something like 1.4, 1.5, or CurrentJDK.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#export JAVA_JVM_VERSION=1.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/setenv.sh b/java/tomcat6/files/setenv.sh
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index ac4fd2c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/setenv.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# setenv.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# You may edit this script to set defaults for such variables as JAVA_HOME.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# For Apple Java, the $JAVA_HOME is not well respected by the JNI launching code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in jsvc. On Apple Java systems, you are better off setting JAVA_JVM_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to the proper java name, such as 1.4, 1.5, or CurrentJDK, and let JAVA_HOME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# be calculated from that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# First source the conf/setenv.local file to allow user to configure environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in an even more minimal fashion.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -r "$CATALINA_HOME/conf/setenv.local" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- . "$CATALINA_HOME/conf/setenv.local"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Attempt to set JAVA_HOME if it's not already set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z "$JAVA_HOME" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set JAVA_JVM_VERSION and JAVA_HOME for Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ `uname -s` = "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Look for a java version specified by JAVA_JVM_VERSION, falling back to current version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set JAVA_HOME to reflect the version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for jversion in $JAVA_JVM_VERSION CurrentJDK ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jhome="/System/Library/Frameworks/JavaVM.framework/Versions/${jversion}/Home"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -z "$JAVA_HOME" -a -d "${jhome}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the actual version that any symlink points to, since
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # jni doesn't like JAVA_JVM_VERSION set to CurrentJDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- saved=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "/System/Library/Frameworks/JavaVM.framework/Versions/${jversion}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- actualvers=$(basename $(pwd -P))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd $saved
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export JAVA_JVM_VERSION=${actualvers}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export JAVA_HOME=${jhome}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/tomcat6.sh b/java/tomcat6/files/tomcat6.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 696c448..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/tomcat6.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TOMCATPREFIX=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TOMCATCTL=${TOMCATPREFIX}/bin/tomcatctl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case "$1" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-start)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -x ${TOMCATCTL} ] && ${TOMCATCTL} start >/dev/null && echo -n ' tomcat6'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-stop)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -x ${TOMCATCTL} ] && ${TOMCATCTL} stop >/dev/null && echo -n ' tomcat6'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Usage: `basename $0` {start|stop}" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exit 0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/tomcat6/files/tomcatctl b/java/tomcat6/files/tomcatctl
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 44fdf26..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/tomcat6/files/tomcatctl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,234 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# tomcatctl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Tomcat control script to control tomcat running under jsvc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# USAGE: tomcatctl [--jdpa] start|stop|restart|status|info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be customized by installer...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PREFIX=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TOMCAT_USER=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-WC=wc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-JSVC="$PREFIX/bin/jsvc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#JSVC_ENV=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#JSVC_DEBUG="-debug -verbose"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Calculate CATALINA_HOME based on our location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -z "$CATALINA_HOME" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Handle symlinks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRG="$0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while [ -L "$PRG" ]; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ls=`ls -ld "$PRG"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link=`expr "$ls" : '.*-> \(.*\)$'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if expr "$link" : '/.*' > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRG="$link"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRG="`dirname $PRG`/$link"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pushd "`dirname \"$PRG\"`/.." > /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CATALINA_HOME="`pwd -P`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- popd > /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Source the setenv.sh file to allow user to configure environment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# including JAVA_HOME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -r "$CATALINA_HOME/bin/setenv.sh" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- . "$CATALINA_HOME/bin/setenv.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Source the setclasspath.sh file to allow setup of the CLASSPATH variable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-BASEDIR="$CATALINA_HOME"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-. "$CATALINA_HOME/bin/setclasspath.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Set variable default values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -z "$CATALINA_BASE" ] && CATALINA_BASE="${CATALINA_HOME}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -z "$CATALINA_TMPDIR" ] && CATALINA_TMPDIR="${CATALINA_BASE}/temp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -z "$TOMCAT_PIDNAME" ] && TOMCAT_PIDNAME="tomcat6.pid"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -z "$TOMCAT_PIDFILE" ] && TOMCAT_PIDFILE="${CATALINA_BASE}/logs/${TOMCAT_PIDNAME}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -z "$TOMCAT_USER" ] && TOMCAT_USER=tomcat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -z "$JAVA_ENDORSED_DIRS" ] && JAVA_ENDORSED_DIRS=${CATALINA_BASE}/common/endorsed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -z "$JPDA_TRANSPORT" ] && JPDA_TRANSPORT=dt_socket
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[ -z "$JPDA_ADDRESS" ] && JPDA_ADDRESS=8000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -r "${CATALINA_HOME}/bin/tomcat-juli.jar" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-usage()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat <<EOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-USAGE: `basename $0` [--jpda] start|stop|restart|status|info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-EOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-check()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PID=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNNING=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATUS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -f "$TOMCAT_PIDFILE" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PID=`cat $TOMCAT_PIDFILE`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$PID" -a `ps $PID | $WC -l` -gt 1 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATUS="running (pid $PID)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNNING=$PID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATUS="not running (stale pid $PID?)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNNING=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATUS="not running"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNNING=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-start()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Run conf_setup.sh to check and repair the conf directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -x "$CATALINA_HOME/bin/conf_setup.sh" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CATALINA_BASE="$CATALINA_BASE" "$CATALINA_HOME/bin/conf_setup.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "Starting Tomcat..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$RUNNING" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "already $STATUS\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove any existing pid file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f "$TOMCAT_PIDFILE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Start Tomcat using jsvc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $JSVC_ENV $JSVC $JSVC_DEBUG $JAVA_OPTS $JPDA_OPTS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -home "$JAVA_HOME" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -user "$TOMCAT_USER" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -classpath "${CLASSPATH}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -pidfile "$TOMCAT_PIDFILE" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -outfile "$CATALINA_BASE/logs/catalina.out" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -errfile "$CATALINA_BASE/logs/catalina.err" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcatalina.home="$CATALINA_HOME" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dcatalina.base="$CATALINA_BASE" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Djava.io.tmpdir="$CATALINA_TMPDIR" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -jvm server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- org.apache.catalina.startup.Bootstrap "$@" start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Wait for it to really start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ((CNT=0; CNT < 15; ++CNT)); do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -f "$TOMCAT_PIDFILE" ] && break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sleep 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Let 'em know what happened
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$RUNNING" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf " started. (pid $PID)\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf " giving up.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-stop()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "Stopping Tomcat..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -z "$RUNNING" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "already $STATUS\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "(pid $PID)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Stop Tomcat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kill $PID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Wait for it to really stop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ((CNT=0; CNT < 15; ++CNT)); do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -f "$TOMCAT_PIDFILE" ] || break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sleep 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Let 'em know what happened
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -z "$RUNNING" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf " stopped.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf " giving up.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Ensure at least one parameter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ $# -lt 1 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parameter Handling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-while [ $# -gt 0 ]; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$1" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --jpda)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -z "$JPDA_OPTS" ] && JPDA_OPTS="-Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stop)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- restart)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "Tomcat is $STATUS\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat <<EOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tomcat is $STATUS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CATALINA_HOME $CATALINA_HOME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CATALINA_BASE $CATALINA_BASE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CATALINA_TMPDIR $CATALINA_TMPDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-JAVA_HOME $JAVA_HOME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CLASSPATH $CLASSPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-TOMCAT_PIDFILE $TOMCAT_PIDFILE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-JAVA_OPTS $JAVA_OPTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-JPDA_OPTS $JPDA_OPTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-EOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "$0: unrecognized option '$1'\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- shift
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span></pre><pre style='margin:0'>
</pre>