Import tomcat-8.0.14

bogus @conflict,@pkgpath annotations spotted by jasper@
ok ian@
This commit is contained in:
dcoppa 2014-10-06 08:15:50 +00:00
parent 3df56a7aba
commit 64e58d020b
9 changed files with 3288 additions and 0 deletions

9
www/tomcat/v8/Makefile Normal file
View File

@ -0,0 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2014/10/06 08:15:50 dcoppa Exp $
COMMENT-main = Java servlet 3.1 and Java server pages 2.3 server
MAJ_VER = 8
MIN_VER = 0
MICRO_VER = 14
.include <bsd.port.mk>

4
www/tomcat/v8/distinfo Normal file
View File

@ -0,0 +1,4 @@
SHA256 (apache-tomcat-8.0.14-fulldocs.tar.gz) = 6benPiPXSQzkfknx7CmVI1IYDH6i+/X2nQbt/pEhES0=
SHA256 (apache-tomcat-8.0.14.tar.gz) = +C+5+pgc6MeTxhlMDu4APtzH7F3C8PBq8DdHLjsPbFE=
SIZE (apache-tomcat-8.0.14-fulldocs.tar.gz) = 5716796
SIZE (apache-tomcat-8.0.14.tar.gz) = 9203276

View File

@ -0,0 +1,43 @@
$OpenBSD: patch-conf_server_xml,v 1.1.1.1 2014/10/06 08:15:50 dcoppa Exp $
--- conf/server.xml.orig Wed Sep 24 22:05:51 2014
+++ conf/server.xml Fri Oct 3 13:17:54 2014
@@ -66,12 +66,12 @@
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
- <Connector port="8080" protocol="HTTP/1.1"
+ <Connector address="0.0.0.0" port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
<!-- A "Connector" using the shared thread pool-->
<!--
- <Connector executor="tomcatThreadPool"
+ <Connector executor="tomcatThreadPool" address="0.0.0.0"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
@@ -82,13 +82,13 @@
OpenSSL style configuration is required as described in the APR/native
documentation -->
<!--
- <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+ <Connector address="0.0.0.0" port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+ <Connector address="0.0.0.0" port="8009" protocol="AJP/1.3" redirectPort="8443" />
<!-- An Engine represents the entry point (within Catalina) that processes
@@ -120,7 +120,7 @@
resourceName="UserDatabase"/>
</Realm>
- <Host name="localhost" appBase="webapps"
+ <Host name="localhost" appBase="${CATALINA_BASE}/webapps"
unpackWARs="true" autoDeploy="true">
<!-- SingleSignOn valve, share authentication between web applications

View File

@ -0,0 +1 @@
Example web applications and full documentation for Tomcat.

View File

