QPID-1807 : Add 0.5-fix broker and update SlowMessageStore to use MessageStores rather than TransactionLogs

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@764850 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 659 insertions, 0 deletions

diff --git a/java/broker/bin/create-example-ssl-stores.bat b/java/broker/bin/create-example-ssl-stores.bat
new file mode 100644
index 0000000000..5419c098d5
--- /dev/null
+++ b/java/broker/bin/create-example-ssl-stores.bat
@@ -0,0 +1,36 @@
+@REM

+@REM Licensed to the Apache Software Foundation (ASF) under one

+@REM or more contributor license agreements.  See the NOTICE file

+@REM distributed with this work for additional information

+@REM regarding copyright ownership.  The ASF licenses this file

+@REM to you under the Apache License, Version 2.0 (the

+@REM "License"); you may not use this file except in compliance

+@REM with the License.  You may obtain a copy of the License at

+@REM 

+@REM   http://www.apache.org/licenses/LICENSE-2.0

+@REM 

+@REM Unless required by applicable law or agreed to in writing,

+@REM software distributed under the License is distributed on an

+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+@REM KIND, either express or implied.  See the License for the

+@REM specific language governing permissions and limitations

+@REM under the License.

+@REM

+

+@REM Create example keystore for broker and trust store for client/management console.

+@REM

+@REM Use generated qpid.keystore as the brokers keystore

+@REM Use generated qpid.truststore as client/consoles truststore

+@REM All passwords have value: password

+

+@REM Create Broker Keystore:

+keytool -genkey -alias qpidBroker -keyalg RSA -validity 365 -keystore qpid.keystore -storepass password -keypass password -dname "CN=hostname, OU=OrgUnit, O=Org, L=City, C=US"

+

+@REM Export Self Signed Cert:

+keytool -export -alias qpidBroker -keystore qpid.keystore -file qpidBroker.cer -storepass password

+

+@REM Import Broker Cert Into MC TrustStore:

+keytool -import -alias qpidBrokerCert -file qpidBroker.cer -keystore qpid.truststore -storepass password -noprompt

+

+@REM Delete the cert

+del qpidBroker.cer
\ No newline at end of file
diff --git a/java/broker/bin/create-example-ssl-stores.sh b/java/broker/bin/create-example-ssl-stores.sh
new file mode 100644
index 0000000000..bfcb3dfecf
--- /dev/null
+++ b/java/broker/bin/create-example-ssl-stores.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Create example keystore for broker and trust store for client/management console.
+#
+# Use generated qpid.keystore as the brokers keystore
+# Use generated qpid.truststore as client/consoles truststore
+# All passwords have value: password
+
+#Create Broker Keystore:
+keytool -genkey -alias qpidBroker -keyalg RSA -validity 365 -keystore qpid.keystore \
+-storepass password -keypass password -dname "CN=hostname, OU=OrgUnit, O=Org, L=City, C=US"
+
+#Export Self Signed Cert:
+keytool -export -alias qpidBroker -keystore qpid.keystore -file qpidBroker.cer -storepass password
+
+#Import Broker Cert Into MC TrustStore:
+keytool -import -alias qpidBrokerCert -file qpidBroker.cer -keystore qpid.truststore -storepass password -noprompt
+
+#Delete the cert
+rm qpidBroker.cer
diff --git a/java/broker/bin/msTool.sh b/java/broker/bin/msTool.sh
new file mode 100755
index 0000000000..e190a0a46a
--- /dev/null
+++ b/java/broker/bin/msTool.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+die() {
+  if [[ $1 = -usage ]]; then
+    shift
+    usage=true
+  else
+    usage=false
+  fi
+  echo "$@"
+  $usage && echo
+  $usage && usage
+  exit 1
+}
+
+cygwin=false
+if [[ "$(uname -a | fgrep Cygwin)" != "" ]]; then
+  cygwin=true
+fi
+
+if [ -z "$QPID_TOOLS" ]; then
+    if [ -z "$QPID_HOME" ]; then
+        die "QPID_TOOLS must be set"
+    else
+        QPID_TOOLS=$QPID_HOME
+    fi
+fi
+
+if $cygwin; then
+  QPID_TOOLS=$(cygpath -w $QPID_TOOLS)
+fi
+
+# Set classpath to include Qpid jar with all required jars in manifest
+QPID_LIBS=$QPID_TOOLS/lib/qpid-all.jar
+
+# Set other variables used by the qpid-run script before calling
+export JAVA=java \
+       JAVA_VM=-server \
+       JAVA_OPTS=-Dlog4j.configuration=file:$QPID_TOOLS/etc/mstool-log4j.xml \
+       QPID_CLASSPATH=$QPID_LIBS
+
+. qpid-run org.apache.qpid.tools.messagestore.MessageStoreTool "$@"
diff --git a/java/broker/bin/qpid-passwd b/java/broker/bin/qpid-passwd
new file mode 100755
index 0000000000..63b30b5e71
--- /dev/null
+++ b/java/broker/bin/qpid-passwd
@@ -0,0 +1,35 @@
+#!/bin/bash

