kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 3.0.20

Browse source 
- A new option can be set in rc.conf to specify Java version to be used:
  resin3_java_version
- Change maintainer address

PR:		101648
Submitted by:	maintainer
This commit is contained in:
Herve Quiroz 2006-08-09 21:18:10 +00:00
parent f896c6fa65
commit 1288c2e076
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=170223
8 changed files with 53 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
www/resin3/Makefile
View file

@ -6,12 +6,11 @@
#
PORTNAME= resin
PORTVERSION= 3.0.19
PORTREVISION= 1
PORTVERSION= 3.0.20
CATEGORIES= www java
MASTER_SITES= http://www.caucho.com/download/
MAINTAINER= jb.quenot@caraldi.com
MAINTAINER= jbq@caraldi.com
COMMENT= Resin, a Java-based Application Server, 3.x branch
USE_JAVA= yes
@ -49,6 +48,7 @@ REPLACE_FILES= ${FILESDIR}/pkg-install \
${FILESDIR}/pkg-deinstall \
${FILESDIR}/install.sh \
${FILESDIR}/pkg-message.in \
${FILESDIR}/pkg-message-advanced.in \
${WRKSRC}/conf/resin.conf \
${FILESDIR}/resinctl \
${FILESDIR}/resin.sh.in
@ -102,6 +102,7 @@ SUBSTITUTIONS= -e "s|%%APP_HOME%%|${APP_HOME}|g" \
-e "s|%%GROUP%%|${GROUP}|g" \
-e "s|%%JAVA%%|${JAVA}|g" \
-e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-e "s|%%LOG_FILE%%|${LOG_FILE}|g" \
-e "s|%%PID_FILE%%|${PID_FILE}|g" \
-e "s|%%PORT%%|${PORT}|g" \
@ -119,6 +120,7 @@ post-patch:
${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \
done
@${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE}
@${CAT} < ${WRKDIR}/pkg-message-advanced.in >> ${PKGMESSAGE}
.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \
defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES))
@${ECHO_CMD} >> ${PKGMESSAGE}

6
www/resin3/distinfo
View file

@ -1,3 +1,3 @@
MD5 (resin-3.0.19.tar.gz) = 4f1a2faa9232b353859bcf9e0b333f16
SHA256 (resin-3.0.19.tar.gz) = b77c705eff83a575e17c7afb6a945a645991a0468855854c4d5aebb3b005dbab
SIZE (resin-3.0.19.tar.gz) = 7393501
MD5 (resin-3.0.20.tar.gz) = 8faa900dc64ccecf9d947d4cba39a0f4
SHA256 (resin-3.0.20.tar.gz) = 4842cd75efff5a5477a34bd85a172ceeaf7612e3914aec95e47b20640eb249eb
SIZE (resin-3.0.20.tar.gz) = 8237471

10
www/resin3/files/patch-resin.conf
View file

@ -1,6 +1,6 @@
--- conf/resin.conf.orig Fri May 6 18:07:34 2005
+++ conf/resin.conf Thu May 12 12:12:19 2005
@@ -198,7 +198,7 @@
--- conf/resin.conf.orig Tue Aug 8 11:41:32 2006
+++ conf/resin.conf Tue Aug 8 11:41:56 2006
@@ -210,7 +210,7 @@
- With another web server, like Apache, this can be commented out
- because the web server will log this information.
-->
@ -9,11 +9,11 @@
format='%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-Agent}i"'
rollover-period="1W"/>
@@ -226,7 +226,7 @@
@@ -238,7 +238,7 @@
</host-default>
<!-- includes the web-app-default for default web-app behavior -->
- <resin:import path="${resinHome}/conf/app-default.xml"/>
- <resin:import path="${resin.home}/conf/app-default.xml"/>
+ <resin:import path="%%PREFIX%%/etc/%%APP_NAME%%/app-default.xml"/>
<!-- configures a deployment directory for virtual hosts -->

23
www/resin3/files/pkg-message-advanced.in Normal file
View file

@ -0,0 +1,23 @@
--------------------------------------------------------------------------------
ADVANCED USAGE
If you need to pass special options to Java, please set the
%%APP_NAME%%_flags option in /etc/rc.conf, see examples below:
# Prevent Java from opening an X11 display
%%APP_NAME%%_flags="-Djava.awt.headless=true"
# Increase memory limit of the Java virtual machine
%%APP_NAME%%_flags="-Xms32m -Xmx256m"
# Run Java with remote debugging turned on on port 8000
%%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
To specify the java version to use, please use %%APP_NAME%%_java_version:
%%APP_NAME%%_java_version="1.4"

18
www/resin3/files/pkg-message.in
View file

@ -30,21 +30,3 @@ Resin configuration is located at %%PREFIX%%/etc/%%APP_NAME%%/resin.xml
Enjoy!
--------------------------------------------------------------------------------
ADVANCED USAGE
If you need to pass special options to Java, please set the
%%APP_NAME%%_flags option in /etc/rc.conf, see examples below:
# Prevent Java from opening an X11 display
%%APP_NAME%%_flags="-Djava.awt.headless=true"
# Increase memory limit of the Java virtual machine
%%APP_NAME%%_flags="-Xms32m -Xmx256m"
# Run Java with remote debugging turned on on port 8000
%%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"

12
www/resin3/files/resin.sh.in
View file

@ -21,7 +21,6 @@ rcvar=`set_rcvar`
command=%%PREFIX%%/sbin/%%APP_NAME%%ctl
command_args="$1"
pidfile=%%PID_FILE%%
procname=%%JAVA%%
# set defaults
@ -30,4 +29,15 @@ procname=%%JAVA%%
%%APP_NAME%%_group=${%%APP_NAME%%_group:-"www"}
load_rc_config ${name}
if test -n "${%%APP_NAME%%_java_version}" ; then
JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
else
JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
fi
export JAVA_HOME
run_rc_command "$1"

4
www/resin3/files/resinctl
View file

@ -154,7 +154,7 @@ if __name__ == '__main__':
APP_NAME = "%%APP_NAME%%"
APP_HOME = "%%APP_HOME%%"
PID_FILE = "%%PID_FILE%%"
COMMAND = "%%JAVA%%"
COMMAND = "%%PREFIX%%/bin/java"
ARGS = [COMMAND]
ARGS += sys.argv[1:-1]
@ -166,8 +166,8 @@ if __name__ == '__main__':
"-conf", "%%PREFIX%%/etc/%%APP_NAME%%/resin.xml"
]
os.environ['JAVA_HOME'] = "%%JAVA_HOME%%"
os.environ['CLASSPATH'] = classpath()
os.environ['PATH'] = "%%LOCALBASE%%/bin:/usr/bin:/bin"
if len(sys.argv) < 2:
usage()

5
www/resin3/pkg-plist
View file

@ -1,8 +1,11 @@
@comment $FreeBSD$
%%APP_NAME%%/lib/activation.jar
%%APP_NAME%%/lib/aopalliance.jar
%%APP_NAME%%/lib/ejb-20.jar
%%APP_NAME%%/lib/ejb-30.jar
%%APP_NAME%%/lib/j2eedeploy.jar
%%APP_NAME%%/lib/j2ee-deploy-10.jar
%%APP_NAME%%/lib/j2ee-management-10.jar
%%APP_NAME%%/lib/javamail-14.jar
%%APP_NAME%%/lib/jca-15.jar
%%APP_NAME%%/lib/jms-11.jar
%%APP_NAME%%/lib/jmx-12.jar