- Update to 4.5.b.29

PR:		ports/155035
Submitted by:	Radim Kolar <hsn@sendmail.cz> (maintainer)

4 files changed, 34 insertions, 13 deletions

diff --git a/net/openmq/Makefile b/net/openmq/Makefile
index b5d93c1e7c94..7664d2386b1e 100644
--- a/net/openmq/Makefile
+++ b/net/openmq/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	openmq
-PORTVERSION=	4.5.b.22
+PORTVERSION=	4.5.b.29
 PORTEPOCH=	1
 CATEGORIES=	net java
-MASTER_SITES=	http://download.java.net/mq/open-mq/4.5/b22/ \
+MASTER_SITES=	http://download.java.net/mq/open-mq/4.5/b29/ \
 	 	http://download.java.net/maven/2/javax/javaee-api/6.0/:2 \
 		http://download.java.net/maven/2/com/sun/grizzly/grizzly-nio-framework/1.9.18a/:3 \
 		http://download.java.net/maven/2/com/sun/woodstock/dependlibs/jhall/2.0/:4
@@ -86,6 +86,8 @@ pre-install:
 		@${ECHO_CMD} "%%JAVAJARDIR%%/jms.jar" > ${PLIST}
 		@${ECHO_CMD} "%%JAVAJARDIR%%/imq.jar" >> ${PLIST}
 		@${ECHO_CMD} "%%JAVAJARDIR%%/fscontext.jar" >> ${PLIST}
+		@${ECHO_CMD} "%%JAVAJARDIR%%/jaxm-api.jar" >> ${PLIST}
+		@${ECHO_CMD} "%%JAVAJARDIR%%/imqxm.jar" >> ${PLIST}
 .endif
 
 do-install:
@@ -109,6 +111,8 @@ do-install:
 		@${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/imq.jar ${JAVAJARDIR}
 		@${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/jms.jar ${JAVAJARDIR}
 		@${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/fscontext.jar ${JAVAJARDIR}
+		@${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/jaxm-api.jar ${JAVAJARDIR}
+		@${INSTALL_DATA} ${WRKSRC}/dist/mq/lib/imqxm.jar ${JAVAJARDIR}
 .endif
 
 post-install:
diff --git a/net/openmq/distinfo b/net/openmq/distinfo
index bf4f6fec748a..37d967a8a430 100644
--- a/net/openmq/distinfo
+++ b/net/openmq/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openmq4_5-source.zip) = 0b6f31a02b6c52d672df3afb35aad180dabcbc949de5e75dc513b670f6abb67a
-SIZE (openmq4_5-source.zip) = 6679372
+SHA256 (openmq4_5-source.zip) = 4290e91c17a0190a38c07cdd7cf50ea737381dc82840d845557785853d39e0a8
+SIZE (openmq4_5-source.zip) = 6685947
 SHA256 (javaee-api-6.0.jar) = a045eac0ff80c5c0fd29b680599f27598abff16b1e6c9df46ce962a4e0b1390e
 SIZE (javaee-api-6.0.jar) = 979616
 SHA256 (grizzly-nio-framework-1.9.18a.jar) = 7613172e7f3b6012f3cb6f7f25c3e562742e8ac6490062938015e6d60c22e2e9
diff --git a/net/openmq/files/imq.in b/net/openmq/files/imq.in
index f51eb8171dfe..b7e82f832717 100644
--- a/net/openmq/files/imq.in
+++ b/net/openmq/files/imq.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2009 Radim Kolar. All rights reserved.
+# Copyright (c) 2009, 2010 Radim Kolar. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -36,8 +36,9 @@
 #  imq_enable="YES"
 #  # optional
 #  imq_data="/var/spool/imq"
-#  imq_vmargs="-Xms192m -Xmx192m -Xss128k -XX:MaxGCPauseMillis=5000"
+#  imq_vmargs="-Xms150m -Xss128k -XX:MaxGCPauseMillis=5000"
 #  imq_brokerlist="hostname1:7676,hostname2:7676"
+#  imq_memory="256m"
 
 name="imq"
 . /etc/rc.subr
@@ -45,6 +46,8 @@ name="imq"
 # set defaults
 imq_enable=${imq_enable:-"NO"}
 imq_data=${imq_data:-"/var/spool/imq"}
+imq_vmargs=${imq_vmargs:-"-Xms150m -Xss128k -Xbatch -XX:MaxGCPauseMillis=5000"}
+imq_memory=${imq_memory:-"256m"}
 
 rcvar=`set_rcvar`
 load_rc_config $name
@@ -71,7 +74,21 @@ imq_start()
 {
   if [ -z "$rc_pid" ]; then
 	   echo -n "Starting $name"
-	   ${command} ${command_args} &
+	
+           # do we have memory limit defined?
+	   if [ -n "$imq_memory" ]; then
+                   #add imq_memory to vmargs
+		   echo "$imq_vmargs" | grep -q -- '-Xmx'
+		   if [ ! $? -eq 0 ]; then
+		       imq_vmargs="$imq_vmargs -Xmx${imq_memory}"
+		   fi
+           fi
+	   #run with imq_vmargs if defined
+	   if [ -n "$imq_vmargs" ]; then
+	        ${command} ${command_args} -vmargs "$imq_vmargs" &
+           else
+	   	${command} ${command_args} &
+	   fi
 	   echo -n $! > $pidfile
 	   echo "."
   else
@@ -95,11 +112,6 @@ imq_build_cmdline()
 	     fi
 	fi
 
-	#add imq_vmargs if needed
-	if [ -n "$imq_vmargs" ]; then
-	  command_args="$command_args -vmargs \"$imq_vmargs\""
-	fi
-
 	#load aditional command line arguments from broker config file
 	if [ -n $autoargs ]; then
 	   echo "$autoargs" | grep -q -- '-varhome'
diff --git a/net/openmq/files/pkg-message.in b/net/openmq/files/pkg-message.in
index ba3bed93cbd4..f8425b7518fe 100644
--- a/net/openmq/files/pkg-message.in
+++ b/net/openmq/files/pkg-message.in
@@ -1,10 +1,15 @@
 To use imq-client in your Java application you need to add following jars
 to your classpath:
 
-%%JAVAJARDIR%%/imq.jar - Connector to IMQ broker. REQUIRED.
+%%JAVAJARDIR%%/imq.jar - Connector to IMQ broker. REQUIRED
 %%JAVAJARDIR%%/jms.jar - JMS 1.1 API classes. MOST LIKELY NEEDED
 			 If you have only one jms provider used in
                          your application or not using application
                          server you will need this. Otherwise other
                          jms provider will most likely to ship this.
 %%JAVAJARDIR%%/fscontext.jar - JDNI file based lookups. OPTIONAL
+%%JAVAJARDIR%%/jaxm-api.jar - Java API for XML Messaging 
+                             MOST LIKELY NEEDED for JAXM applications unless
+                         this api is provided by application server or OSGi
+                         container already.
+%%JAVAJARDIR%%/imqxm.jar - JAXM OpenMQ provider. REQUIRED for JAXM application