+#

+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+#

+#   http://www.apache.org/licenses/LICENSE-2.0

+#

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License.

+#

+

+if [ -z "$QPID_HOME" ]; then

+    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))

+    export PATH=${PATH}:${QPID_HOME}/bin

+fi

+

+# Set classpath to include Qpid jar with all required jars in manifest

+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar

+

+# Set other variables used by the qpid-run script before calling

+export JAVA=java \

+       JAVA_VM=-server \

+       JAVA_MEM=-Xmx1024m \

+       QPID_CLASSPATH=$QPID_LIBS

+

+. qpid-run org.apache.qpid.tools.security.Passwd "$@"

diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server
new file mode 100755
index 0000000000..e5a9e998e2
--- /dev/null
+++ b/java/broker/bin/qpid-server
@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+if [ -z "$QPID_HOME" ]; then
+    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+    export PATH=${PATH}:${QPID_HOME}/bin
+fi
+
+# Set classpath to include Qpid jar with all required jars in manifest
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/bdbstore-launch.jar
+
+# Set other variables used by the qpid-run script before calling
+export JAVA=java \
+       JAVA_VM=-server \
+       JAVA_MEM=-Xmx1024m \
+       JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
+       QPID_CLASSPATH=$QPID_LIBS \
+       QPID_RUN_LOG=2
+
+QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32"
+
+. qpid-run org.apache.qpid.server.Main "$@"
diff --git a/java/broker/bin/qpid-server-bdb.bat b/java/broker/bin/qpid-server-bdb.bat
new file mode 100755
index 0000000000..8964e577df
--- /dev/null
+++ b/java/broker/bin/qpid-server-bdb.bat
@@ -0,0 +1,22 @@
+@REM

+@REM Licensed to the Apache Software Foundation (ASF) under one

+@REM or more contributor license agreements.  See the NOTICE file

+@REM distributed with this work for additional information

+@REM regarding copyright ownership.  The ASF licenses this file

+@REM to you under the Apache License, Version 2.0 (the

+@REM "License"); you may not use this file except in compliance

+@REM with the License.  You may obtain a copy of the License at

+@REM 

+@REM   http://www.apache.org/licenses/LICENSE-2.0

+@REM 

+@REM Unless required by applicable law or agreed to in writing,

+@REM software distributed under the License is distributed on an

+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+@REM KIND, either express or implied.  See the License for the

+@REM specific language governing permissions and limitations

+@REM under the License.

+@REM

+

+set BDBSTORE_HOME=c:\qpid\trunk\java\bdbstore

+set QPID_MODULE_JARS=%BDBSTORE_HOME%\target\qpid-bdbstore-1.0-incubating-M2-SNAPSHOT.jar;%BDBSTORE_HOME%\lib\bdb\je-3.1.0.jar

+.\qpid-server.bat
\ No newline at end of file
diff --git a/java/broker/bin/qpid-server.bat b/java/broker/bin/qpid-server.bat
new file mode 100755
index 0000000000..2687baa111
--- /dev/null
+++ b/java/broker/bin/qpid-server.bat
@@ -0,0 +1,203 @@
+@REM

+@REM Licensed to the Apache Software Foundation (ASF) under one

+@REM or more contributor license agreements.  See the NOTICE file

+@REM distributed with this work for additional information

+@REM regarding copyright ownership.  The ASF licenses this file

+@REM to you under the Apache License, Version 2.0 (the

+@REM "License"); you may not use this file except in compliance

+@REM with the License.  You may obtain a copy of the License at

+@REM 

+@REM   http://www.apache.org/licenses/LICENSE-2.0

+@REM 

+@REM Unless required by applicable law or agreed to in writing,

+@REM software distributed under the License is distributed on an

