Attachment 69463 Details for Bug 101648 – 20060809-freebsd-resin3

20060809-freebsd-resin3

20060809-freebsd-resin3 (text/plain; charset=utf-8), 8.02 KB, created by Jean-Baptiste Quenot on 2006-08-09 11:01:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Baptiste Quenot

Created: 2006-08-09 11:01:10 UTC

Size: 8.02 KB

patch

obsolete

>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
>--- /usr/ports/www/resin3/Makefile	Thu Jun  8 00:13:09 2006
>+++ ./Makefile	Wed Aug  9 10:38:07 2006
>@@ -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 @@
> 			${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 @@
> 			-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 @@
> 	    ${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}
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/distinfo ./distinfo
>--- /usr/ports/www/resin3/distinfo	Sat May 20 00:20:36 2006
>+++ ./distinfo	Tue Aug  8 11:36:51 2006
>@@ -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
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/patch-resin.conf ./files/patch-resin.conf
>--- /usr/ports/www/resin3/files/patch-resin.conf	Tue May 17 00:06:25 2005
>+++ ./files/patch-resin.conf	Tue Aug  8 11:42:12 2006
>@@ -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>
>  
>      
>--    <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"/>
>  
>      
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/pkg-message-advanced.in ./files/pkg-message-advanced.in
>--- /usr/ports/www/resin3/files/pkg-message-advanced.in	Thu Jan  1 01:00:00 1970
>+++ ./files/pkg-message-advanced.in	Tue Aug  8 11:59:01 2006
>@@ -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"
>+
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports/www/resin3/files/pkg-message.in	Thu Apr 13 00:09:54 2006
>+++ ./files/pkg-message.in	Tue Aug  8 11:59:01 2006
>@@ -30,21 +30,3 @@
> 
> 
> 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"
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/resin.sh.in ./files/resin.sh.in
>--- /usr/ports/www/resin3/files/resin.sh.in	Thu Jun  8 00:13:09 2006
>+++ ./files/resin.sh.in	Wed Aug  9 10:37:52 2006
>@@ -21,7 +21,6 @@
> command=%%PREFIX%%/sbin/%%APP_NAME%%ctl
> command_args="$1"
> pidfile=%%PID_FILE%%
>-procname=%%JAVA%%
> 
> # set defaults
> 
>@@ -30,4 +29,15 @@
> %%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"
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/resinctl ./files/resinctl
>--- /usr/ports/www/resin3/files/resinctl	Thu Dec 22 00:11:34 2005
>+++ ./files/resinctl	Wed Aug  9 10:39:29 2006
>@@ -154,7 +154,7 @@
>     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 @@
>         "-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()
>diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.swp --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/pkg-plist ./pkg-plist
>--- /usr/ports/www/resin3/pkg-plist	Sat May 20 00:20:36 2006
>+++ ./pkg-plist	Tue Aug  8 11:40:48 2006
>@@ -1,8 +1,11 @@
>-@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.14 2006/05/18 08:30:29 hq Exp $
>+@comment $FreeBSD: ports/www/resin3/pkg-plist,v 1.11 2005/12/20 22:38:35 edwin Exp $
>+%%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

Actions: View

Attachments on bug 101648: 69462 | 69463