From owner-svn-ports-all@FreeBSD.ORG Sun Dec 9 00:26:03 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D1712170; Sun, 9 Dec 2012 00:26:03 +0000 (UTC) (envelope-from tj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B571C8FC0C; Sun, 9 Dec 2012 00:26:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB90Q3Iq049579; Sun, 9 Dec 2012 00:26:03 GMT (envelope-from tj@svn.freebsd.org) Received: (from tj@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB90Q38F049576; Sun, 9 Dec 2012 00:26:03 GMT (envelope-from tj@svn.freebsd.org) Message-Id: <201212090026.qB90Q38F049576@svn.freebsd.org> From: Tom Judge Date: Sun, 9 Dec 2012 00:26:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308499 - head/net/activemq X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2012 00:26:03 -0000 Author: tj Date: Sun Dec 9 00:26:02 2012 New Revision: 308499 URL: http://svnweb.freebsd.org/changeset/ports/308499 Log: Update to 5.7.0 Changes: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210&version=12321258 PR: ports/173595 Submitted by: Attila Nagy Feature safe: yes Approved by: eadler (mentor) Modified: head/net/activemq/Makefile head/net/activemq/distinfo head/net/activemq/pkg-plist Modified: head/net/activemq/Makefile ============================================================================== --- head/net/activemq/Makefile Sun Dec 9 00:21:30 2012 (r308498) +++ head/net/activemq/Makefile Sun Dec 9 00:26:02 2012 (r308499) @@ -2,7 +2,7 @@ # PORTNAME= activemq -PORTVERSION= 5.6.0 +PORTVERSION= 5.7.0 CATEGORIES= net java MASTER_SITES= http://www.sai.msu.su/apache/${MASTER_SITE_SUBDIR}/ \ ${MASTER_SITE_APACHE}/${MASTER_SITE_SUBDIR}/ @@ -24,6 +24,12 @@ MQUSER?= activemq MQGROUP?= ${MQUSER} USERS= ${MQUSER} GROUPS= ${MQGROUP} +CAMELVERSION= 2.10.1 +SPRINGVERSION= 3.0.7 +SPRINGVERSION= 3.0.7 +JETTYVERSION= 7.6.7.v20120910 +LVDBVERSION= 0.2 +LVDBJNIVERSION= 1.3 ALL_TARGET= ${PORTNAME} USE_RC_SUBR= ${PORTNAME} @@ -42,12 +48,7 @@ ETC_FILES= activemq-command.xml \ activemq-stomp.xml \ activemq-throughput.xml \ activemq.xml \ - broker-localhost.cert \ - broker.ks \ - broker.ts \ camel.xml \ - client.ks \ - client.ts \ credentials-enc.properties \ credentials.properties \ jetty-realm.properties \ @@ -63,7 +64,15 @@ SUB_LIST= ETC_FILES="${ETC_FILES}" \ MQUSER="${MQUSER}" \ MQGROUP="${MQGROUP}" \ MQDB="${MQDB}" -PLIST_SUB= MQUSER="${MQUSER}" MQGROUP="${MQGROUP}" MQDB="${MQDB}" +PLIST_SUB= MQUSER="${MQUSER}" \ + MQGROUP="${MQGROUP}" \ + MQDB="${MQDB}" \ + PORTVERSION="${PORTVERSION}" \ + CAMELVERSION="${CAMELVERSION}" \ + SPRINGVERSION="${SPRINGVERSION}" \ + JETTYVERSION="${JETTYVERSION}" \ + LVDBVERSION="${LVDBVERSION}" \ + LVDBJNIVERSION="${LVDBJNIVERSION}" .include @@ -83,12 +92,12 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${ETCDIR}/${f}.sample .endfor -.for f in ${PORTNAME} ${PORTNAME}-admin +.for f in ${PORTNAME} ${PORTNAME}-admin diag @cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} ${f} ${MQDATA}/bin .endfor -.for f in run.jar wrapper.jar - @cd ${WRKSRC}/bin && ${INSTALL_DATA} ${f} ${MQDATA}/bin -.endfor + + @cd ${WRKSRC}/bin && ${INSTALL_DATA} run.jar ${MQDATA}/bin + .for f in webapps lib @cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${MQDATA} .endfor Modified: head/net/activemq/distinfo ============================================================================== --- head/net/activemq/distinfo Sun Dec 9 00:21:30 2012 (r308498) +++ head/net/activemq/distinfo Sun Dec 9 00:26:02 2012 (r308499) @@ -1,2 +1,2 @@ -SHA256 (apache-activemq-5.6.0-bin.tar.gz) = 801a479c02f38910894d32ab62ec30c2a266bf310f2ed745570636a44e04f58b -SIZE (apache-activemq-5.6.0-bin.tar.gz) = 49041409 +SHA256 (apache-activemq-5.7.0-bin.tar.gz) = 719881ed10fbac48679f3eca55fa47e25202a73cdb515ba2e0fce5856aff0289 +SIZE (apache-activemq-5.7.0-bin.tar.gz) = 46950004 Modified: head/net/activemq/pkg-plist ============================================================================== --- head/net/activemq/pkg-plist Sun Dec 9 00:21:30 2012 (r308498) +++ head/net/activemq/pkg-plist Sun Dec 9 00:26:02 2012 (r308499) @@ -4,25 +4,110 @@ @unexec if [ -d %%MQDB%% ]; then echo "You should remove %%MQDB%% if you don't need it any more."; fi lib/activemq/bin/activemq lib/activemq/bin/activemq-admin +lib/activemq/bin/diag lib/activemq/bin/run.jar -lib/activemq/bin/wrapper.jar lib/activemq/conf lib/activemq/data lib/activemq/example +lib/activemq/lib/activemq-console-%%PORTVERSION%%.jar +lib/activemq/lib/activemq-core-%%PORTVERSION%%.jar +lib/activemq/lib/activemq-jaas-%%PORTVERSION%%.jar lib/activemq/lib/activemq-protobuf-1.1.jar +lib/activemq/lib/activemq-rar.txt +lib/activemq/lib/activemq-web-%%PORTVERSION%%.jar +lib/activemq/lib/camel/activemq-camel-%%PORTVERSION%%.jar +lib/activemq/lib/camel/camel-core-%%CAMELVERSION%%.jar +lib/activemq/lib/camel/camel-jms-%%CAMELVERSION%%.jar +lib/activemq/lib/camel/camel-spring-%%CAMELVERSION%%.jar +lib/activemq/lib/extra/activemq-leveldb-%%PORTVERSION%%.jar +lib/activemq/lib/extra/commons-beanutils-core-1.8.0.jar +lib/activemq/lib/extra/commons-configuration-1.6.jar +lib/activemq/lib/extra/commons-digester-1.8.jar +lib/activemq/lib/extra/guava-10.0.1.jar +lib/activemq/lib/extra/guice-3.0.jar +lib/activemq/lib/extra/guice-multibindings-3.0.jar +lib/activemq/lib/extra/hadoop-core-1.0.0.jar +lib/activemq/lib/extra/hawtbuf-1.9.jar +lib/activemq/lib/extra/hawtbuf-proto-1.9.jar +lib/activemq/lib/extra/hawtdispatch-1.11.jar +lib/activemq/lib/extra/hawtdispatch-scala-1.11.jar +lib/activemq/lib/extra/hawtdispatch-transport-1.11.jar +lib/activemq/lib/extra/hawtjni-runtime-1.6.jar +lib/activemq/lib/extra/jackson-core-asl-1.9.2.jar +lib/activemq/lib/extra/jackson-mapper-asl-1.9.2.jar +lib/activemq/lib/extra/javax.inject-1.jar +lib/activemq/lib/extra/jetty-6.1.26.jar +lib/activemq/lib/extra/jetty-util-6.1.26.jar +lib/activemq/lib/extra/jsp-2.1-6.1.14.jar +lib/activemq/lib/extra/jsp-api-2.1-6.1.14.jar +lib/activemq/lib/extra/jsr305-1.3.9.jar +lib/activemq/lib/extra/leveldb-%%LVDBVERSION%%.jar +lib/activemq/lib/extra/leveldb-api-%%LVDBVERSION%%.jar +lib/activemq/lib/extra/leveldbjni-%%LVDBJNIVERSION%%.jar +lib/activemq/lib/extra/leveldbjni-linux32-%%LVDBJNIVERSION%%.jar +lib/activemq/lib/extra/leveldbjni-linux64-%%LVDBJNIVERSION%%.jar +lib/activemq/lib/extra/leveldbjni-osx-%%LVDBJNIVERSION%%.jar +lib/activemq/lib/extra/leveldbjni-win32-%%LVDBJNIVERSION%%.jar +lib/activemq/lib/extra/leveldbjni-win64-%%LVDBJNIVERSION%%.jar +lib/activemq/lib/extra/mqtt-client-1.3.jar +lib/activemq/lib/extra/scala-library-2.9.1.jar +lib/activemq/lib/extra/servlet-api-2.5-20081211.jar +lib/activemq/lib/extra/servlet-api-2.5-6.1.14.jar +lib/activemq/lib/extra/snappy-java-1.0.3.jar lib/activemq/lib/geronimo-j2ee-management_1.1_spec-1.0.1.jar lib/activemq/lib/geronimo-jms_1.1_spec-1.1.1.jar lib/activemq/lib/geronimo-jta_1.0.1B_spec-1.0.1.jar +lib/activemq/lib/jcl-over-slf4j-1.6.6.jar +lib/activemq/lib/kahadb-%%PORTVERSION%%.jar +lib/activemq/lib/optional/activeio-core-3.1.4.jar +lib/activemq/lib/optional/activemq-optional-%%PORTVERSION%%.jar +lib/activemq/lib/optional/activemq-pool-%%PORTVERSION%%.jar +lib/activemq/lib/optional/activemq-spring-%%PORTVERSION%%.jar +lib/activemq/lib/optional/activemq-xmpp-%%PORTVERSION%%.jar +lib/activemq/lib/optional/commons-beanutils-1.8.3.jar +lib/activemq/lib/optional/commons-codec-1.6.jar lib/activemq/lib/optional/commons-collections-3.2.1.jar -lib/activemq/lib/optional/commons-httpclient-3.1.jar +lib/activemq/lib/optional/commons-dbcp-1.4.jar +lib/activemq/lib/optional/commons-lang-2.6.jar +lib/activemq/lib/optional/commons-net-3.1.jar +lib/activemq/lib/optional/commons-pool-1.6.jar lib/activemq/lib/optional/geronimo-j2ee-connector_1.5_spec-2.0.0.jar -lib/activemq/lib/optional/josql-1.5.jar +lib/activemq/lib/optional/httpclient-4.2.1.jar +lib/activemq/lib/optional/httpcore-4.2.1.jar +lib/activemq/lib/optional/jasypt-1.9.0.jar +lib/activemq/lib/optional/jasypt-spring3-1.9.0.jar +lib/activemq/lib/optional/jettison-1.3.2.jar +lib/activemq/lib/optional/jmdns-3.4.1.jar +lib/activemq/lib/optional/log4j-1.2.17.jar +lib/activemq/lib/optional/org.apache.servicemix.bundles.josql-1.5_5.jar +lib/activemq/lib/optional/slf4j-log4j12-1.6.6.jar +lib/activemq/lib/optional/spring-aop-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/spring-asm-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/spring-beans-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/spring-context-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/spring-core-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/spring-expression-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/spring-jms-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/spring-oxm-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/spring-tx-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/optional/stax2-api-3.0.2.jar +lib/activemq/lib/optional/velocity-1.7.jar +lib/activemq/lib/optional/woodstox-core-asl-4.1.4.jar +lib/activemq/lib/optional/xbean-spring-3.11.1.jar lib/activemq/lib/optional/xpp3-1.1.4c.jar +lib/activemq/lib/optional/xstream-1.4.3.jar +lib/activemq/lib/slf4j-api-1.6.6.jar lib/activemq/lib/web/core-3.1.1.jar lib/activemq/lib/web/geronimo-servlet_2.5_spec-1.2.jar lib/activemq/lib/web/jdom-1.0.jar +lib/activemq/lib/web/jetty-all-server-%%JETTYVERSION%%.jar +lib/activemq/lib/web/jetty-websocket-%%JETTYVERSION%%.jar lib/activemq/lib/web/jsp-2.1-glassfish-2.1.v20100127.jar lib/activemq/lib/web/jsp-api-2.1-glassfish-2.1.v20100127.jar +lib/activemq/lib/web/rome-1.0.jar +lib/activemq/lib/web/sitemesh-2.4.2.jar +lib/activemq/lib/web/spring-web-%%SPRINGVERSION%%.RELEASE.jar +lib/activemq/lib/web/spring-webmvc-%%SPRINGVERSION%%.RELEASE.jar lib/activemq/webapps/admin/404.html lib/activemq/webapps/admin/500.html lib/activemq/webapps/admin/META-INF/LICENSE @@ -120,6 +205,7 @@ lib/activemq/webapps/admin/queueGraph.js lib/activemq/webapps/admin/queues.jsp lib/activemq/webapps/admin/scheduled.jsp lib/activemq/webapps/admin/send.jsp +lib/activemq/webapps/admin/slave.jsp lib/activemq/webapps/admin/styles/prettify.css lib/activemq/webapps/admin/styles/site.css lib/activemq/webapps/admin/styles/sorttable.css @@ -175,109 +261,6 @@ lib/activemq/webapps/fileserver/index.ht lib/activemq/webapps/index.html lib/activemq/webapps/styles/site.css lib/activemq/webapps/styles/type-settings.css -lib/activemq/lib/activemq-camel-5.6.0.jar -lib/activemq/lib/activemq-console-5.6.0.jar -lib/activemq/lib/activemq-core-5.6.0.jar -lib/activemq/lib/activemq-jaas-5.6.0.jar -lib/activemq/lib/activemq-rar.txt -lib/activemq/lib/activemq-web-5.6.0.jar -lib/activemq/lib/camel-core-2.9.2.jar -lib/activemq/lib/camel-jetty-2.9.2.jar -lib/activemq/lib/camel-jms-2.9.2.jar -lib/activemq/lib/camel-spring-2.9.2.jar -lib/activemq/lib/jcl-over-slf4j-1.6.4.jar -lib/activemq/lib/kahadb-5.6.0.jar -lib/activemq/lib/optional/activeio-core-3.1.4.jar -lib/activemq/lib/optional/activemq-jmdns_1.0-5.6.0.jar -lib/activemq/lib/optional/activemq-optional-5.6.0.jar -lib/activemq/lib/optional/activemq-pool-5.6.0.jar -lib/activemq/lib/optional/activemq-spring-5.6.0.jar -lib/activemq/lib/optional/activemq-xmpp-5.6.0.jar -lib/activemq/lib/optional/aopalliance-1.0.jar -lib/activemq/lib/optional/axis-1.4.2.jar -lib/activemq/lib/optional/commons-beanutils-1.8.3.jar -lib/activemq/lib/optional/commons-beanutils-core-1.8.0.jar -lib/activemq/lib/optional/commons-codec-1.4.jar -lib/activemq/lib/optional/commons-configuration-1.6.jar -lib/activemq/lib/optional/commons-dbcp-1.4.jar -lib/activemq/lib/optional/commons-digester-1.8.jar -lib/activemq/lib/optional/commons-lang-2.6.jar -lib/activemq/lib/optional/commons-logging-1.1.1.jar -lib/activemq/lib/optional/commons-net-2.2.jar -lib/activemq/lib/optional/commons-pool-1.5.6.jar -lib/activemq/lib/optional/fusemq-leveldb-1.1.jar -lib/activemq/lib/optional/geronimo-activation_1.1_spec-1.0.2.jar -lib/activemq/lib/optional/guava-10.0.1.jar -lib/activemq/lib/optional/guice-3.0.jar -lib/activemq/lib/optional/guice-multibindings-3.0.jar -lib/activemq/lib/optional/hadoop-core-1.0.0.jar -lib/activemq/lib/optional/hawtbuf-1.9.jar -lib/activemq/lib/optional/hawtbuf-proto-1.9.jar -lib/activemq/lib/optional/hawtdispatch-1.9.jar -lib/activemq/lib/optional/hawtdispatch-scala-1.9.jar -lib/activemq/lib/optional/hawtdispatch-transport-1.9.jar -lib/activemq/lib/optional/hawtjni-runtime-1.5.jar -lib/activemq/lib/optional/jackson-core-asl-1.9.2.jar -lib/activemq/lib/optional/jackson-mapper-asl-1.9.2.jar -lib/activemq/lib/optional/jasypt-1.8.jar -lib/activemq/lib/optional/javax.inject-1.jar -lib/activemq/lib/optional/jettison-1.3.jar -lib/activemq/lib/optional/jetty-6.1.26.jar -lib/activemq/lib/optional/jetty-http-7.6.1.v20120215.jar -lib/activemq/lib/optional/jetty-io-7.6.1.v20120215.jar -lib/activemq/lib/optional/jetty-util-6.1.26.jar -lib/activemq/lib/optional/jetty-util-7.6.1.v20120215.jar -lib/activemq/lib/optional/jetty-webapp-7.6.1.v20120215.jar -lib/activemq/lib/optional/jetty-websocket-7.6.1.v20120215.jar -lib/activemq/lib/optional/jetty-xml-7.6.1.v20120215.jar -lib/activemq/lib/optional/jsp-2.1-6.1.14.jar -lib/activemq/lib/optional/jsp-api-2.1-6.1.14.jar -lib/activemq/lib/optional/jsr305-1.3.9.jar -lib/activemq/lib/optional/leveldb-0.2.jar -lib/activemq/lib/optional/leveldb-api-0.2.jar -lib/activemq/lib/optional/leveldbjni-1.2.jar -lib/activemq/lib/optional/leveldbjni-linux32-1.2.jar -lib/activemq/lib/optional/leveldbjni-linux64-1.2.jar -lib/activemq/lib/optional/leveldbjni-osx-1.2.jar -lib/activemq/lib/optional/log4j-1.2.16.jar -lib/activemq/lib/optional/mqtt-client-1.0.jar -lib/activemq/lib/optional/oro-2.0.8.jar -lib/activemq/lib/optional/scala-library-2.9.1.jar -lib/activemq/lib/optional/servlet-api-2.5-20081211.jar -lib/activemq/lib/optional/servlet-api-2.5-6.1.14.jar -lib/activemq/lib/optional/slf4j-log4j12-1.6.4.jar -lib/activemq/lib/optional/snappy-java-1.0.3.jar -lib/activemq/lib/optional/spring-aop-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-asm-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-beans-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-context-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-context-support-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-core-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-expression-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-jms-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-osgi-core-1.2.1.jar -lib/activemq/lib/optional/spring-osgi-io-1.2.1.jar -lib/activemq/lib/optional/spring-oxm-1.5.10.jar -lib/activemq/lib/optional/spring-oxm-tiger-1.5.10.jar -lib/activemq/lib/optional/spring-test-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-tx-3.0.6.RELEASE.jar -lib/activemq/lib/optional/spring-xml-1.5.10.jar -lib/activemq/lib/optional/stax-api-1.0-2.jar -lib/activemq/lib/optional/stax-api-1.0.1.jar -lib/activemq/lib/optional/stax2-api-3.0.2.jar -lib/activemq/lib/optional/velocity-1.6.4.jar -lib/activemq/lib/optional/woodstox-core-asl-4.0.8.jar -lib/activemq/lib/optional/xbean-spring-3.9.jar -lib/activemq/lib/optional/xmlpull-1.1.3.1.jar -lib/activemq/lib/optional/xpp3_min-1.1.4c.jar -lib/activemq/lib/optional/xstream-1.4.2.jar -lib/activemq/lib/slf4j-api-1.6.4.jar -lib/activemq/lib/web/jetty-all-server-7.6.1.v20120215.jar -lib/activemq/lib/web/jetty-websocket-7.6.1.v20120215.jar -lib/activemq/lib/web/rome-1.0.jar -lib/activemq/lib/web/sitemesh-2.4.2.jar -lib/activemq/lib/web/spring-web-3.0.6.RELEASE.jar -lib/activemq/lib/web/spring-webmvc-3.0.6.RELEASE.jar %%EXAMPLESDIR%%/example/build.xml %%EXAMPLESDIR%%/example/conf/activemq.xml %%EXAMPLESDIR%%/example/conf/log4j.properties @@ -321,12 +304,7 @@ lib/activemq/lib/web/spring-webmvc-3.0.6 %%ETCDIR%%/activemq-stomp.xml.sample %%ETCDIR%%/activemq-throughput.xml.sample %%ETCDIR%%/activemq.xml.sample -%%ETCDIR%%/broker-localhost.cert.sample -%%ETCDIR%%/broker.ks.sample -%%ETCDIR%%/broker.ts.sample %%ETCDIR%%/camel.xml.sample -%%ETCDIR%%/client.ks.sample -%%ETCDIR%%/client.ts.sample %%ETCDIR%%/credentials-enc.properties.sample %%ETCDIR%%/credentials.properties.sample %%ETCDIR%%/jetty-realm.properties.sample @@ -389,6 +367,8 @@ lib/activemq/lib/web/spring-webmvc-3.0.6 @dirrm lib/activemq/webapps @dirrm lib/activemq/lib/web @dirrm lib/activemq/lib/optional +@dirrm lib/activemq/lib/extra +@dirrm lib/activemq/lib/camel @dirrm lib/activemq/lib @dirrm lib/activemq/bin @dirrm lib/activemq