+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+@REM KIND, either express or implied.  See the License for the

+@REM specific language governing permissions and limitations

+@REM under the License.

+@REM

+

+@echo off

+REM Script to run the Qpid Java Broker

+

+rem Guess QPID_HOME if not defined

+set CURRENT_DIR=%cd%

+if not "%QPID_HOME%" == "" goto gotHome

+set QPID_HOME=%CURRENT_DIR%

+echo %QPID_HOME%

+if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome

+cd ..

+set QPID_HOME=%cd%

+cd %CURRENT_DIR%

+:gotHome

+if exist "%QPID_HOME%\bin\qpid-server.bat" goto okHome

+echo The QPID_HOME environment variable is not defined correctly

+echo This environment variable is needed to run this program

+goto end

+:okHome

+

+REM set QPID_WORK if not set

+if not "%QPID_WORK%" == "" goto okQpidWork

+if "%HOME%" == "" goto noHome

+set QPID_WOKR=%HOME%

+goto okQpidWork

+

+:noHome

+set QPID_WORK=c:\Temp

+if not exist %QPID_WORK% md %QPID_WORK%

+:okQpidWork

+

+if not "%JAVA_HOME%" == "" goto gotJavaHome

+echo The JAVA_HOME environment variable is not defined

+echo This environment variable is needed to run this program

+goto end

+:gotJavaHome

+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome

+goto okJavaHome

+:noJavaHome

+echo The JAVA_HOME environment variable is not defined correctly

+echo This environment variable is needed to run this program.

+goto end

+:okJavaHome

+

+REM set loggin level if not set

+if "%AMQJ_LOGGING_LEVEL%" == "" set AMQJ_LOGGING_LEVEL=info

+

+REM Set the default system properties that we'll use now that they have

+REM all been initialised

+set SYSTEM_PROPS=-Damqj.logging.level=%AMQJ_LOGGING_LEVEL% -DQPID_HOME=%QPID_HOME% -DQPID_WORK=%QPID_WORK%

+

+if "%EXTERNAL_CLASSPATH%" == "" set EXTERNAL_CLASSPATH=%CLASSPATH%

+

+REM Use QPID_CLASSPATH if set

+if "%QPID_CLASSPATH%" == "" goto noQpidClasspath

+set CLASSPATH=%QPID_CLASSPATH%

+echo Using CLASSPATH: %CLASSPATH%

+goto afterQpidClasspath

+

+:noQpidClasspath

+echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\qpid-all.jar

+set CLASSPATH=%QPID_HOME%\lib\qpid-all.jar

+:afterQpidClasspath

+

+REM start parsing -run arguments

+set QPID_ARGS=

+if "%1" == "" goto endRunArgs

+:runLoop

+set var=%1

+if "%var:~0,5%" == "-run:" goto runFound

+set QPID_ARGS=%QPID_ARGS% %1 

+:beforeRunShift

+shift

+if not "%1"=="" goto runLoop

+goto endRunArgs

+

+:runFound

+if "%var%" == "-run:debug" goto runDebug

+if "%var%" == "-run:jpda" goto runJdpa

+if "%var:~0,24%" == "-run:external-classpath-" goto runExternalClasspath

+if "%var%" == "-run:print-classpath" goto runPrintCP

+if "%var%" == "-run:help" goto runHelp

+echo "unrecognized -run option '%var%'. For using external classpaths use -run:external-classpath-option"

+goto end

+  

+:runDebug

+REM USAGE: print the classpath and command before running it

+set debug=true

+goto beforeRunShift

+

+:runJdpa

+REM USAGE: adds debugging options to the java command, use

+REM USAGE: JDPA_TRANSPORT and JPDA_ADDRESS to customize the debugging

+REM USAGE: behavior and use JPDA_OPTS to override it entirely

+if "%JPDA_OPTS%" == "" goto beforeRunShift

+if "%JPDA_TRANSPORT%" == "" set JPDA_TRANSPORT=-dt_socket

+if "%JPDA_ADDRESS%" == "" set JPDA_ADDRESS=8000

+set JPDA_OPTS="-Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n"

+set QPID_OPTS="%QPID_OPTS% %JPDA_OPTS%"

+goto beforeRunShift

+

+:runExternalClasspath

+echo Using external classpath %var%

+REM USAGE: Format is -run:external-classpath-first/last/ignore/only as equals special in DOS

+REM USAGE: controls how the CLASSPATH environment variable is used by

