You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ms...@apache.org on 2015/06/30 08:18:25 UTC

[1/2] activemq git commit: check that broker is not running if export is used

Repository: activemq
Updated Branches:
  refs/heads/master 27edaffde -> 6248d0515


check that broker is not running if export is used


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b06c1679
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b06c1679
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b06c1679

Branch: refs/heads/master
Commit: b06c1679b6e358d3fface90da575bf472f44a129
Parents: 0620209
Author: Marc Schoechlin <ma...@breuninger.de>
Authored: Tue Jun 30 08:16:52 2015 +0200
Committer: Marc Schoechlin <ma...@breuninger.de>
Committed: Tue Jun 30 08:16:52 2015 +0200

----------------------------------------------------------------------
 assembly/src/release/bin/activemq               | 9 +++++++++
 assembly/src/test/scripts/init-script-testsuite | 1 +
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/b06c1679/assembly/src/release/bin/activemq
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index bd88b3c..578b967 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -577,6 +577,11 @@ invoke_task(){
          echo "Activemq is not running."
          exit 1
        fi
+    elif [ "$CHECKRUNNING" = "checkfornotrunning" ];then
+      if ( checkRunning );then
+         echo "Activemq is running."
+         exit 1
+       fi
     fi
 
     # call task in java binary
@@ -656,6 +661,10 @@ case "$1" in
     invoke_task checknotforrunning
     exit $?
     ;;
+  export)
+    invoke_task checkfornotrunning
+    exit $?
+    ;;
   query|bstat|dstat|purge)
     # Only check for a running broker if "--jmxurl" is part of the COMMANDLINE_ARGS
     if (echo "$COMMANDLINE_ARGS"|grep -q -- "--jmxurl");then

http://git-wip-us.apache.org/repos/asf/activemq/blob/b06c1679/assembly/src/test/scripts/init-script-testsuite
----------------------------------------------------------------------
diff --git a/assembly/src/test/scripts/init-script-testsuite b/assembly/src/test/scripts/init-script-testsuite
index f20cbe1..9b7bafc 100755
--- a/assembly/src/test/scripts/init-script-testsuite
+++ b/assembly/src/test/scripts/init-script-testsuite
@@ -143,6 +143,7 @@ assert ${STRATEGY} successful "${SCRIPT} start"
 assert ${STRATEGY}     failed "${SCRIPT}"
 assert ${STRATEGY} successful "${SCRIPT} status"
 echo "Sleeping 30 seconds to get activemq really started"; sleep 30
+assert ${STRATEGY}     failed "${SCRIPT} export"
 assert ${STRATEGY} successful "${SCRIPT} status"
 assert ${STRATEGY} successful "${SCRIPT} encrypt --password TESTPASSWORD --input FOOBAR|grep -q 'Encrypted text: '"
 assert ${STRATEGY} successful "${SCRIPT} decrypt --input 'BkiT42A0CZfL1SanJIgxvQ==' --password asdasdasdasd|grep -q 'Decrypted text:'"


[2/2] activemq git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq

Posted by ms...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/activemq


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6248d051
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6248d051
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6248d051

Branch: refs/heads/master
Commit: 6248d0515cc9f4f5a580aa0284a047c543164351
Parents: b06c167 27edaff
Author: Marc Schoechlin <ma...@breuninger.de>
Authored: Tue Jun 30 08:17:58 2015 +0200
Committer: Marc Schoechlin <ma...@breuninger.de>
Committed: Tue Jun 30 08:17:58 2015 +0200

----------------------------------------------------------------------
 .../transport/ws/AbstractMQTTSocket.java        |  97 +++++--
 .../transport/ws/jetty8/MQTTSocket.java         |  57 ++---
 .../activemq/transport/ws/jetty8/WSServlet.java |   1 +
 .../transport/ws/jetty9/MQTTSocket.java         |  29 +--
 .../transport/util/HttpTransportUtilsTest.java  |  16 ++
 .../activemq/transport/ws/MQTTWSConnection.java | 253 +++++++++++++++++++
 .../ws/MQTTWSConnectionTimeoutTest.java         |  80 ++++++
 .../transport/ws/MQTTWSLinkStealingTest.java    | 130 ++++++++++
 .../transport/ws/MQTTWSTransportTest.java       | 216 ++++++++++++++++
 .../activemq/transport/ws/SocketTest.java       |  17 +-
 .../transport/ws/WSTransportTestSupport.java    |   9 +-
 .../transport/mqtt/MQTTInactivityMonitor.java   |   2 +-
 .../transport/mqtt/MQTTTransportFilter.java     |   5 +-
 .../activemq/transport/mqtt/MQTTWireFormat.java |  19 ++
 14 files changed, 858 insertions(+), 73 deletions(-)
----------------------------------------------------------------------