8 files changed, 53 insertions, 33 deletions

diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index 12e60b759209..a2f6ec89608d 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -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}
diff --git a/www/resin3/distinfo b/www/resin3/distinfo
index db88e66c4e8a..ad5fa37e663b 100644
--- a/www/resin3/distinfo
+++ b/www/resin3/distinfo
@@ -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 --git a/www/resin3/files/patch-resin.conf b/www/resin3/files/patch-resin.conf
index 01f6a77b7a45..fd069f107cd0 100644
--- a/www/resin3/files/patch-resin.conf
+++ b/www/resin3/files/patch-resin.conf
@@ -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 -->
diff --git a/www/resin3/files/pkg-message-advanced.in b/www/resin3/files/pkg-message-advanced.in
new file mode 100644
index 000000000000..60f676a9c59a
--- /dev/null
+++ b/www/resin3/files/pkg-message-advanced.in
@@ -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 --git a/www/resin3/files/pkg-message.in b/www/resin3/files/pkg-message.in
index 40dd6bcbbe0b..52c6821ad212 100644
--- a/www/resin3/files/pkg-message.in
+++ b/www/resin3/files/pkg-message.in
@@ -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"
diff --git a/www/resin3/files/resin.sh.in b/www/resin3/files/resin.sh.in
index 9592fe359537..285d3f21d354 100644
--- a/www/resin3/files/resin.sh.in
+++ b/www/resin3/files/resin.sh.in
@@ -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"
diff --git a/www/resin3/files/resinctl b/www/resin3/files/resinctl
index a175b132abde..8dd7474d43ba 100644
--- a/www/resin3/files/resinctl
+++ b/www/resin3/files/resinctl
@@ -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()
diff --git a/www/resin3/pkg-plist b/www/resin3/pkg-plist
index 0640c35d5f63..73118eab2981 100644
--- a/www/resin3/pkg-plist
+++ b/www/resin3/pkg-plist
@@ -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