+REM USAGE: this script, value can be one of ignore (the default), first,

+REM USAGE: last, and only

+if "%var%" == "-run:external-classpath-ignore" goto beforeRunShift

+if "%var%" == "-run:external-classpath-first" goto extCPFirst

+if "%var%" == "-run:external-classpath-last" goto extCPLast

+if "%var%" == "-run:external-classpath-only" goto extCPOnly

+echo Invalid value provided for external classpath.

+goto end

+

+:extCPFirst

+set CLASSPATH=%EXTERNAL_CLASSPATH%;%CLASSPATH%

+goto beforeRunShift

+

+:extCPLast

+set CLASSPATH=%CLASSPATH%;%EXTERNAL_CLASSPATH%

+goto beforeRunShift

+

+:extCPonly

+set CLASSPATH=%EXTERNAL_CLASSPATH%

+goto beforeRunShift

+

+:runPrintCP

+REM USAGE: print the classpath

+echo %CLASSPATH%

+goto beforeRunShift

+

+:runHelp

+REM USAGE: print this message

+echo -------------------------------------------------------------------------------------------

+echo -run:option where option can be the following.

+echo debug : Prints classpath and command before running it

+echo jpda : Adds remote debugging info using JPDA_OPTS. Use JPDA_TRANSPORT and JPDA_ADDRESS to

+echo        customize, JPDA_OPTS to override

+echo external-classpath : Valid values are: ignore, first, last and only.

+echo print-classpath : Prints classpath before running command

+echo help : Prints this message

+echo --------------------------------------------------------------------------------------------

+goto end

+

+REM end parsing -run arguments

+:endRunArgs

+

+set JAVA_VM=-server

+set JAVA_MEM=-Xmx1024m

+set JAVA_GC=-XX:+UseConcMarkSweepGC 

+rem removing the following vm arg from JAVA_GC  as it is supported on ly in Java 1.6

+rem -XX:+HeapDumpOnOutOfMemoryError"

+

+REM Use QPID_JAVA_GC if set

+if "%QPID_JAVA_GC%" == "" goto noQpidJavaGC

+set JAVA_GC=%QPID_JAVA_GC%

+echo Using QPID_JAVA_GC setting: %QPID_JAVA_GC%

+goto afteQpidJavaGC

+

+:noQPidJavaGC

+echo Info: QPID_JAVA_GC not set. Defaulting to JAVA_GC %JAVA_GC%

+:afterQpidJavaGC

+

+REM Use QPID_JAVA_MEM if set

+if "%QPID_JAVA_MEM%" == "" goto noQpidJavaMem

+set JAVA_MEM=%QPID_JAVA_MEM%

+echo Using QPID_JAVA_MEM setting: %QPID_JAVA_MEM%

+goto afterQpidJavaMem

+

+:noQpidJavaMem

+echo Info: QPID_JAVA_MEM not set. Defaulting to JAVA_MEM %JAVA_MEM%

+:after QpidJavaMem

+

+

+rem QPID_OPTS intended to hold any -D props for use

+rem user must enclose any value for QPID_OPTS in double quotes

+:runCommand

+set MODULE_JARS=%QPID_MODULE_JARS%

+set COMMAND="%JAVA_HOME%\bin\java" %JAVA_VM% %JAVA_MEM% %JAVA_GC% %QPID_OPTS% %SYSTEM_PROPS% -cp "%CLASSPATH%;%MODULE_JARS%" org.apache.qpid.server.Main %QPID_ARGS%

+

+if "%debug%" == "true" echo %CLASSPATH%;%LAUNCH_JAR%;%MODULE_JARS%

+if "%debug%" == "true" echo %COMMAND%

+%COMMAND%

+

+:end

diff --git a/java/broker/bin/qpid.start b/java/broker/bin/qpid.start
new file mode 100755
index 0000000000..78c34e70b4
--- /dev/null
+++ b/java/broker/bin/qpid.start
@@ -0,0 +1,21 @@
+#!/bin/bash

+#

+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+#

+#   http://www.apache.org/licenses/LICENSE-2.0

+#

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License.

+#

+

