Date: Fri, 25 Feb 2011 17:42:31 +0100 (CET) From: Radim Kolar <hsn@sendmail.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hsn@sendmail.cz Subject: ports/155035: [maint] net/openmq: update to 4.5.b.29 Message-ID: <201102251642.p1PGgV82002803@fbsd8.localdomain> Resent-Message-ID: <201102251710.p1PHA7ef092689@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155035 >Category: ports >Synopsis: [maint] net/openmq: update to 4.5.b.29 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Feb 25 17:10:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Radim Kolar >Release: FreeBSD 8.2-RELEASE i386 >Organization: >Environment: System: FreeBSD fbsd8.localdomain 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Mon Feb 21 13:00:09 CET 2011 >Description: - Update to 4.5.b.29 REPLACES ports/153490 Port maintainer (hsn@sendmail.cz) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- openmq-4.5.b.29,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/openmq/Makefile /home/hsn/ports/openmq/Makefile --- /usr/ports/net/openmq/Makefile 2010-12-28 08:57:40.000000000 +0100 +++ /home/hsn/ports/openmq/Makefile 2011-02-24 18:30:09.030914894 +0100 @@ -2,14 +2,15 @@ # Date created: 2009-12-05 # Whom: Radim Kolar <hsn@sanatana.iol.cz> # -# $FreeBSD: ports/net/openmq/Makefile,v 1.5 2010/12/28 07:57:40 wen Exp $ +# $FreeBSD: ports/net/openmq/Makefile,v 1.4 2010/12/17 10:37:04 pav Exp $ # PORTNAME= openmq -PORTVERSION= 4.5.b.22 +PORTVERSION= 4.5.b.29 +PORTREVISION= 0 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 +87,8 @@ @${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 +112,8 @@ @${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 -ruN --exclude=CVS /usr/ports/net/openmq/distinfo /home/hsn/ports/openmq/distinfo --- /usr/ports/net/openmq/distinfo 2010-12-28 08:57:40.000000000 +0100 +++ /home/hsn/ports/openmq/distinfo 2011-02-24 18:33:46.696718509 +0100 @@ -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 -ruN --exclude=CVS /usr/ports/net/openmq/files/imq.in /home/hsn/ports/openmq/files/imq.in --- /usr/ports/net/openmq/files/imq.in 2010-12-28 08:57:40.000000000 +0100 +++ /home/hsn/ports/openmq/files/imq.in 2011-02-24 17:36:19.007372237 +0100 @@ -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 @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $FreeBSD: ports/net/openmq/files/imq.in,v 1.4 2010/12/28 07:57:40 wen Exp $ +# $FreeBSD$ # PROVIDE: imq # REQUIRE: DAEMON @@ -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 @@ # 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 @@ { 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 @@ 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 -ruN --exclude=CVS /usr/ports/net/openmq/files/pkg-message.in /home/hsn/ports/openmq/files/pkg-message.in --- /usr/ports/net/openmq/files/pkg-message.in 2010-03-02 20:21:49.000000000 +0100 +++ /home/hsn/ports/openmq/files/pkg-message.in 2011-02-24 17:36:19.038277282 +0100 @@ -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 --- openmq-4.5.b.29,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102251642.p1PGgV82002803>