Index: head/java/wildfly90/Makefile =================================================================== --- head/java/wildfly90/Makefile (revision 452897) +++ head/java/wildfly90/Makefile (revision 452898) @@ -1,74 +1,75 @@ # Created by: Alexander Yerenkow # $FreeBSD$ PORTNAME= wildfly90 PORTVERSION= 9.0.2 +PORTREVISION= 1 CATEGORIES= java www MASTER_SITES= http://download.jboss.org/wildfly/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} MAINTAINER= yerenkow@gmail.com COMMENT= Replacement for JBoss Application Server LICENSE= GPLv2 USE_RC_SUBR= wildfly90 USE_JAVA= yes JAVA_VERSION= 1.7+ USER= www GROUP= www VAR_DIR?= /var LOG_DIR?= ${VAR_DIR}/log/${PORTNAME} PID_FILE= ${VAR_DIR}/run/${PORTNAME}.pid WILDFLY_VERSION=${PORTVERSION}.Final SUB_FILES= pkg-message SUB_LIST= APP_SHORTNAME=${PORTNAME} \ LOG_DIR=${LOG_DIR} \ USER=${USER} \ GROUP=${GROUP} \ PID_FILE=${PID_FILE} \ APP_HOME=${PREFIX}/wildfly-${PORTVERSION} PLIST_SUB= APP_HOME=wildfly-${PORTVERSION} CONFIG_FILES= appclient/configuration/appclient.xml \ appclient/configuration/logging.properties \ domain/configuration/application-roles.properties \ domain/configuration/application-users.properties \ domain/configuration/default-server-logging.properties \ domain/configuration/domain.xml \ domain/configuration/host-master.xml \ domain/configuration/host-slave.xml \ domain/configuration/host.xml \ domain/configuration/logging.properties \ domain/configuration/mgmt-groups.properties \ domain/configuration/mgmt-users.properties \ standalone/configuration/application-roles.properties \ standalone/configuration/application-users.properties \ standalone/configuration/logging.properties \ standalone/configuration/mgmt-groups.properties \ standalone/configuration/mgmt-users.properties \ standalone/configuration/standalone-full-ha.xml \ standalone/configuration/standalone-full.xml \ standalone/configuration/standalone-ha.xml \ standalone/configuration/standalone.xml post-patch: ${RM} ${WRKSRC}/bin/add-user.sh.orig do-build: ${RM} ${WRKSRC}/bin/*.bat ${RM} ${WRKSRC}/bin/*.ps1 ${RM} -r ${WRKSRC}/bin/service ${RM} -r ${WRKSRC}/bin/init.d do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION} (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION}) ${RMDIR} ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION}/.installation .for FILE in ${CONFIG_FILES} ${MV} ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION}/${FILE} \ ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION}/${FILE}.sample .endfor .include Index: head/java/wildfly90/files/wildfly90.in =================================================================== --- head/java/wildfly90/files/wildfly90.in (revision 452897) +++ head/java/wildfly90/files/wildfly90.in (revision 452898) @@ -1,95 +1,99 @@ #!/bin/sh # # %%APP_SHORTNAME%% startup script. # # $FreeBSD$ # # PROVIDE: %%APP_SHORTNAME%% # REQUIRE: NETWORKING SERVERS # KEYWORD: shutdown # Add the following lines to /etc/rc.conf to enable %%APP_SHORTNAME%%: # %%APP_SHORTNAME%%_enable (bool): Set to "YES" to enable %%APP_SHORTNAME%% # %%APP_SHORTNAME%%_args (str): Optional arguments to OAJBoss # %%APP_SHORTNAME%%_log_stdout (str) JBoss log output stdout, filename. # %%APP_SHORTNAME%%_log_stderr (str) JBoss log output stderr, filename. # . /etc/rc.subr name="%%APP_SHORTNAME%%" rcvar=%%APP_SHORTNAME%%_enable extra_commands="status" load_rc_config $name %%APP_SHORTNAME%%_logdir="%%LOG_DIR%%" %%APP_SHORTNAME%%_enable="${%%APP_SHORTNAME%%_enable:-"NO"}" %%APP_SHORTNAME%%_log_stdout="${%%APP_SHORTNAME%%_log_stdout:-"${%%APP_SHORTNAME%%_logdir}/log"}" %%APP_SHORTNAME%%_log_stderr="${%%APP_SHORTNAME%%_log_stderr:-"${%%APP_SHORTNAME%%_logdir}/error"}" %%APP_SHORTNAME%%_args="${%%APP_SHORTNAME%%_args:-""}" %%APP_SHORTNAME%%_sleep="${%%APP_SHORTNAME%%_sleep:-"5"}" %%APP_SHORTNAME%%_kill9="${%%APP_SHORTNAME%%_kill9:-""}" %%APP_SHORTNAME%%_additional_killall="${%%APP_SHORTNAME%%_additional_killall:-""}" %%APP_SHORTNAME%%_user="%%USER%%" %%APP_SHORTNAME%%_group="%%GROUP%%" start_cmd="%%APP_SHORTNAME%%_start" stop_cmd="%%APP_SHORTNAME%%_stop" pidfile="%%PID_FILE%%" +status_cmd="%%APP_SHORTNAME%%_status" WILDFLY_HOME="%%APP_HOME%%" #minimal requirements must be set for our javavmwrapper JAVA_VERSION="1.7+" export JAVA_VERSION %%APP_SHORTNAME%%_start () { if [ ! -d "${%%APP_SHORTNAME%%_logdir}" ] then install -d -o ${%%APP_SHORTNAME%%_user} ${%%APP_SHORTNAME%%_logdir} fi + echo "%%APP_SHORTNAME%%: making sure all writeable dirs belong to proper user/group" + chown -R ${%%APP_SHORTNAME%%_user}:${%%APP_SHORTNAME%%_group} ${WILDFLY_HOME}/standalone echo "Starting %%APP_SHORTNAME%%." daemon -u ${%%APP_SHORTNAME%%_user} ${WILDFLY_HOME}/bin/standalone.sh ${%%APP_SHORTNAME%%_args} >> ${%%APP_SHORTNAME%%_log_stdout} 2>> ${%%APP_SHORTNAME%%_log_stderr} sleep ${%%APP_SHORTNAME%%_sleep} # let daemon(8) and sh(1) finish before executing pgrep(1) pgrep -U ${%%APP_SHORTNAME%%_user} -f ${WILDFLY_HOME}/modules > ${pidfile} chown ${%%APP_SHORTNAME%%_user} $pidfile } %%APP_SHORTNAME%%_stop () { # Subvert the check_pid_file procname check. if [ -f ${pidfile} ] then kill `cat ${pidfile}` # Only if we aware that our setup can hangs, and only after trying simple kill, we can kill it hard way. if [ ! -z "${%%APP_SHORTNAME%%_kill9}" ] then sleep ${%%APP_SHORTNAME%%_sleep} kill -9 `cat ${pidfile}` fi # In some setups, JBoss can spawn some child processess, which could prevent it from stopping, and freeing net ports. # Let's blindly kill them all, since we are really know what we are doing. if [ ! -z "${%%APP_SHORTNAME%%_additional_killall}" ] then sleep ${%%APP_SHORTNAME%%_sleep} killall ${%%APP_SHORTNAME%%_additional_killall} fi + rm ${pidfile} fi } %%APP_SHORTNAME%%_status () { # If running, show pid if [ -f ${pidfile} ] then echo "%%APP_SHORTNAME%% is running as pid" `cat ${pidfile}` else echo "%%APP_SHORTNAME%% is not running" fi } run_rc_command "$1"