diff --git a/pythonPackages/qpid/bin/qpid-queue-count b/pythonPackages/qpid/bin/qpid-queue-count index 1e1ca607a5..e1affd6a7f 100644 --- a/pythonPackages/qpid/bin/qpid-queue-count +++ b/pythonPackages/qpid/bin/qpid-queue-count @@ -75,7 +75,7 @@ class RestManager(): httpConn.timeout = _connTimeout httpConn.connect() - httpConn.request("GET", "/rest/" + service) + httpConn.request("GET", "/api/v2/" + service) response = httpConn.getresponse() if (response.status != 200): diff --git a/pythonPackages/qpid/bin/qpid-stat b/pythonPackages/qpid/bin/qpid-stat index 89988d2183..8dc12dc01d 100644 --- a/pythonPackages/qpid/bin/qpid-stat +++ b/pythonPackages/qpid/bin/qpid-stat @@ -250,7 +250,7 @@ class RestManager(): httpConn.timeout = _connTimeout httpConn.connect() - httpConn.request("GET", "/rest/" + service) + httpConn.request("GET", "/api/v2/" + service) response = httpConn.getresponse() if (response.status != 200): @@ -352,4 +352,4 @@ except KeyboardInterrupt: print except Exception,e: print "Failed: %s - %s" % (e.__class__.__name__, e) - sys.exit(1) \ No newline at end of file + sys.exit(1) diff --git a/rpms/build/common/rpms.sh b/rpms/build/common/rpms.sh index d42da85729..c949b928f4 100644 --- a/rpms/build/common/rpms.sh +++ b/rpms/build/common/rpms.sh @@ -77,7 +77,7 @@ function buildQPID() return 1 fi - # Copy the 0.28 qpid rpms + # Copy the 0.30 qpid rpms cd ${WORKSPACE}/rpms/awips2.qpid/0.30/RPMS/noarch if [ $? -ne 0 ]; then echo "ERROR: Failed to build Qpid v0.30." @@ -101,7 +101,15 @@ function buildQPID() #build 0.30 export AWIPS_II_TOP_DIR cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.30 + if [ $? -ne 0 ]; then + echo "ERROR: Failed to build Qpid Broker v0.30." + return 1 + fi /bin/bash build.sh + if [ $? -ne 0 ]; then + echo "ERROR: Failed to build Qpid Broker v0.30." + return 1 + fi popd > /dev/null 2>&1