+exec qpid-server -run:debug "$@"
\ No newline at end of file
diff --git a/java/broker/bin/qpid.stop b/java/broker/bin/qpid.stop
new file mode 100755
index 0000000000..316f8dff46
--- /dev/null
+++ b/java/broker/bin/qpid.stop
@@ -0,0 +1,178 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# qpid.stop Script
+# 
+# Script checks for a given pid running DEFAULT_SEARCH and attempts to quit it
+#
+
+MAX_ATTEMPTS=2
+SLEEP_DELAY=1
+DEFAULT_SEARCH="PNAME=QPBRKR"
+
+if [ -z "$QPID_STOP_SEARCH" ]; then
+    SEARCH=$DEFAULT_SEARCH;
+else
+    SEARCH=$QPID_STOP_SEARCH;
+fi
+
+#
+# Forcably Quit the specified PID($1)
+#
+forceQuit()
+{
+kill -9 $1
+}
+
+#
+# Gracefully ask the PID($1) to quit
+#
+quit()
+{
+kill $1
+}
+
+#
+# grep for the session ID ($1) and return 0 for successful quit and 1 for process alive
+#
+lookup_pid()
+{
+result=`ps -e | grep $1 | wc -l`
+}
+
+#
+# grep ps for all instances of $SEARCH for the current user and collect PIDs
+#
+lookup_all_pids()
+{
+pids=`pgrep -f -U $USER $SEARCH`
+result_all=`echo -n $pids | wc -w`
+}
+
+#
+# check that the PID passed in is for a Qpid broker owned by this user and alive
+#
+validate_pid()
+{
+result=`pgrep -fl $SEARCH | grep $1 | wc -l`
+}
+
+#
+# Show the PS output for given set of pids
+#
+showPids()
+{
+ps -o user,pid,args -p $pids
+}
+
+#
+# Sleep and then check then lookup the PID($1) to ensure it has quit
+#
+check()
+{
+echo "Waiting $SLEEP_DELAY second for $1 to exit"
+sleep $SLEEP_DELAY
+lookup_pid $1
+}
+
+#
+# Verify the PID($1) is available
+#
+verifyPid()
+{
+validate_pid $1
+if [[ $[$result] == 1 ]] ; then
+ brokerspid=$1
+else
+ echo "Unable to locate Qpid Broker Process with PID $1. Check PID and try again."
+ exit -1
+fi
+}
+
+#
+# Stops all Qpid brokers for current user
+#
+qpid_stopall_brokers()
+{
+for pid in $pids ; do
+    lookup_pid $pid;
+    brokerspid=$pid;
+    stop_broker $pid;
+done
+}
+
+#
+# Stops Qpid broker with brokerspid id
+#
+stop_broker()
+{
+# Attempt to quit the process MAX_ATTEMPTS Times
+attempt=0
+while [[ $[$result] > 0 && $[$attempt] < $[$MAX_ATTEMPTS] ]] ; do
+    quit $brokerspid
+    check $brokerspid
+    attempt=$[$attempt + 1]
+done
+
+# Check that it has quit
+if [[ $[$result] == 0 ]] ; then
+    echo "Process quit"
+else
+
+ attempt=0
+ # Now attempt to force quit the process
+    while [[ $[$result] > 0 && $[$attempt] < $[$MAX_ATTEMPTS] ]] ; do
+        forceQuit $brokerspid
+        check $brokerspid
+        attempt=$[$attempt + 1]
+    done
+
+ # Output final status
+    if [[ $[$result] > 0 && $[$attempt] == $[$MAX_ATTEMPTS] ]] ; then
+	    echo "Stopped trying to kill process: $brokerspid"
+	    echo "Attempted to stop $attempt times"
+    else
+	    echo "Done "
+    fi
+fi
+
+}
+
+#
+# Main Run
+#
+
+# Check if we are killing all qpid pids or just one.
+# Now uses local function qpid_stopall_brokers
+if [[ $# == 0 ]] ; then
+    lookup_all_pids
+    if [[ $[$result_all] > 0 ]] ; then
+        echo "Killing All Qpid Brokers for user: '$USER'"
+        qpid_stopall_brokers
+    else
+        echo "No Qpid Brokers found running for user: " $USER
+    fi
+	exit $result
+else	
+	verifyPid $1
+	stop_broker
+    exit $result
+fi
+
diff --git a/java/broker/bin/qpid.stopall b/java/broker/bin/qpid.stopall
new file mode 100755
index 0000000000..b0ad506629
--- /dev/null
+++ b/java/broker/bin/qpid.stopall
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# qpid.stopall script
+# 
+# Script attempts to stop all PROGRAMs running under the current user 
+#  Utilises qpid.stop to perform the actual stopping
+#
+
+qpid.stop $*