commit: 3279f6b7468f56236a369ba9ed655bdab634c55c
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Aug 7 18:35:03 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 8 11:05:17 2015 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=3279f6b7
[www-servers/jetty] Drop old, blocker for jdk-1.4--
Package-Manager: portage-2.2.20
www-servers/jetty/Manifest | 1 -
www-servers/jetty/files/5.1.3/jetty.conf | 30 ----
www-servers/jetty/files/5.1.3/jetty.etc | 2 -
www-servers/jetty/files/5.1.3/jetty.init | 36 -----
www-servers/jetty/files/5.1.3/jetty.patch | 110 --------------
www-servers/jetty/jetty-5.1.3-r1.ebuild | 239 ------------------------------
www-servers/jetty/metadata.xml | 6 -
7 files changed, 424 deletions(-)
diff --git a/www-servers/jetty/Manifest b/www-servers/jetty/Manifest
deleted file mode 100644
index 185736b..0000000
--- a/www-servers/jetty/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jetty-5.1.3-all.zip 13626924 SHA256
770e70f83510a143bb606137627376d78d9f5c5e4e4cf8e3dbc0be18d36e0a5b
diff --git a/www-servers/jetty/files/5.1.3/jetty.conf
b/www-servers/jetty/files/5.1.3/jetty.conf
deleted file mode 100644
index b9a2cb5..0000000
--- a/www-servers/jetty/files/5.1.3/jetty.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# JVM Runtime
-# Using the default setting, it will determine your JVM from the system-vm
-# set using java-config.
-# See java-config(1) manual page for assistance in determining this value.
-#
-# You can override this value with whatever path you wish.
-# Example: JAVA_HOME="/opt/sun-jdk-1.4.1.01"
-
-# Set's JAVA_HOME to current selected JRE
-JAVA_HOME="$(java-config -O)"
-
-# (Optional) Java runtime options used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTIONS=""
-
-# Where your web applications are located
-JETTY_HOME="/opt/jetty5"
-
-# Jetty's User
-JETTY_USER="jetty5"
-
-# JETTY_PORT="8080"
-
-# Jetty is quite skilled where to look for configuration
-# setup files. If JETTY_CONF is not set it defaults to
-# /etc/jetty.conf $JETTY_HOME/etc/jetty.conf (see jetty.sh)
-JETTY_CONF="/etc/jetty5.conf"
-
-# Additional CLASSPATH for Jetty to use, plus any others you need.
-#CLASSPATH="${CLASSPATH}:/YOUR_SPECIFIC_LIBDIR"
diff --git a/www-servers/jetty/files/5.1.3/jetty.etc
b/www-servers/jetty/files/5.1.3/jetty.etc
deleted file mode 100644
index 9b6816d..0000000
--- a/www-servers/jetty/files/5.1.3/jetty.etc
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/jetty5/jetty.xml
-
diff --git a/www-servers/jetty/files/5.1.3/jetty.init
b/www-servers/jetty/files/5.1.3/jetty.init
deleted file mode 100644
index 8d57a35..0000000
--- a/www-servers/jetty/files/5.1.3/jetty.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: $
-
-JETTY_ENV="JAVA_HOME=${JAVA_HOME} JAVA_OPTIONS=\"${JAVA_OPTIONS}\""
-JETTY_ENV="${JETTY_ENV} JETTY_HOME=${JETTY_HOME}
JETTY_CONSOLE=/var/log/jetty5/jetty5.log"
-JETTY_ENV="${JETTY_ENV} JETTY_PORT=${JETTY_PORT} JETTY_CONF=${JETTY_CONF}
JETTY_RUN=${JETTY_HOME}/tmp"
-JETTY_ENV="${JETTY_ENV} CLASSPATH=${CLASSPATH}:${JETTY_ADD_CLASSPATH}"
-
-depend() {
- need net
- use dns logger postgresql mysql
-}
-
-start() {
- ebegin "Starting Jetty"
- su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh start"
- eend $?
-}
-
-stop () {
- ebegin "Stopping Jetty"
- su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh stop"
- sleep 2
- eend $?
-}
-
-svc_restart () {
- ebegin "Restarting Jetty"
- su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh stop"
- sleep 5
- cd ${JETTY_HOME}
- su - ${JETTY_USER} -c "${JETTY_ENV} ${JETTY_HOME}/bin/jetty.sh start"
- eend $?
-}
diff --git a/www-servers/jetty/files/5.1.3/jetty.patch
b/www-servers/jetty/files/5.1.3/jetty.patch
deleted file mode 100644
index af2bbe5..0000000
--- a/www-servers/jetty/files/5.1.3/jetty.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ru jetty-5.1.3/build.xml jetty-5.1.3-patched/build.xml
---- jetty-5.1.3/build.xml 2005-04-07 12:53:50.000000000 -0400
-+++ jetty-5.1.3-patched/build.xml 2005-05-15 15:30:55.000000000 -0400
-@@ -23,6 +23,7 @@
- <property name="dist" value="${basedir}/dist"/>
- <property name="contrib" value="${basedir}/contrib"/>
- <property name="extra" value="${basedir}/extra"/>
-+ <property name="extra-ext" value="${basedir}/extra/ext"/>
- <property name="classes" value="${basedir}/classes"/>
- <property name="javadoc" value="${basedir}/javadoc"/>
- <property name="logs" value="${basedir}/logs"/>
-@@ -69,6 +70,12 @@
- <exclude name="javax.xml.jaxp.jar"/>
- <exclude name="crimson.jar"/>
- </fileset>
-+ <fileset dir="${extra-ext}">
-+ <include name="*.jar"/>
-+ <include name="*.JAR"/>
-+ <include name="*.zip"/>
-+ <include name="*.ZIP"/>
-+ </fileset>
- </path>
-
- <path id="classpath">
-diff -ru jetty-5.1.3/etc/jetty.xml jetty-5.1.3-patched/etc/jetty.xml
---- jetty-5.1.3/etc/jetty.xml 2005-03-29 13:36:28.000000000 -0500
-+++ jetty-5.1.3-patched/etc/jetty.xml 2005-05-15 15:30:55.000000000 -0400
-@@ -24,7 +24,7 @@
- <Call name="add">
- <Arg>
- <New class="org.mortbay.log.OutputStreamLogSink">
-- <Set name="filename"><SystemProperty name="jetty.home"
default="."/>/logs/yyyy_mm_dd.jetty.log</Set>
-+ <Set name="filename">/var/log/jetty5/yyyy_mm_dd.jetty.log</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">true</Set>
- <Set name="logLabels">true</Set>
-@@ -64,7 +64,7 @@
- </New>
- </Arg>
- </Call>
--
-+ -->
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add a HTTPS SSL listener on port 8443 -->
-@@ -192,7 +192,7 @@
- <!-- =============================================================== -->
- <Set name="RequestLog">
- <New class="org.mortbay.http.NCSARequestLog">
-- <Arg><SystemProperty name="jetty.home"
default="."/>/logs/yyyy_mm_dd.request.log</Arg>
-+ <Arg>/var/log/jetty5/yyyy_mm_dd.request.log</Arg>
- <Set name="retainDays">90</Set>
- <Set name="append">true</Set>
- <Set name="extended">false</Set>
-diff -ru jetty-5.1.3/extra/unix/bin/jetty.sh
jetty-5.1.3-patched/extra/unix/bin/jetty.sh
---- jetty-5.1.3/extra/unix/bin/jetty.sh 2003-09-16 06:03:34.000000000
-0400
-+++ jetty-5.1.3-patched/extra/unix/bin/jetty.sh 2005-05-15
15:30:55.000000000 -0400
-@@ -155,6 +155,7 @@
- Jetty \
- jetty3 \
- Jetty3 \
-+ jetty-5 \
- "
-
- JETTY_HOME=
-@@ -184,10 +185,10 @@
- #####################################################
- # Check that jetty is where we think it is
- #####################################################
--if [ ! -r $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE ]
-+if [ ! -r /usr/share/jetty-5/$JETTY_INSTALL_TRACE_FILE ]
- then
- echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
-- echo "** ERROR: $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"
-+ echo "** ERROR: /usr/share/jetty-5/$JETTY_INSTALL_TRACE_FILE is not
readable!"
- exit 1
- fi
-
-@@ -362,7 +363,7 @@
- echo $VERSION:$J
- done
- done
-- done | sort | tail -1 > $TMPJ
-+ done | sort | tail -n 1 > $TMPJ
- JAVA=`cat $TMPJ | cut -d: -f2`
- JVERSION=`cat $TMPJ | cut -d: -f1`
-
-@@ -397,7 +398,7 @@
- exit 1
- fi
-
--JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -1)" : '.*1\.\([0-9]\)'`
-+JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -n 1)" : '.*1\.\([0-9]\)'`
-
- #####################################################
- # See if JETTY_PORT is defined
-@@ -422,11 +423,11 @@
- #####################################################
- if [ $JAVA_VERSION -lt 4 ]
- then
-- CP=$(ls $JETTY_HOME/ext/*.jar $JETTY_HOME/lib/*.jar | \
-+ CP=$(ls /usr/share/jetty-5/lib/*.jar | \
- egrep -v org.mortbay.jetty.jar | \
- paste -s -d"$PATH_SEPARATOR" - )
- else
-- CP=$(ls $JETTY_HOME/ext/*.jar $JETTY_HOME/lib/*.jar | \
-+ CP=$(ls /usr/share/jetty-5/lib/*.jar | \
- egrep -v org.mortbay.jetty-jdk1.2.jar\|crimson.jar\|javax.xml.jaxp.jar
| \
- paste -s -d"$PATH_SEPARATOR" - )
- fi
diff --git a/www-servers/jetty/jetty-5.1.3-r1.ebuild
b/www-servers/jetty/jetty-5.1.3-r1.ebuild
deleted file mode 100644
index 944c7ce..0000000
--- a/www-servers/jetty/jetty-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A Lightweight Servlet Engine"
-
-SLOT="5"
-SRC_URI="mirror://sourceforge/jetty/${P}-all.zip"
-HOMEPAGE="http://www.mortbay.org/";
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-1.1"
-
-DEP=">=dev-java/commons-el-1.0
- >=dev-java/commons-logging-1.0.4
- >=dev-java/mx4j-core-3.0
- >=dev-java/mx4j-tools-3.0
- >=dev-java/xerces-2.7
- =dev-java/xml-commons-external-1.3*
- dev-java/tomcat-jasper"
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- >=dev-java/ant-1.6
- test? ( dev-java/junit )
- ${DEP}"
-RDEPEND=">=virtual/jre-1.4
- ${DEP}"
-
-# extra? ( dev-java/gnu-activation
-# =dev-java/commons-cli-1*
-# >=dev-java/log4j-1.2
-# >=dev-java/jta-1.0.1
-# >=dev-java/sun-javamail-1.3.1)"
-
-# disabling extra until all dependencies are packaged
-#IUSE="doc extra jikes junit source"
-IUSE="doc test source"
-
-JETTY_NAME="${PN}-${SLOT}"
-JETTY_HOME="/opt/${JETTY_NAME}"
-
-pkg_setup() {
- enewgroup ${JETTY_NAME}
- enewuser ${JETTY_NAME} -1 /bin/bash ${JETTY_HOME} ${JETTY_NAME}
- java-pkg-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
- if use source; then
- S_ORIG="${WORKDIR}/${P}.orig"
- cp -a "${S}" "${S_ORIG}" || die
- fi
- epatch ${FILESDIR}/${PV}/${PN}.patch
-
- cd "${S}/ext" || die
- rm *.jar || die
- java-pkg_jar-from commons-el commons-el.jar
- java-pkg_jar-from commons-logging commons-logging.jar
- java-pkg_jar-from mx4j-core-3.0 mx4j-impl.jar
- java-pkg_jar-from mx4j-tools-3.0 mx4j-tools.jar
- java-pkg_jar-from mx4j-core-3.0 mx4j-remote.jar
- java-pkg_jar-from mx4j-core-3.0 mx4j.jar
- java-pkg_jar-from xerces-2 xercesImpl.jar
- java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
- java-pkg_jar-from tomcat-jasper-2
-
-# if use extra; then
-# cd ${S}/extra/ext
-# for JAR in commons-cli jta-spec1_0_1.jar log4j mail; do
-# rm -f ${JAR}*.jar
-# done
-# java-pkg_jar-from gnu-activation
-# # TODO carol.jar ... dev-java/carol
-# java-pkg_jar-from commons-cli-1 commons-cli.jar
-# # TODO connector.jar
-# # TODO howl.jar dev-java/howl-logger
-# java-pkg_jar-from hsqldb hsqldb.jar
-# # TODO jotm.jar, jotm_iiop_stubs, jotm_jrmp_stubs...
dev-java/jotm
-# # TODO jta-spec
-# java-pkg_jar-from jta jta.jar
-# # TODO jts1_0.jar ... dev-java/sun-jts-bin
-# java-pkg_jar-from log4j log4j.jar
-# java-pkg_jar-from sun-javamail mail.jar
-# # TODO: xapool... dev-java/xapool
-# fi
-}
-
-src_compile() {
- eant clean webapps prepare jars $(use_doc -Djavadoc=api javadoc)
-
-# if use extra; then
-# einfo "Building extra packages..."
-# cd ${S}/extra
-# ant ${antflags} do.plus do.loadbalancer do.ftp || die "Building
extra packages failed."
-# fi
-}
-
-src_test() {
- eant test
-}
-
-pkg_preinst() {
- chown -R ${JETTY_NAME}:${JETTY_NAME} "${D}" || die
-}
-
-src_install() {
- OPTS_1="-m 750 -o ${JETTY_NAME} -g ${JETTY_NAME}"
- OPTS_2="-m 640 -o ${JETTY_NAME} -g ${JETTY_NAME}"
-
- cd ${S}
-
- einfo "Installing main packages..."
- diropts ${OPTS_1}
- insopts ${OPTS_1}
-
- insinto /etc/init.d
- newins ${FILESDIR}/${PV}/${PN}.init ${JETTY_NAME}
-
- dodir ${JETTY_HOME} ${JETTY_HOME}/bin ${JETTY_HOME}/tmp
${JETTY_HOME}/webapps /etc/${JETTY_NAME} /var/log/${JETTY_NAME}
-
- keepdir ${JETTY_HOME}/tmp
- keepdir /var/log/${JETTY_NAME}
- touch ${D}/var/log/${JETTY_NAME}/${JETTY_NAME}.log
-
- into ${JETTY_HOME}
- dobin ${S}/extra/unix/bin/jetty.sh
-
- insopts ${OPTS_2}
-
- insinto /etc
- newins ${FILESDIR}/${PV}/${PN}.etc ${JETTY_NAME}.conf
-
- insinto /etc/conf.d
- newins ${FILESDIR}/${PV}/${PN}.conf ${JETTY_NAME}
-
- insinto ${JETTY_HOME}
- dodoc ${S}/*.TXT
-
- cd "${S}/etc" || die
- insinto /etc/${JETTY_NAME}
- doins admin.xml commons-logging.properties jetty.xml
simplelog.properties webdefault.xml
- dodoc LICENSE.*
-
- cd "${S}/webapps" || die
- cp -a * "${D}/${JETTY_HOME}/webapps" || die
-
- into /usr
- java-pkg_dojar ${S}/lib/*.jar
-
- java-pkg_dohtml -r ${S}/api
-
-# if use extra; then
-# einfo "Installing extra packages..."
-# dodir ${JETTY_HOME}/demo /etc/${JETTY_NAME}/dtd
-# cp -a ${S}/demo/* ${D}/${JETTY_HOME}/demo
-#
-# cd ${S}/etc
-# insinto /etc/${JETTY_NAME}
-# doins demo* examplesRealm.properties ht* j2me.xml
jdbcRealm.properties jettydemo.p12 jetty.policy proxy.xml simplelog.properties
stress* watchdog.xml
-#
-# insinto /etc/${JETTY_NAME}/dtd
-# doins ${S}/etc/dtd/*
-#
-# cd ${S}/extra/etc
-# insinto ${JETTY_HOME}/extra/etc
-# doins jaas.* jettyplus.* login.conf start*.config tmtest*
-# dodoc LICENSE.*
-#
-# java-pkg_dojar ${S}/extra/ext/*.jar
-#
-# for DIR in . ftp ibmjsse j2ee jdk1.2 jsr77 jsr77/test
loadbalancer plus plus/test wadi; do
-# dodir ${JETTY_HOME}/extra/${DIR}
-# insinto ${JETTY_HOME}/extra/${DIR}
-# cd ${S}/extra/${DIR}
-# doins $(find -type f -maxdepth 1)
-# done
-#
-# for DIR in j2ee/etc jsr77/test lib plus/demo/webapps plus/test
resources wadi win32 ;do
-# dodir ${JETTY_HOME}/extra/${DIR}
-# cp -a ${S}/extra/${DIR}/*
${D}/${JETTY_HOME}/extra/${DIR}
-# done
-# fi
-
- if use source; then
- einfo "Installing source files..."
- cd "${S_ORIG}" || die
- insinto ${JETTY_HOME}
- doins ant.properties build.xml
-
- # TODO use java-pkg_dosrc
- for DIR in extra/ftp/src extra/ftp/test/src extra/ibmjsse/src
extra/j2ee/src extra/jdk1.2/src extra/jsr77/src extra/loadbalancer/src
extra/plus/demo/src extra/plus/src extra/plus/test/src src test; do
- dodir ${JETTY_HOME}/${DIR}
- cp -a "${S_ORIG}/${DIR}"/* "${D}/${JETTY_HOME}/${DIR}"
|| die
- done
- fi
-
- einfo "Fixing permissions..."
- chown -R ${JETTY_NAME}:${JETTY_NAME} "${D}/${JETTY_HOME}" || die
- chmod -R 755 "${D}/${JETTY_HOME}" || die
-}
-
-pkg_postinst() {
- einfo
- einfo " NOTICE!"
- einfo " User and group '${JETTY_NAME}' have been added."
- einfo " "
- einfo " FILE LOCATIONS:"
- einfo " 1. Jetty home directory: ${JETTY_HOME}"
- einfo " Contains application data, configuration files."
- einfo " 2. Runtime settings: /etc/conf.d/${JETTY_NAME}"
- einfo " Contains CLASSPATH,JAVA_HOME,JAVA_OPTIONS,JETTY_PORT"
- einfo " JETTY_USER,JETTY_CONF setting"
- einfo " 3. You can configure your 'webapp'-lications in
/etc/${JETTY_NAME}.conf"
- einfo " (the default configured webapps are the JETTY's demo/admin)"
- einfo " 4. For more information about JETTY refer to jetty.mortbay.org"
- einfo " 5. Logs are located at:"
- einfo " /var/log/${JETTY_NAME}"
- einfo
- einfo " STARTING AND STOPPING JETTY:"
- einfo " /etc/init.d/${JETTY_NAME} start"
- einfo " /etc/init.d/${JETTY_NAME} stop"
- einfo " /etc/init.d/${JETTY_NAME} restart"
- einfo " "
- einfo " "
- einfo " NETWORK CONFIGURATION:"
- einfo " By default, Jetty runs on port 8080. You can change this"
- einfo " value by setting JETTY_PORT in /etc/conf.d/${JETTY_NAME} ."
- einfo " "
- einfo " To test Jetty while it's running, point your web browser to:"
- einfo " http://localhost:8080/";
- einfo
- einfo " BUGS:"
- einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
- einfo " may not get seen. Thank you!"
- einfo
-}
diff --git a/www-servers/jetty/metadata.xml b/www-servers/jetty/metadata.xml
deleted file mode 100644
index 604e0a4..0000000
--- a/www-servers/jetty/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <herd>java</herd>
-</pkgmetadata>
-
