Date: Tue, 28 Dec 2010 15:22:55 +0100 (CET) From: Radim Kolar <hsn@sendmail.cz> To: FreeBSD-gnats-submit@FreeBSD.org Cc: hsn@sendmail.cz Subject: ports/153490: [PATCH] net/openmq: jaxm support + minor startup improvement Message-ID: <201012281422.oBSEMthm012889@fbsd8.localdomain> Resent-Message-ID: <201012281430.oBSEUHSm006646@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153490 >Category: ports >Synopsis: [PATCH] net/openmq: jaxm support + minor startup improvement >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Dec 28 14:30:16 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Radim Kolar >Release: FreeBSD 8.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD fbsd8.localdomain 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #1: Fri Dec 24 09:27:37 CET 2010 >Description: support for JAXM new switch imq_memory for easier configuration better defaults imq_vmargs (higher performance) Port maintainer (hsn@sendmail.cz) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- openmq-4.5.b.22_1,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 2010-12-24 16:14:50.385291685 +0100 @@ -2,11 +2,12 @@ # 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 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net java MASTER_SITES= http://download.java.net/mq/open-mq/4.5/b22/ \ @@ -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/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 2010-12-25 14:02:42.350298288 +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 2010-12-24 16:25:14.723177366 +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.22_1,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?201012281422.oBSEMthm012889>