@ -0,0 +1,7 @@
Tomcat 8 is a Servlet/JSP container that implements the Servlet 3.1
and JavaServer Pages 2.3 specifications from the Java Community
Process. Tomcat includes many additional features that make it a
useful platform for developing and deploying web applications and
web services. Tomcat can be run as a standalone web server with
Servlet and JSP support, or using Apache HTTP Server as its web
server via the mod_jk Apache module (the www/mod_jk package).

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,162 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2014/10/06 08:15:54 dcoppa Exp $
@newgroup _tomcat:526
@newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin
@extraunexec rm -rf ${CATALINA_BASE}/logs/* ${CATALINA_BASE}/work/*
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/tomcat/
@owner _tomcat
@group _tomcat
@sample ${SYSCONFDIR}/tomcat/
@owner
@group
share/examples/tomcat/catalina.policy
@owner _tomcat
@group _tomcat
@sample ${SYSCONFDIR}/tomcat/catalina.policy
@owner
@group
share/examples/tomcat/catalina.properties
@owner _tomcat
@group _tomcat
@sample ${SYSCONFDIR}/tomcat/catalina.properties
@owner
@group
share/examples/tomcat/context.xml
@owner _tomcat
@group _tomcat
@sample ${SYSCONFDIR}/tomcat/context.xml
@owner
@group
share/examples/tomcat/host-manager.xml
share/examples/tomcat/logging.properties
@owner _tomcat
@group _tomcat
@sample ${SYSCONFDIR}/tomcat/logging.properties
@owner
@group
share/examples/tomcat/manager.xml
share/examples/tomcat/server.xml
@owner _tomcat
@group _tomcat
@sample ${SYSCONFDIR}/tomcat/server.xml
@owner
@group
share/examples/tomcat/tomcat-users.xml
@mode 600
@owner _tomcat
@group _tomcat
@sample ${SYSCONFDIR}/tomcat/tomcat-users.xml
@mode
@owner
@group
share/examples/tomcat/web.xml
@owner _tomcat
@group _tomcat
@sample ${SYSCONFDIR}/tomcat/web.xml
@sample ${CATALINA_BASE}/
@sample ${CATALINA_BASE}/logs/
@sample ${CATALINA_BASE}/shared/
@sample ${CATALINA_BASE}/shared/classes/
@sample ${CATALINA_BASE}/shared/lib/
@sample ${CATALINA_BASE}/temp/
@sample ${CATALINA_BASE}/webapps/
@sample ${CATALINA_BASE}/work/
@exec if [ ! -e ${CATALINA_BASE}/conf ]; then ln -sf ${CONFDIR} ${CATALINA_BASE}/conf; fi
@unexec if [ -h ${CATALINA_BASE}/conf ]; then rm ${CATALINA_BASE}/conf; fi
@owner
@group
tomcat/
tomcat/LICENSE
tomcat/NOTICE
tomcat/RELEASE-NOTES
tomcat/RUNNING.txt
tomcat/bin/
tomcat/bin/bootstrap.jar
tomcat/bin/catalina-tasks.xml
tomcat/bin/catalina.sh
tomcat/bin/commons-daemon-native.tar.gz
tomcat/bin/commons-daemon.jar
tomcat/bin/configtest.sh
tomcat/bin/daemon.sh
tomcat/bin/digest.sh
tomcat/bin/setclasspath.sh
tomcat/bin/shutdown.sh
tomcat/bin/startup.sh
tomcat/bin/tomcat-juli.jar
tomcat/bin/tomcat-native.tar.gz
tomcat/bin/tool-wrapper.sh
tomcat/bin/version.sh
tomcat/lib/
tomcat/lib/annotations-api.jar
tomcat/lib/catalina-ant.jar
tomcat/lib/catalina-ha.jar
tomcat/lib/catalina-storeconfig.jar
tomcat/lib/catalina-tribes.jar
tomcat/lib/catalina.jar
tomcat/lib/ecj-4.4.jar
tomcat/lib/el-api.jar
tomcat/lib/jasper-el.jar
tomcat/lib/jasper.jar
tomcat/lib/jsp-api.jar
tomcat/lib/servlet-api.jar
tomcat/lib/tomcat-api.jar
tomcat/lib/tomcat-coyote.jar
tomcat/lib/tomcat-dbcp.jar
tomcat/lib/tomcat-i18n-es.jar
tomcat/lib/tomcat-i18n-fr.jar
tomcat/lib/tomcat-i18n-ja.jar
tomcat/lib/tomcat-jdbc.jar
tomcat/lib/tomcat-jni.jar
tomcat/lib/tomcat-spdy.jar
tomcat/lib/tomcat-util-scan.jar
tomcat/lib/tomcat-util.jar
tomcat/lib/tomcat-websocket.jar
tomcat/lib/websocket-api.jar
tomcat/webapps/
tomcat/webapps/host-manager/
tomcat/webapps/host-manager/META-INF/
tomcat/webapps/host-manager/META-INF/context.xml
tomcat/webapps/host-manager/WEB-INF/
tomcat/webapps/host-manager/WEB-INF/jsp/
tomcat/webapps/host-manager/WEB-INF/jsp/401.jsp
tomcat/webapps/host-manager/WEB-INF/jsp/403.jsp
tomcat/webapps/host-manager/WEB-INF/jsp/404.jsp
tomcat/webapps/host-manager/WEB-INF/web.xml
tomcat/webapps/host-manager/images/
tomcat/webapps/host-manager/images/add.gif
tomcat/webapps/host-manager/images/asf-logo.gif
tomcat/webapps/host-manager/images/code.gif
tomcat/webapps/host-manager/images/design.gif
tomcat/webapps/host-manager/images/docs.gif
tomcat/webapps/host-manager/images/fix.gif
tomcat/webapps/host-manager/images/tomcat.gif
tomcat/webapps/host-manager/images/update.gif
tomcat/webapps/host-manager/images/void.gif
tomcat/webapps/host-manager/index.jsp
tomcat/webapps/host-manager/manager.xml
tomcat/webapps/manager/
tomcat/webapps/manager/META-INF/
tomcat/webapps/manager/META-INF/context.xml
tomcat/webapps/manager/WEB-INF/
tomcat/webapps/manager/WEB-INF/jsp/
tomcat/webapps/manager/WEB-INF/jsp/401.jsp
tomcat/webapps/manager/WEB-INF/jsp/403.jsp
tomcat/webapps/manager/WEB-INF/jsp/404.jsp
tomcat/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
tomcat/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/webapps/manager/WEB-INF/jsp/sessionsList.jsp
tomcat/webapps/manager/WEB-INF/web.xml
tomcat/webapps/manager/images/
tomcat/webapps/manager/images/add.gif
tomcat/webapps/manager/images/asf-logo.gif
tomcat/webapps/manager/images/code.gif
tomcat/webapps/manager/images/design.gif
tomcat/webapps/manager/images/docs.gif
tomcat/webapps/manager/images/fix.gif
tomcat/webapps/manager/images/tomcat.gif
tomcat/webapps/manager/images/update.gif
tomcat/webapps/manager/images/void.gif
tomcat/webapps/manager/index.jsp
tomcat/webapps/manager/status.xsd
tomcat/webapps/manager/xform.xsl
@rcscript ${RCDIR}/tomcat

View File

@ -0,0 +1,35 @@
$OpenBSD: README-main,v 1.1.1.1 2014/10/06 08:15:54 dcoppa Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
+-----------------------------------------------------------------------
The tomcat package does not install the example webapps and
documentation. You must supply your own webapps and configuration or
install the tomcat-examples package for the example webapps and
documentation. Sample config files for the host-manager and manager
webapps can be found in ${TRUEPREFIX}/share/examples/tomcat.
The tomcat-examples package includes the examples, full documentation
and the localhost config files for the host-manager and manager webapps.
The packages are structured this way to facilitate maintaining a server
which normally would not contain the examples and documentation webapp.
Tomcat on OpenBSD uses the `${SYSCONFDIR}/tomcat' directory for its
configuration files. `$CATALINA_BASE' is `${CATALINA_BASE}'. All files
contained within these directories should be owned by the _tomcat user.
If you want Tomcat to serve on privileged ports (e.g. 80), redirect all
tcp traffic to port 80 to Tomcat's default listener port 8080 using a
pf.conf(5) rule like:
pass in quick on $NIC proto tcp to port 80 rdr-to 127.0.0.1 port 8080
or use relayd(8) to forward the connection.
If you are upgrading and use database drivers, don't forget to copy them
into ${TRUEPREFIX}/tomcat/lib. You must also delete any work files in
`${CATALINA_BASE}/work' unless you are reinstalling the same full
version of Tomcat. When upgrading from older major versions of Tomcat,
config files in ${SYSCONFDIR}/tomcat should be updated as well.

View File

@ -0,0 +1,29 @@
#!/bin/sh
#
# $OpenBSD: tomcat.rc,v 1.1.1.1 2014/10/06 08:15:54 dcoppa Exp $
daemon="${TRUEPREFIX}/tomcat/bin/catalina.sh"
daemon_flags="-server"
daemon_user="_tomcat"
. /etc/rc.d/rc.subr
pexp="$(${LOCALBASE}/bin/javaPathHelper -h tomcat).*-Dcatalina.base=${CATALINA_BASE}.*org.apache.catalina.startup.Bootstrap.*"
rc_reload=NO
rc_start() {
${rcexec} \
"CATALINA_BASE=\"${CATALINA_BASE}\" \
CATALINA_OPTS=\"${daemon_flags}\" \
JAVA_HOME=\"$(${LOCALBASE}/bin/javaPathHelper -h tomcat)\" ${daemon} start"
}
rc_stop() {
CATALINA_BASE="${CATALINA_BASE}" \
CATALINA_OPTS="${daemon_flags}" \
JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h tomcat)" \
${daemon} stop
}
rc_cmd $1