Index: head/www/jetty/Makefile =================================================================== --- head/www/jetty/Makefile (revision 310486) +++ head/www/jetty/Makefile (revision 310487) @@ -1,89 +1,90 @@ # Created by: Stephane Legrand # $FreeBSD$ PORTNAME= jetty -DISTVERSION= 6.1.26 +PORTVERSION= 8.1.8 CATEGORIES= www java -MASTER_SITES= http://dist.codehaus.org/jetty/${PORTNAME}-${DISTVERSION}/ +MASTER_SITES= ${MASTER_SITE_ECLIPSE} +MASTER_SITE_SUBDIR=jetty/stable-8/dist +DISTNAME= jetty-distribution-8.1.8.v20121106 MAINTAINER= olgeni@FreeBSD.org COMMENT= Full-featured web server implemented entirely in Java USE_RC_SUBR= ${PORTNAME} -USE_ZIP= yes USE_JAVA= yes JAVA_VERSION= 1.6+ -USE_PYTHON= 1.6+ +USE_PYTHON= 2.4+ PLIST= ${WRKDIR}/pkg-plist PKGMESSAGE= ${WRKDIR}/pkg-message APP_NAME= ${PORTNAME} APP_HOME= ${PREFIX}/${PORTNAME} PID_FILE?= ${APP_HOME}/${APP_NAME}.pid RUNASUSER?= www RUNASUID?= 80 GROUP?= www GID?= 80 LOG_FILE?= ${APP_HOME}/${APP_NAME}.log SUB_LIST= \ APP_HOME=${APP_HOME} \ APP_NAME=${APP_NAME} \ JAVA_HOME=${JAVA_HOME} \ JAVA=${JAVA} \ PID_FILE=${PID_FILE} \ RUNASUSER=${RUNASUSER} \ RUNASUID=${RUNASUID} \ GROUP=${GROUP} \ GID=${GID} \ LOG_FILE=${LOG_FILE} \ PYTHON_CMD=${PYTHON_CMD} SUB_FILES= \ pkg-install \ pkg-deinstall \ ${APP_NAME}ctl \ ${APP_NAME} \ message \ message-advanced do-build: post-build: @${ECHO_MSG} "===> Building packing list" @> ${PLIST} @cd ${WRKSRC} && ${FIND} -H * -type f \ | ${EGREP} -v "^(bin/|bin$$)" | ${SED} -e "s|^|${PORTNAME}/|" >> ${PLIST} @cd ${WRKSRC} && ${FIND} -H -d * -type d \ | ${EGREP} -v "^(bin/|bin$$)" | ${SED} -e "s|^|@dirrm ${PORTNAME}/|" >> ${PLIST} @${ECHO} @dirrm ${PORTNAME} >> ${PLIST} @${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST} pre-install: @${FMT} -w80 ${WRKDIR}/message > ${PKGMESSAGE} @${CAT} ${WRKDIR}/message-advanced >> ${PKGMESSAGE} do-install: @${ECHO_MSG} "===> Installing into ${APP_HOME}" # Create user/group @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${MKDIR} ${APP_HOME} @cd ${WRKSRC} && ${FIND} -H * | ${EGREP} -v "^(bin/|bin$$)" | ${CPIO} -pdmuL -R ${RUNASUSER}:${GROUP} ${APP_HOME} @${CHOWN} ${RUNASUSER}:${GROUP} ${PREFIX}/${PORTNAME} @${ECHO_MSG} "===> Installing into ${PREFIX}/sbin" @${INSTALL_SCRIPT} ${WRKDIR}/${APP_NAME}ctl ${PREFIX}/sbin post-install: @${ECHO_CMD} @${ECHO_CMD} "********************************************************************************" @${CAT} ${PKGMESSAGE} @${ECHO_CMD} "********************************************************************************" @${ECHO_CMD} .include Property changes on: head/www/jetty/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/jetty/distinfo =================================================================== --- head/www/jetty/distinfo (revision 310486) +++ head/www/jetty/distinfo (revision 310487) @@ -1,2 +1,2 @@ -SHA256 (jetty-6.1.26.zip) = 96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187 -SIZE (jetty-6.1.26.zip) = 25894195 +SHA256 (jetty-distribution-8.1.8.v20121106.tar.gz) = f66cfe7b3da8f2191709926420a9755a17908c258bcb265fc905f147879bb9f9 +SIZE (jetty-distribution-8.1.8.v20121106.tar.gz) = 9064609 Property changes on: head/www/jetty/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/jetty/files/jettyctl.in =================================================================== --- head/www/jetty/files/jettyctl.in (revision 310486) +++ head/www/jetty/files/jettyctl.in (revision 310487) @@ -1,177 +1,176 @@ #! %%PYTHON_CMD%% ################################################################################ # Author: Jean-Baptiste Quenot # Purpose: Manage resin pid file and log files # Date Created: 2005-01-21 15:43:19 # Revision: $FreeBSD$ ################################################################################ # Copyright (c) 2004, Jean-Baptiste Quenot # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: # # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. # * The name of the contributors may not be used to endorse or promote products # derived from this software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ################################################################################ # # Files handled by this script (pid file, log files) must reside in a writable # directory, ie the directory must be owned by the user running the program. import sys, os, signal, time, stat, re # -socketwait 12345 # -stdout $APP_HOME/log/stdout.log # -stderr $APP_HOME/log/stderr.log def readProcessId(): f = open(PID_FILE, 'r') pid = int(f.readline()) f.close() return pid def isProgramRunning(pid): # Send a dummy signal to the process. If it died, an exception is # thrown try: os.kill(pid, signal.SIGCONT) return 1 except OSError: return 0 def usage(): print >> sys.stderr, "Usage: %s {start|stop|restart}" % sys.argv[0] def start(): cwd = os.getcwd() if os.path.exists(PID_FILE): # Read the process id pid = readProcessId() if isProgramRunning(pid): print >> sys.stderr, '%s already started' % APP_NAME sys.exit(3) if not(os.path.exists(COMMAND)): print >> sys.stderr, '%s cannot be found' % COMMAND sys.exit(3) # Append program output to a log file l = open(LOG_FILE, 'a') orig_stderr = os.dup(sys.stderr.fileno()) os.dup2(l.fileno(), sys.stdout.fileno()) os.dup2(l.fileno(), sys.stderr.fileno()) finfo = os.stat(COMMAND)[stat.ST_MODE] executable = stat.S_IMODE(finfo) & 0111 if not(executable): sys.stderr = os.fdopen(orig_stderr, 'w') print >> sys.stderr, 'Cannot run %s, execute bit is missing' % COMMAND sys.exit(5) if APP_HOME: # Change current directory to APP_HOME os.chdir(APP_HOME) # Start program in the background pid = os.spawnv(os.P_NOWAIT, COMMAND, ARGS) # Wait a little time.sleep(.4) (status_pid, status) = os.waitpid(pid, os.WNOHANG) # Check program exit status, if available if status_pid != 0 and os.WIFEXITED(status): sys.stderr = os.fdopen(orig_stderr, 'w') print >> sys.stderr, 'Could not start %s. Check %s for errors.' % (APP_NAME, LOG_FILE) sys.exit(2) # It's alive, so write down the process id os.chdir(cwd) f = open(PID_FILE, 'w') print >> f, pid f.close() def warnNotRunning(): if sys.argv[1] == "stop": print >> sys.stderr, '%s is not running' % APP_NAME else: print >> sys.stderr, 'Warning: %s was not running' % APP_NAME def cleanup(): os.unlink(PID_FILE) def stop(): if os.path.exists(PID_FILE): # Read the process id pid = readProcessId() else: warnNotRunning() return if not(isProgramRunning(pid)): warnNotRunning() cleanup() return # Terminate program os.kill(pid, signal.SIGTERM) while isProgramRunning(pid): time.sleep(.1) cleanup() if __name__ == '__main__': LOG_FILE = "%%LOG_FILE%%" APP_NAME = "%%APP_NAME%%" APP_HOME = "%%APP_HOME%%" PID_FILE = "%%PID_FILE%%" COMMAND = "%%PREFIX%%/bin/java" ARGS = [COMMAND] ARGS += sys.argv[1:-1] ARGS += [ "-Djetty.home=%%APP_HOME%%", "-jar", - "%%APP_HOME%%/start.jar", - "%%PREFIX%%/etc/%%APP_NAME%%.xml" + "%%APP_HOME%%/start.jar" ] os.environ['PATH'] = "%%LOCALBASE%%/bin:/usr/bin:/bin" if len(sys.argv) < 2: usage() sys.exit(1) if sys.argv[-1] == "start": start() elif sys.argv[-1] == "stop": stop() elif sys.argv[-1] == "restart": stop() start() else: usage() sys.exit(1) Property changes on: head/www/jetty/files/jettyctl.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/jetty/pkg-descr =================================================================== --- head/www/jetty/pkg-descr (revision 310486) +++ head/www/jetty/pkg-descr (revision 310487) @@ -1,33 +1,14 @@ -Jetty is an open-source, standards-based, full-featured web server implemented -entirely in Java. It is released under the Apache 2.0 licence and is therefore -free for commercial use and distribution. +The Jetty Web Server provides an HTTP server and Servlet container +capable of serving static and dynamic content either from a standalone +or embedded instantiations. From jetty-7, the jetty webserver and +other core compoments are hosted by the eclipse foundation. -Jetty can be used as: +The project provides: - * a stand-alone traditional web server for static and dynamic content - * a dynamic content server behind a dedicated HTTP server such as Apache - using mod_proxy - * an embedded component within a Java application +* Asynchronous HTTP Server +* Standard based Servlet Container +* Web Sockets server +* Asynchronous HTTP Client +* OSGi, JNDI, JMX, JASPI, AJP support -Some of the defining features of Jetty are: - -Simplicity: The guiding principle of Jetty could be said to be "simplicity not -complexity". We want to make Jetty easy to understand and use: - -Efficiency: A lot of effort goes into optimizing Jetty's performance and -crafting the code so as to make the footprint as small as possible. - -Embeddability: Jetty is designed to be a good component. This means that it can -easily be embedded in an application without forcing the application to adapt to -it. - -Pluggability: Jetty is architected for pluggability. The API allows different -implementations of all of the principal Jetty components to be selected. At -least one, but sometimes more, implementations of a component are always -provided. However if these do not meet your needs, you are free to code your own -using the interfaces and abstract classes as a basis. This means that Jetty -can be easily customised to a particular application environment. This is -particularly useful when Jetty is acting as the web container in a J2EE server, -as Jetty's pluggability ensures a tight integration with a host container. - -WWW: http://jetty.mortbay.com/ +WWW: http://www.eclipse.org/jetty/ Property changes on: head/www/jetty/pkg-descr ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property