Merge "Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30." into omaha_14.4.1

Former-commit-id: 8f7fa6b23c7a20b15c5f9bdfdac5add17aab336e

edexOsgi/build.edex/esb/bin/setup.env

@@ -32,7 +32,7 @@ export HTTP_SERVER_PATH=/services
 export HTTP_SERVER=http://localhost:${HTTP_PORT}${HTTP_SERVER_PATH}
 export JMS_SERVER=tcp://${BROKER_ADDR}:5672
 export JMS_VIRTUALHOST=edex
-export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/rest/connection/${JMS_VIRTUALHOST}
+export JMS_CONNECTIONS_URL=http://${BROKER_ADDR}:8180/api/v2/connection/${JMS_VIRTUALHOST}
 export RADAR_SERVER=tcp://localhost:8813
 
 # set the AWIPS II shared directory

nativeLib/edexBridge/edexBridge.cpp

@@ -9,6 +9,8 @@
  *      Author: rjpeter
  *  Updated on: Aug 05, 2014 (Omaha #3458: Added logging of error when issue occurs on send)
  *      Author: rjpeter
+ *  Updated on: Nov 04, 2014 (Omaha #2991 Updated to work with QPID 0.30)
+ *      Author: dlovely    
  */
 
 #include <qpid/messaging/Connection.h>
@@ -194,7 +196,7 @@ private:
             std::string qpidURL = qpidURLBuilder.str();
 
             std::stringstream connectionOptionsBuilder;
-            connectionOptionsBuilder << "{sasl-mechanism:PLAIN,username:";
+            connectionOptionsBuilder << "{sasl-mechanism:ANONYMOUS,username:";
             connectionOptionsBuilder << this->username;
             connectionOptionsBuilder << ",password:";
             connectionOptionsBuilder << this->password;

nativeLib/edex_com/src/EdexNotification.cpp

@@ -30,6 +30,7 @@
  * 11/2/09       3375       brockwoo    Initial Creation
  * 08/13/13      2257       bkowal      Update for qpid 0.18.
  * 08/15/13      2169       bkowal      Qpid messages are now decompressed
+ * 11/04/14      2991       dlovely     Update for qpid 0.30.
  *
  * </pre>
  *
@@ -46,11 +47,8 @@
 #include <uuid/uuid.h>
 #include <qpid/messaging/Connection.h>
 #include <qpid/messaging/Duration.h>
-#include <qpid/Url.h>
 #include "EdexNotification.h"
 
-using qpid::Url;
-
 EdexNotification::EdexNotification(const string & brokerURI) :
 	duration(Duration(1000 * 120)) {
 	this->sessionTransacted = false;
@@ -220,7 +218,7 @@ bool EdexNotification::connect() {
 		uuid_generate_random(uuidGenerated);
 		uuid_unparse(uuidGenerated, uuidBuff);
 
-		std::string connectionOptions = "{sasl-mechanism:PLAIN,"
+		std::string connectionOptions = "{sasl-mechanism:ANONYMOUS,"
 			"username:guest,password:guest}";
 
 		this->connection = Connection(this->brokerURI, connectionOptions);

nativeLib/edex_com/src/EdexNotification.h

@@ -30,6 +30,7 @@
  * ------------ ----------  ----------- --------------------------
  * 11/2/09       3375       brockwoo    Initial Creation
  * 08/13/13      2257       bkowal      Update for qpid 0.18.
+ * 11/04/14      2991       dlovely     Update for qpid 0.30.
  *
  * </pre>
  *
@@ -49,7 +50,6 @@ typedef void CEdexNotification;
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/Duration.h>
 #include <qpid/messaging/Receiver.h>
-#include <qpid/sys/Time.h>
 #include <thrift/transport/TBufferTransports.h>
 #include <sys/timeb.h>
 #include "Notification_types.h"

rpms/awips2.qpid/0.28/SOURCES/awips.patch

@@ -0,0 +1,68 @@
+diff -crB a/qpid/java/build.deps b/qpid/java/build.deps
+*** a/qpid/java/build.deps	2014-04-13 09:12:12.000000000 -0500
+--- b/qpid/java/build.deps	2014-10-28 09:14:30.121201558 -0500
+***************
+*** 17,29 ****
+  # under the License.
+  #
+  
+! commons-beanutils-core=lib/required/commons-beanutils-core-1.8.3.jar
+  commons-cli=lib/required/commons-cli-1.2.jar
+! commons-codec=lib/required/commons-codec-1.6.jar
+  commons-collections=lib/required/commons-collections-3.2.1.jar
+  commons-configuration=lib/required/commons-configuration-1.8.jar
+  commons-digester=lib/required/commons-digester-1.8.1.jar
+! commons-lang=lib/required/commons-lang-2.6.jar
+  commons-logging=lib/required/commons-logging-1.1.1.jar
+  
+  bcel=lib/required/bcel-5.2.jar
+--- 17,29 ----
+  # under the License.
+  #
+  
+! commons-beanutils-core=lib/required/commons-beanutils-1.8.3.jar
+  commons-cli=lib/required/commons-cli-1.2.jar
+! commons-codec=lib/required/commons-codec-1.4.jar
+  commons-collections=lib/required/commons-collections-3.2.1.jar
+  commons-configuration=lib/required/commons-configuration-1.8.jar
+  commons-digester=lib/required/commons-digester-1.8.1.jar
+! commons-lang=lib/required/commons-lang-2.3.jar
+  commons-logging=lib/required/commons-logging-1.1.1.jar
+  
+  bcel=lib/required/bcel-5.2.jar
+***************
+*** 35,41 ****
+  geronimo-jta=lib/required/geronimo-jta_1.1_spec-1.1.1.jar
+  geronimo-kernel=lib/required/geronimo-kernel-2.2.1.jar
+  geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar
+! geronimo-servlet=lib/required/geronimo-servlet_3.0_spec-1.0.jar
+  
+  junit=lib/required/junit-3.8.1.jar
+  mockito-all=lib/required/mockito-all-1.9.0.jar
+--- 35,41 ----
+  geronimo-jta=lib/required/geronimo-jta_1.1_spec-1.1.1.jar
+  geronimo-kernel=lib/required/geronimo-kernel-2.2.1.jar
+  geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar
+! geronimo-servlet=lib/required/geronimo-servlet_2.5_spec-1.1.2.jar
+  
+  junit=lib/required/junit-3.8.1.jar
+  mockito-all=lib/required/mockito-all-1.9.0.jar
+***************
+*** 60,67 ****
+  dojo-version=1.9.1
+  dojo=lib/required/dojo-${dojo-version}.zip
+  
+! jackson-core=lib/required/jackson-core-asl-1.9.0.jar
+! jackson-mapper=lib/required/jackson-mapper-asl-1.9.0.jar
+  
+  commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
+    ${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
+--- 60,67 ----
+  dojo-version=1.9.1
+  dojo=lib/required/dojo-${dojo-version}.zip
+  
+! jackson-core=lib/required/jackson-core-asl-1.7.3.jar
+! jackson-mapper=lib/required/jackson-mapper-asl-1.7.3.jar
+  
+  commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
+    ${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}

rpms/awips2.qpid/0.28/SOURCES/awips2/dependencies.txt

@@ -0,0 +1,10 @@
+org.apache.commons.cli/commons-cli-1.2.jar
+org.apache.commons.beanutils/commons-beanutils-1.8.3.jar
+org.apache.commons.digester/commons-digester-1.8.1.jar
+org.apache.commons.codec/commons-codec-1.4.jar
+org.apache.commons.lang/commons-lang-2.3.jar
+org.apache.commons.collections/commons-collections-3.2.jar
+org.apache.commons.digester/commons-digester-1.8.1.jar
+org.codehaus.jackson/jackson-core-asl-1.7.3.jar
+org.codehaus.jackson/jackson-mapper-asl-1.7.3.jar
+org.mockito/mockito-all-1.9.0.jar

rpms/awips2.qpid/0.28/SOURCES/build.patch

@@ -0,0 +1,19 @@
+*** a/qpid/java/build.xml	2014-05-13 04:58:21.000000000 -0500
+--- b/qpid/java/build.xml	2014-10-27 14:53:46.434396511 -0500
+***************
+*** 179,185 ****
+      <touch file="${qpid.jar}"/>
+    </target>
+  
+!   <target name="build" depends="retrieve-dependencies" description="build the project">
+      <iterate target="build"/>
+      <antcall target="manifest"/>
+      <echo>
+--- 179,185 ----
+      <touch file="${qpid.jar}"/>
+    </target>
+  
+!   <target name="build" description="build the project">
+      <iterate target="build"/>
+      <antcall target="manifest"/>
+      <echo>

rpms/awips2.qpid/0.28/SOURCES/examples.patch

@@ -0,0 +1,96 @@
+From 4acdbf975c076c2c49e7e2436065ca7d18dfab20 Mon Sep 17 00:00:00 2001
+From: rajith <rajith@redhat.com>
+Date: Wed, 16 Jun 2010 16:37:11 -0400
+Subject: [PATCH 02/52] These two files are not present in upstream and we currently carry them as a patch.
+ The reason being that the run_example.sh is tailored specific for the linux env.
+ Including the example.log4j depends on how the release artefacts will look like for the 0.7 qpid release.
+
+---
+ qpid/java/client/example/bin/run_example.sh |   43 +++++++++++++++++++++++++++
+ qpid/java/client/example/example.log4j      |   27 +++++++++++++++++
+ 2 files changed, 70 insertions(+), 0 deletions(-)
+ create mode 100644 qpid/java/client/example/bin/run_example.sh
+ create mode 100644 qpid/java/client/example/example.log4j
+
+diff --git a/qpid/java/client/example/bin/run_example.sh b/qpid/java/client/example/bin/run_example.sh
+new file mode 100644
+index 0000000..5bd0e99
+--- /dev/null
++++ b/qpid/java/client/example/bin/run_example.sh
+@@ -0,0 +1,43 @@
++#!/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.
++#
++
++# set the CLASSPATH
++QPID_DEPS=`find /usr/share/java/qpid-deps/*.jar | tr '\n' ":"`
++QPID_JARS=`find /usr/share/java -name 'qpid-client*.jar' -or -name 'qpid-common*.jar' | tr '\n' ":"`
++LOG4J="/usr/share/java/log4j.jar"
++QPID_CLASSPATH=$QPID_DEPS$LOG4J:$QPID_JARS
++
++# compile the samples
++javac -cp  "$QPID_CLASSPATH" -sourcepath "$PWD" -d . `find $PWD -name '*.java'`
++
++# Add output classes to CLASSPATH
++QPID_CLASSPATH="$PWD:$QPID_CLASSPATH"
++
++
++# Check if the user supplied a sample classname
++if test "'x$1'" = "'x'"
++then
++    echo "No sample classname specified"
++    exit;
++else
++    java -cp $QPID_CLASSPATH -Dlog4j.configuration=example.log4j "$@"
++fi
++
+diff --git a/qpid/java/client/example/example.log4j b/qpid/java/client/example/example.log4j
+new file mode 100644
+index 0000000..50b4ed2
+--- /dev/null
++++ b/qpid/java/client/example/example.log4j
+@@ -0,0 +1,27 @@
++#
++# 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.
++#
++
++log4j.logger.org.apache.qpid=WARN, console
++log4j.additivity.org.apache.qpid=false
++
++
++log4j.appender.console=org.apache.log4j.ConsoleAppender
++log4j.appender.console.Threshold=all
++log4j.appender.console.layout=org.apache.log4j.PatternLayout
++log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n

rpms/awips2.qpid/0.28/SPECS/qpid-java.spec

@@ -0,0 +1,422 @@
+%define _awips2_directory "/awips2/qpid"
+
+Name:           awips2-qpid-java
+Version:        0.28
+Release:        5%{?dist}
+Summary:        Java implementation of Apache Qpid
+License:        Apache Software License
+Group:          Development/Java
+URL:            http://qpid.apache.org/
+
+%global qpid_src_dir qpid-%{version}
+%global qpid_deps_src_dir qpid-deps-%{version}
+
+Source0:        %{qpid_src_dir}.tar.gz
+
+Patch0:         build.patch
+Patch1:         examples.patch
+Patch2:         awips.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+BuildRequires:  ant >= 1.6.5
+BuildRequires:  ant-nodeps >= 1.6.5
+BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  ant-trax >= 1.6.5
+
+%description
+Java implementation of Apache Qpid.
+
+%package common
+Summary:	Java implementation of Apache Qpid - common files
+Group: 		Development/Java
+BuildArch:	noarch
+
+%description common
+Java implementation of Apache Qpid - common files
+
+%package client
+Summary:	Java implementation of Apache Qpid - client
+Group: 		Development/Java
+BuildArch:	noarch
+Requires:	awips2-qpid-java-common = %{version}-%{release}
+Requires:	log4j >= 1.2.12
+
+%description client
+Java implementation of Apache Qpid - client
+
+%package example
+Summary:        Java implementation of Apache Qpid - example
+Group:          Development/Java
+BuildArch:      noarch
+Requires:       awips2-qpid-java-client = %{version}-%{release}
+
+%description example
+Java implementation of Apache Qpid - example
+
+%prep
+%setup -q -n %{qpid_src_dir}
+mkdir -p java/lib/required
+# copy baseline libraries and other libraries to required
+for dependency in `cat %{_topdir}/SOURCES/awips2/dependencies.txt`;
+do
+   cp -f %{_baseline_workspace}/${dependency} java/lib/required
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+done
+# copy dependencies that are not native to the baseline to required
+cp -f %{_topdir}/SOURCES/awips2/*.jar %{_topdir}/SOURCES/awips2/*.zip  java/lib/required
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+%patch0 -p2
+%patch1 -p2
+# apply the awips patch
+%patch2 -p2
+
+%build
+cd ..
+
+(
+    cd %{qpid_src_dir}/java
+    for module in ${QPID_MODULES[*]}; do
+       ant -Dretrieve.dependencies=false \
+           -Dmodules=${module}
+    done
+    ant -Dretrieve.dependencies=false \
+       -Dmodules=qpid-test-utils\ common\ management/common\ client\ amqp-1-0-common\ amqp-1-0-client\ amqp-1-0-client-jms\ jca
+
+    if [ $? -ne 0 ]; then
+       exit 1
+    fi
+
+    # blacklisted jars are either provided by the Requires: or not needed.
+    BLACKLIST="slf4j qpid-client-tests qpid-all qpid-common-tests"
+    for jar in $BLACKLIST; do rm build/lib/${jar}*.jar; done
+)
+
+%install
+rm -rf %{buildroot}
+
+cd ..
+
+install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt
+install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-client-%{version}.jar \
+	%{buildroot}%{_awips2_directory}/lib/opt
+install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-common-%{version}.jar \
+	%{buildroot}%{_awips2_directory}/lib/opt
+install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-management-common-%{version}.jar \
+        %{buildroot}%{_awips2_directory}/lib/opt
+
+# foss dependencies
+install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
+install -pm 644 %{qpid_src_dir}/java/lib/required/*.jar \
+	%{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
+
+# license & notice
+install -pm 644 %{qpid_src_dir}/java/resources/LICENSE \
+	%{buildroot}%{_awips2_directory}
+install -pm 644 %{qpid_src_dir}/java/resources/NOTICE \
+	%{buildroot}%{_awips2_directory}
+
+# examples
+
+install -dm 755 %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/org/apache/qpid/example/
+install -pm 644 %{qpid_src_dir}/java/client/example/src/main/java/org/apache/qpid/example/*.java \
+        %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/org/apache/qpid/example/
+install -pm 644 %{qpid_src_dir}/java/client/example/src/main/java/org/apache/qpid/example/hello.properties \
+        %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/org/apache/qpid/example/
+install -pm 644 %{qpid_src_dir}/java/client/example/example.log4j \
+        %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/
+install -pm 755 %{qpid_src_dir}/java/client/example/bin/run_example.sh \
+        %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/
+
+%clean
+rm -rf %{buildroot}
+
+%files common
+%defattr(-,awips,fxalpha,-)
+%dir /awips2/qpid
+%dir /awips2/qpid/lib
+%dir /awips2/qpid/lib/opt
+/awips2/qpid/lib/opt/qpid-common-%{version}.jar
+/awips2/qpid/lib/opt/qpid-management-common-%{version}.jar
+%dir /awips2/qpid/lib/opt/qpid-deps
+/awips2/qpid/lib/opt/qpid-deps/*
+%doc /awips2/qpid/LICENSE
+%doc /awips2/qpid/NOTICE
+
+%files client
+%defattr(-,awips,fxalpha,-)
+%dir /awips2/qpid
+%dir /awips2/qpid/lib
+%dir /awips2/qpid/lib/opt
+/awips2/qpid/lib/opt/qpid-client-%{version}.jar
+
+%files example
+%defattr(-,awips,fxalpha,-)
+/awips2/qpid/doc/%{name}-%{version}/examples/
+
+%changelog
+* Thu Sep  6 2012 Irina Boverman <iboverma@redhat.com> - 0.18-2
+- Resolved bz 851574
+
+* Tue Jul 10 2012 Justin Ross <jross@redhat.com> - 0.18-1
+- Refactored spec file to use standard Qpid source export
+- Rebased to Qpid 0.18 beta source
+
+* Thu Feb 23 2012 Rajith Attapattu <rattapat@redhat.com> - 0:0.14-3
+- Added a patch to account for changes between 0.14-rc1 and HEAD of 0.14-mrg-preview.
+
+* Thu Feb 16 2012 Rajith Attapattu <rattapat@redhat.com> - 0:0.14-2
+- Added a patch to account for changes between 0.14-rc1 and HEAD of 0.14-mrg-preview.
+
+* Mon Dec 12 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.14-1
+- Rebased the client to use the Qpid 0.14 RC1 source.
+- Added a patch to account for changes between 0.14-rc1 and HEAD of 0.14-mrg-preview.
+
+* Fri Sep 23 2011 Andrew Stitcher <astitcher@redhat.com> - 0:0.10-11
+- Added new qpid-java-jca-zip package which wraps a zip of everything
+  in qpid jca.
+- Make qpid-deps jar have correct 0.10 version
+- Updated patch to include latest Qpid JCA work:
+  BZ.738316
+  BZ 733383
+  BZ 736252
+  BZ 700500
+  BZ 707535
+  BZ 722614
+  BZ 735030
+  BZ 738615
+  BZ 700494
+  BZ 705913
+  BZ 723714
+  BZ 735384
+  BZ 736794
+  BZ 737880
+  BZ 735322
+  BZ 736785
+
+* Tue Sep 14 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.10-9
+- Added a patch to account for changes between 0.10 and mrg_2.0.3 head rev on Sep 14th.
+
+* Mon May 16 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.10.-6
+- Added a patch to account for changes between 0.10 and qpid-0.10-package-set-7 tags.
+
+* Thu Apr 28 2011 Andrew Stitcher <astitcher@redhat.com> - 0:0.10.-5
+- Removed jar file that was not meant to be in qpid-java-common
+
+* Wed Apr 20 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.10.-4
+- Added a patch to account for changes between 0.10 and qpid-0.10-package-set-5 tags.
+
+* Thu Apr 14 2011 Ted Ross <tross@redhat.com> - 0:0.10-3
+- Added a patch to fix BZ694617
+
+* Wed Apr 6 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.10.-2
+- Added a patch to include QPID-3177 which is included in the upstream 0.10 release.
+- Fixed an error in the qpid-deps source tarball.
+
+* Thu Mar 24 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.10.-1
+- Change the version from 0.10.1083082 to 0.10.
+
+* Wed Mar 23 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.10.1083082-1
+- Updated the source files to rev 1083082 in Qpid 0.10 branch.  
+
+* Thu Mar 10 2011 Andrew Stitcher <astitcher@redhat.com> - 0:0.9.1080013-3
+- Fixed issue that stopped deployment on JBoss 5
+- Added sample deployment resource
+- Added some JCA example code
+- Added separate Readme for JBoss deployment
+
+* Thu Mar 10 2011 Andrew Stitcher <astitcher@redhat.com> - 0:0.9.1080013-2
+- Updated JCA package added some documentation to it.
+- Add qpid-deps jar into the qpid-ra rar file to supply dependencies for
+  qpid-common/qpid-client jars
+
+* Wed Mar 9 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.9.1080013-1
+- Updated the source files to rev 1080013 in Qpid 0.10 branch.
+
+* Tue Mar 8 2011 Andrew Stitcher <astitcher@redhat.com> - 0:0.9.1073306-3
+- Changed JCA build to use source for jar dependents
+
+* Wed Mar 2 2011 Andrew Stitcher <astitcher@redhat.com> - 0:0.9.1073306-2
+- Added new sub-package for JCA resource adapter
+
+* Thu Feb 24 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.9.1073306-1
+- Updated the source files to rev 1073306 in Qpid trunk.
+
+* Thu Jan 27 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-15
+- Applied another patch for BZ 656488, 672212.
+
+* Wed Jan 12 2011 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-14
+- Applied patches for BZ 667428, 656488.
+
+* Wed Nov 10 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-12
+- Applied patches for BZ 645855
+
+* Tue Oct 12 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-11
+- Added "Obsoletes: qpid-java-qman <= 0.5.751061-9.el5" to the spec file. 
+
+* Wed Sep 22 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-10
+- Applied patches for BZ 634794, 636097, 633969.
+
+* Mon Sep 13 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-9
+- Applied patches for BZ 626859.
+
+* Mon Aug 30 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-8
+- Applied patches for BZ 620808, 621395, 622619.
+
+* Thu Jul 29 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-7
+- Applied patches for BZ 616457, 614580, 618865, 618822, 614589, 513426, 619242.
+
+* Mon Jul 12 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-6
+- Applied patches for bz612531, bz612526, bz612535.
+
+* Wed Jun 30 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-5
+- Patches are now generated from git.
+- Added a fix for bz608052
+- Configured the javac target to 1.5 for dependencies
+
+* Tue Jun 15 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-4
+- For dependencies that are not available as rpms, they are now built from source.
+- For commons lang, the required classes are now added as a patch, removing the required dependency.
+
+* Mon May 24 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-3
+- Fixed an error in the run_example script
+- Added LICENSE and NOTICE to common rpm
+
+* Mon May 24 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-2
+- Added Drain and Spout examples
+- Removed dependency from sl4j rpm, instead using the jar in qpid-deps
+
+* Thu May 20 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.946106-1
+- Updated to rev 946106 of Qpid trunk
+
+* Thu Apr 15 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.934605-1
+- Updated to rev 934605 of Qpid trunk
+
+* Tue Mar 2 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.918215-1
+- Updated to rev 918215 of Qpid trunk
+
+* Wed Feb 3 2010 Rajith Attapattu <rattapat@redhat.com> - 0:0.7.906145-1
+- Updated to rev 906145 of Qpid trunk
+- Stripped the qman package. The java broker is also not built anymore.
+  
+* Fri Oct 9 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.751061-9
+- Removing patch attached to bz494630
+- Applying patch attached to bz493559
+- Applying patch attached to bz509395
+
+* Tue Jun 25 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.751061-8
+- Applying patch attached to bz506739
+- Applying patch attached to bz507369
+
+* Mon Jun  8 2009 Rafael Schloming <rafaels@redhat.com> - 0:0.5.751061-7
+- Applying the heartbeat echo patch from bz504590
+
+* Thu Jun 04 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.751061-6
+- Applying the modified patch attached to bz503539
+
+* Wed Jun 03 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.751061-5
+- Applying patch attached to bz503526
+- Applying patch attached to bz503539
+
+* Thu May 21 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.751061-4
+- Fixed an error in the spec file to apply all patches correctly
+
+* Wed May 20 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.751061-3
+- Applying patch attached to bz500146
+- Applying patch attached to bz501552
+
+* Wed Apr 8 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.751061-2
+- Going back to revision 751061 of Qpid trunk
+- Applying patch attached to bz494630
+
+* Fri Mar 27 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.758820-1
+- Updated to revision 758820 of the Qpid trunk
+
+* Thu Mar 12 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.5.751061-1
+- Updated to revision 751061 of the Qpid trunk
+
+* Wed Mar 04 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.4.750205-1
+- Updated to revision 750205 of the Qpid trunk
+
+* Fri Feb 13 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.4.743367-1
+- Updated to revision 743367 of the Qpid trunk
+
+* Mon Feb 09 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.4.742278-1
+- Updated to revision 742278 of the Qpid trunk
+
+* Wed Jan 28 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.4.738568-1
+- Updated to revision 738568 of the Qpid trunk
+- Removed thread patch as it's comitted to trunk
+
+* Fri Jan 9 2009 Rajith Attapattu <rattapat@redhat.com> - 0:0.3.733043-2
+- Updated to revision 733043 of the Qpid M4-RCs branch
+
+* Mon Nov 19 2008 Rajith Attapattu <rattapat@redhat.com> - 0:0.3.724504-1
+- Updated to revision 724504 of the qpid trunk
+- Added the Qman package
+- Applied the thread abstraction patch
+
+* Mon Nov 10 2008 Rajith Attapattu <rattapat@redhat.com> - 0:0.3.712662-1
+- Updated to revision 712662 of the qpid trunk
+
+* Fri Oct 31 2008 Nuno Santos <nsantos@redhat.com> - 0:0.3.709187-1
+- Rebased to svn rev 709187
+
+* Mon Oct 28 2008 Rajith Attapattu <rattapat@redhat.com> - 0:0.3.708221-1
+- Updated to revision 708221 of the qpid trunk
+
+* Fri Aug 25 2008 Justin Ross <jross@redhat.com> - 0:0.2.687156-1
+- Updated to revision 687156 of the qpid.0-10 branch
+
+* Fri Aug 15 2008 Justin Ross <jross@redhat.com> - 0:0.2.686136-1
+- Updated to revision 686136 of the qpid.0-10 branch
+
+* Mon Jun 16 2008 Justin Ross <jross@redhat.com> - 0:0.2.668333-1
+- Updated to source revision 668333
+
+* Fri Jun 13 2008 Arnaud Simon <asimon@redhat.com> - 0:0.2.667615-1
+- Updated to source revision 667615
+
+* Mon Jun 11 2008 Arnaud Simon <asimon@redhat.com> - 0:0.2.666296-2
+- Updated common dep and removed package broker
+
+* Mon Jun 10 2008 Justin Ross <jross@redhat.com> - 0:0.2.666296-1
+- Updated to source revision 666296
+
+* Mon Jun 9 2008 Arnaud Simon <asimon@redhat.com> - 0:0.2.665769-1
+- Updated to source revision 665769
+
+* Thu May 15 2008 Justin Ross <jross@redhat.com> - 0:0.2.656760-1
+- Updated source tarballs instructions
+- Added svn revision number to version
+- Updated to source revision 656760
+
+* Tue May 13 2008 Arnaud Simon  <asimon@redhat.com> - 0:0.2-11
+- changed version for solving version conflic
+
+* Tue May 13 2008 Arnaud Simon  <asimon@redhat.com> - 0:0.2-10
+- changed some default network configuration 
+
+* Tue May 13 2008 Arnaud Simon  <asimon@redhat.com> - 0:0.2-9
+- Bumped release for Beta 4
+
+* Fri Feb 15 2008  Rafael Schloming <rafaels@redhat.com> - 0:0.2-9
+- fix for deadlock exposed by TCK
+
+* Wed Feb 13 2008  Rafael Schloming <rafaels@redhat.com> - 0:0.2-8
+- More bug fixes for Beta 3
+
+* Tue Feb 12 2008 Rafael Schloming <rafaels@redhat.com> - 0:0.2-7
+- Bumped release for Beta 3 bug fixes
+
+* Mon Feb 11 2008 Rafael Schloming <rafaels@redhat.com> - 0:0.2-6
+- Bumped release for Beta 3
+
+* Mon Feb 11 2008 Nuno Santos <nsantos@redhat.com> - 0.2-5
+- Initial build.
+

rpms/awips2.qpid/0.28/SPECS/qpid-lib.spec

@@ -0,0 +1,127 @@
+%define _build_arch %(uname -i)
+%define _qpid_version 0.28
+%define _qpid_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%global qpid_src_dir qpid-%{version}
+#
+# AWIPS II QPID native Spec File
+#
+
+Name: awips2-qpid-lib
+Summary: AWIPS II QPID Native Library Distribution
+Version: %{_qpid_version}
+Release: 1.el6
+Group: AWIPSII
+BuildRoot: %{_build_root}
+BuildArch: %{_build_arch}
+URL: N/A
+License: N/A
+Distribution: N/A
+Vendor: Raytheon
+Packager: Bryan Kowal
+
+Source0: %{qpid_src_dir}.tar.gz
+
+AutoReq: no
+BuildRequires: awips2-python
+provides: awips2-qpid-lib
+
+%description
+AWIPS II QPID Lib Distribution - Contains the qpid shared libraries and
+header files for qpid %{_qpid_version}.
+
+%prep
+# Ensure that a "buildroot" has been specified.
+if [ "%{_build_root}" = "" ]; then
+   echo "ERROR: A BuildRoot has not been specified."
+   echo "FATAL: Unable to Continue ... Terminating."
+   exit 1
+fi
+
+if [ -d %{_build_root} ]; then
+   rm -rf %{_build_root}
+fi
+if [ -d %{_qpid_build_loc} ]; then
+   rm -rf %{_qpid_build_loc}
+fi
+mkdir -p %{_qpid_build_loc}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+cp -v %SOURCE0 %{_qpid_build_loc}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+pushd . > /dev/null 2>&1
+cd %{_qpid_build_loc}
+tar -xvf %SOURCE0
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null 2>&1
+
+%build
+pushd . > /dev/null 2>&1
+
+mkdir -p %{_qpid_build_loc}/build
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+cd %{_qpid_build_loc}/build
+
+cmake %{_qpid_build_loc}/%{qpid_src_dir}/cpp -DCMAKE_INSTALL_PREFIX:PATH=%{_qpid_build_loc}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+make all
+if [ $? -ne 0 ]; then
+   exit 1
+fi 
+popd > /dev/null 2>&1
+
+%install
+/bin/mkdir -p %{_qpid_build_loc}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+pushd . > /dev/null 2>&1
+cd %{_qpid_build_loc}/build
+make install
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null 2>&1
+
+/bin/mkdir -p %{_build_root}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+# copy qpid lib and include directories.
+/bin/cp -rv %{_qpid_build_loc}/awips2/qpid/lib \
+   %{_build_root}/awips2/qpid
+/bin/cp -rv %{_qpid_build_loc}/awips2/qpid/lib64/* \
+   %{_build_root}/awips2/qpid/lib
+/bin/cp -rv %{_qpid_build_loc}/awips2/qpid/include \
+   %{_build_root}/awips2/qpid
+   
+%pre
+%post
+%preun
+%postun
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{_qpid_build_loc}
+
+%files
+%defattr(644,awips,fxalpha,755)
+%dir /awips2/qpid
+%dir /awips2/qpid/lib
+/awips2/qpid/lib/*
+%dir /awips2/qpid/include
+/awips2/qpid/include/*

rpms/awips2.qpid/0.28/deploy.builder/build.sh

@@ -0,0 +1,73 @@
+#!/bin/bash -x
+
+# Verify that the workspace has been specified
+if [ -z ${WORKSPACE} ]; then
+   echo "Error: the location of the baseline workspace must be specified using the WORKSPACE environment variable."
+   exit 1
+fi
+if [ -z ${AWIPSII_BUILD_ROOT} ]; then
+   export AWIPSII_BUILD_ROOT="/tmp/${USER}/awips-component"
+   echo "INFO: using default build root - ${AWIPSII_BUILD_ROOT}."
+fi
+
+__SPECS=qpid-java.spec
+#__SPECS_PATCH0=qpid-java.spec.patch0
+
+# apply the rpm specification patch
+#cd ../SPECS
+#if [ $? -ne 0 ]; then
+#   exit 1
+#fi
+#patch -p1 -i ${__SPECS_PATCH0}
+#if [ $? -ne 0 ]; then
+#   exit 1
+#fi
+
+pushd . > /dev/null
+cd ../
+export TOPDIR=`pwd`
+
+# create the rpm directory structure
+if [ -d ${TOPDIR}/BUILD ]; then
+   rm -rf ${TOPDIR}/BUILD
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+fi
+mkdir ${TOPDIR}/BUILD
+if [ -d ${TOPDIR}/RPMS ]; then
+   rm -rf ${TOPDIR}/RPMS
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+fi
+mkdir ${TOPDIR}/RPMS
+if [ -d ${TOPDIR}/SRPMS ]; then
+   rm -rf ${TOPDIR}/SRPMS
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+fi
+mkdir ${TOPDIR}/SRPMS
+
+# build the rpm
+rpmbuild -ba \
+   --define "_topdir ${TOPDIR}" \
+   --define "_baseline_workspace ${WORKSPACE}" \
+   SPECS/${__SPECS}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+rpmbuild -ba \
+   --define "_topdir ${TOPDIR}" \
+   --define "_baseline_workspace ${WORKSPACE}" \
+   --define "_build_root ${AWIPSII_BUILD_ROOT}" \
+   --buildroot ${AWIPSII_BUILD_ROOT} \
+   SPECS/qpid-lib.spec
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+popd > /dev/null
+
+exit 0

rpms/awips2.qpid/0.30/SPECS/qpid-java.spec

@@ -0,0 +1,86 @@
+%define _awips2_directory "/awips2/qpid"
+
+Name:           awips2-qpid-java
+Version:        0.30
+Release:        1%{?dist}
+Summary:        Java implementation of Apache Qpid
+License:        Apache Software License
+Group:          Development/Java
+URL:            http://qpid.apache.org/
+
+%global qpid_src_dir qpid-client-%{version}-bin
+%global qpid_client_dir qpid-client
+
+Source:        %{qpid_src_dir}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+
+%description
+Java implementation of Apache Qpid.
+
+%package common
+Summary:	Java implementation of Apache Qpid - common files
+Group: 		Development/Java
+BuildArch:	noarch
+
+%description common
+Java implementation of Apache Qpid - common files
+
+%package client
+Summary:	Java implementation of Apache Qpid - client
+Group: 		Development/Java
+BuildArch:	noarch
+Requires:	awips2-qpid-java-common = %{version}-%{release}
+Requires:	log4j >= 1.2.12
+
+%description client
+Java implementation of Apache Qpid - client
+
+%prep
+%setup -q -n %{qpid_client_dir}
+
+%build
+
+%install
+rm -rf %{buildroot}
+
+cd ..
+
+install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt
+install -pm 644 %{qpid_client_dir}/%{version}/lib/qpid-client-%{version}.jar \
+	%{buildroot}%{_awips2_directory}/lib/opt
+install -pm 644 %{qpid_client_dir}/%{version}/lib/qpid-common-%{version}.jar \
+	%{buildroot}%{_awips2_directory}/lib/opt
+install -pm 644 %{qpid_client_dir}/%{version}/lib/geronimo-jms_1.1_spec-1.1.1.jar \
+	%{buildroot}%{_awips2_directory}/lib/opt
+install -pm 644 %{qpid_client_dir}/%{version}/lib/slf4j-api-1.6.4.jar \
+	%{buildroot}%{_awips2_directory}/lib/opt
+
+# license & notice
+install -pm 644 %{qpid_client_dir}/%{version}/LICENSE \
+	%{buildroot}%{_awips2_directory}
+install -pm 644 %{qpid_client_dir}/%{version}/NOTICE \
+	%{buildroot}%{_awips2_directory}
+
+%clean
+rm -rf %{buildroot}
+
+%files common
+%defattr(-,awips,fxalpha,-)
+%dir /awips2/qpid
+%dir /awips2/qpid/lib
+%dir /awips2/qpid/lib/opt
+/awips2/qpid/lib/opt/qpid-common-%{version}.jar
+/awips2/qpid/lib/opt/geronimo-jms_1.1_spec-1.1.1.jar
+/awips2/qpid/lib/opt/slf4j-api-1.6.4.jar 
+%doc /awips2/qpid/LICENSE
+%doc /awips2/qpid/NOTICE
+
+%files client
+%defattr(-,awips,fxalpha,-)
+%dir /awips2/qpid
+%dir /awips2/qpid/lib
+%dir /awips2/qpid/lib/opt
+/awips2/qpid/lib/opt/qpid-client-%{version}.jar
+

rpms/awips2.qpid/0.30/SPECS/qpid-lib.spec

@@ -0,0 +1,127 @@
+%define _build_arch %(uname -i)
+%define _qpid_version 0.30
+%define _qpid_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%global qpid_src_dir qpid-cpp-%{version}
+#
+# AWIPS II QPID native Spec File
+#
+
+Name: awips2-qpid-lib
+Summary: AWIPS II QPID Native Library Distribution
+Version: %{_qpid_version}
+Release: 0.30
+Group: AWIPSII
+BuildRoot: %{_build_root}
+BuildArch: %{_build_arch}
+URL: N/A
+License: N/A
+Distribution: N/A
+Vendor: Raytheon
+Packager: Bryan Kowal
+
+Source0: %{qpid_src_dir}.tar.gz
+
+AutoReq: no
+BuildRequires: awips2-python
+provides: awips2-qpid-lib
+
+%description
+AWIPS II QPID Lib Distribution - Contains the qpid shared libraries and
+header files for qpid %{_qpid_version}.
+
+%prep
+# Ensure that a "buildroot" has been specified.
+if [ "%{_build_root}" = "" ]; then
+   echo "ERROR: A BuildRoot has not been specified."
+   echo "FATAL: Unable to Continue ... Terminating."
+   exit 1
+fi
+
+if [ -d %{_build_root} ]; then
+   rm -rf %{_build_root}
+fi
+if [ -d %{_qpid_build_loc} ]; then
+   rm -rf %{_qpid_build_loc}
+fi
+mkdir -p %{_qpid_build_loc}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+cp -v %SOURCE0 %{_qpid_build_loc}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+pushd . > /dev/null 2>&1
+cd %{_qpid_build_loc}
+tar -xvf %SOURCE0
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null 2>&1
+
+%build
+pushd . > /dev/null 2>&1
+
+mkdir -p %{_qpid_build_loc}/build
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+cd %{_qpid_build_loc}/build
+
+cmake %{_qpid_build_loc}/%{qpid_src_dir} -DCMAKE_INSTALL_PREFIX:PATH=%{_qpid_build_loc}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+make all
+if [ $? -ne 0 ]; then
+   exit 1
+fi 
+popd > /dev/null 2>&1
+
+%install
+/bin/mkdir -p %{_qpid_build_loc}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+pushd . > /dev/null 2>&1
+cd %{_qpid_build_loc}/build
+make install
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+popd > /dev/null 2>&1
+
+/bin/mkdir -p %{_build_root}/awips2/qpid
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+# copy qpid lib and include directories.
+/bin/cp -rv %{_qpid_build_loc}/awips2/qpid/lib \
+   %{_build_root}/awips2/qpid
+/bin/cp -rv %{_qpid_build_loc}/awips2/qpid/lib64/* \
+   %{_build_root}/awips2/qpid/lib
+/bin/cp -rv %{_qpid_build_loc}/awips2/qpid/include \
+   %{_build_root}/awips2/qpid
+   
+%pre
+%post
+%preun
+%postun
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{_qpid_build_loc}
+
+%files
+%defattr(644,awips,fxalpha,755)
+%dir /awips2/qpid
+%dir /awips2/qpid/lib
+/awips2/qpid/lib/*
+%dir /awips2/qpid/include
+/awips2/qpid/include/*

rpms/awips2.qpid/0.30/deploy.builder/build.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Verify that the workspace has been specified
+if [ -z ${WORKSPACE} ]; then
+   echo "Error: the location of the baseline workspace must be specified using the WORKSPACE environment variable."
+   exit 1
+fi
+if [ -z ${AWIPSII_BUILD_ROOT} ]; then
+   export AWIPSII_BUILD_ROOT="/tmp/${USER}/awips-component"
+   echo "INFO: using default build root - ${AWIPSII_BUILD_ROOT}."
+fi
+
+pushd . > /dev/null
+cd ../
+export TOPDIR=`pwd`
+
+# create the rpm directory structure
+if [ -d ${TOPDIR}/BUILD ]; then
+   rm -rf ${TOPDIR}/BUILD
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+fi
+mkdir ${TOPDIR}/BUILD
+if [ -d ${TOPDIR}/RPMS ]; then
+   rm -rf ${TOPDIR}/RPMS
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+fi
+mkdir ${TOPDIR}/RPMS
+if [ -d ${TOPDIR}/SRPMS ]; then
+   rm -rf ${TOPDIR}/SRPMS
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+fi
+mkdir ${TOPDIR}/SRPMS
+
+# build the rpm
+rpmbuild -ba \
+   --define "_topdir ${TOPDIR}" \
+   --define "_baseline_workspace ${WORKSPACE}" \
+   SPECS/qpid-java.spec
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+rpmbuild -ba \
+   --define "_topdir ${TOPDIR}" \
+   --define "_baseline_workspace ${WORKSPACE}" \
+   --define "_build_root ${AWIPSII_BUILD_ROOT}" \
+   --buildroot ${AWIPSII_BUILD_ROOT} \
+   SPECS/qpid-lib.spec
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+popd > /dev/null
+
+exit 0

rpms/build/common/rpms.sh

@@ -65,7 +65,7 @@ function buildQPID()
       fi
    fi
    
-   cd ${WORKSPACE}/rpms/awips2.qpid/0.18/deploy.builder
+   cd ${WORKSPACE}/rpms/awips2.qpid/0.30/deploy.builder
    if [ $? -ne 0 ]; then
       echo "ERROR: Failed to build the qpid rpms."
       return 1
@@ -77,10 +77,10 @@ function buildQPID()
       return 1
    fi
 
-   # Copy the 0.18 qpid rpms
-   cd ${WORKSPACE}/rpms/awips2.qpid/0.18/RPMS/noarch
+   # Copy the 0.28 qpid rpms
+   cd ${WORKSPACE}/rpms/awips2.qpid/0.30/RPMS/noarch
    if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build Qpid v0.18."
+      echo "ERROR: Failed to build Qpid v0.30."
       return 1
    fi
    /bin/cp -v *.rpm ${AWIPSII_TOP_DIR}/RPMS/noarch
@@ -88,9 +88,9 @@ function buildQPID()
       return 1
    fi
 
-   cd ${WORKSPACE}/rpms/awips2.qpid/0.18/RPMS/x86_64
+   cd ${WORKSPACE}/rpms/awips2.qpid/0.30/RPMS/x86_64
    if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build Qpid v0.18."
+      echo "ERROR: Failed to build Qpid v0.30."
       return 1
    fi
    /bin/cp -v *.rpm ${AWIPSII_TOP_DIR}/RPMS/x86_64
@@ -98,9 +98,9 @@ function buildQPID()
       return 1
    fi
 
-   #build 0.28
+   #build 0.30
    export AWIPS_II_TOP_DIR
-   cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.28
+   cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.30
    /bin/bash build.sh
 
    popd > /dev/null 2>&1

rpms/python.site-packages/Installer.qpid/component.spec

@@ -8,7 +8,7 @@
 #
 Name: awips2-python-qpid
 Summary: AWIPS II Python qpid Distribution
-Version: 0.18
+Version: 0.30
 Release: 1
 BuildArch: noarch
 Group: AWIPSII
@@ -45,7 +45,7 @@ mkdir -p %{_python_build_loc}
 
 %build
 QPID_SRC_DIR="%{_python_pkgs_dir}/qpid"
-QPID_TAR="qpid-python-0.18.tar.gz"
+QPID_TAR="qpid-python-0.30.tar.gz"
 
 cp -rv ${QPID_SRC_DIR}/${QPID_TAR} \
    %{_python_build_loc}
@@ -61,7 +61,7 @@ popd > /dev/null
 
 %install
 QPID_SRC_DIR="%{_python_pkgs_dir}/qpid"
-QPID_SRC="qpid-0.18/python"
+QPID_SRC="qpid-python-0.30"
 QPID_STAT_SCRIPT="qpid-stat"
 QPID_QUEUE_COUNT_SCRIPT="qpid-queue-count"
 QPID_MONITOR_SCRIPT="monitor_qpid_host.sh"