From 3ad26d1b99133d43d38d2a327c699ee3d1d1a8ea Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Thu, 28 Mar 2013 15:58:10 -0500 Subject: [PATCH] Issue #1750 - qpid updates for compatibility with operational servers - ensure that AWIPS II Java is used - installation will create the required qpid logs directory - do not include the qpid-deps jar due to conflicting FOSS classes Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f Former-commit-id: a9cdcfeb64c4e6012c8ed75ba5bedbbb8817a43f [formerly d124f7a37f2230d904e0d84d145967ac82afc65f] [formerly 2819e8fe4868531efba140389811be70cfa5f827] [formerly a9cdcfeb64c4e6012c8ed75ba5bedbbb8817a43f [formerly d124f7a37f2230d904e0d84d145967ac82afc65f] [formerly 2819e8fe4868531efba140389811be70cfa5f827] [formerly e3c39b9be673318dcf479d84f1e10ddfb3d05662 [formerly 2819e8fe4868531efba140389811be70cfa5f827 [formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]]] Former-commit-id: e3c39b9be673318dcf479d84f1e10ddfb3d05662 Former-commit-id: 0e463b7bc92071639e401f1c2951ffa1a2709f4d [formerly fa5825b0c5b7c54692b16ad3b1645ecd0724aff4] [formerly 6aae58a0db49da2bf8d5ca2ffa9bbcfa5037b662 [formerly 07a52630a76b81228dde14605a685d906689fb06]] Former-commit-id: 9645bd3efad403aca10a90570bae4707b44a92e2 [formerly df6d81dfd9784fa9fa34836361f96e0c8dbb8c65] Former-commit-id: 8cd870d757c197b5cbd7756ad126b08ead2b2936 --- rpms/awips2.qpid/0.18/SOURCES/awips.patch | 10 ++++++---- rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0 | 12 ++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/rpms/awips2.qpid/0.18/SOURCES/awips.patch b/rpms/awips2.qpid/0.18/SOURCES/awips.patch index 96bbba94f0..9b13adece4 100644 --- a/rpms/awips2.qpid/0.18/SOURCES/awips.patch +++ b/rpms/awips2.qpid/0.18/SOURCES/awips.patch @@ -40,22 +40,24 @@ diff -crB a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server # Set to help us get round the manifold problems of ps/pgrep on various *************** -*** 34,40 **** +*** 34,41 **** fi # Set classpath to include the qpid-all manifest jar, and any jars supplied in lib/opt ! QPID_LIBS="$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/opt/*" # Set other variables used by the qpid-run script before calling - export JAVA=java \ ---- 33,39 ---- +! export JAVA=java \ + JAVA_VM=-server \ +--- 33,40 ---- fi # Set classpath to include the qpid-all manifest jar, and any jars supplied in lib/opt ! QPID_LIBS="$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/opt/*:$QPID_HOME/lib/opt/qpid-deps/*" # Set other variables used by the qpid-run script before calling - export JAVA=java \ +! export JAVA=/awips2/java/bin/java \ + JAVA_VM=-server \ diff -crB a/qpid/java/build.deps b/qpid/java/build.deps *** a/qpid/java/build.deps 2013-01-23 13:54:15.000000000 -0600 --- b/qpid/java/build.deps 2013-01-23 13:52:28.000000000 -0600 diff --git a/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0 b/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0 index 1b18ebe1f7..dc0804bc08 100644 --- a/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0 +++ b/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0 @@ -1,6 +1,6 @@ diff -crB a/qpid-java.spec b/qpid-java.spec -*** a/qpid-java.spec 2013-01-28 10:36:50.000000000 -0600 ---- b/qpid-java.spec 2013-02-11 15:05:10.000000000 -0600 +*** a/qpid-java.spec 2013-03-28 13:52:58.000000000 -0500 +--- b/qpid-java.spec 2013-03-28 14:47:41.000000000 -0500 *************** *** 1,3 **** --- 1,5 ---- @@ -171,13 +171,11 @@ diff -crB a/qpid-java.spec b/qpid-java.spec ! install -dm 755 %{buildroot}%{_awips2_directory}/bin ! install -pm 644 %{qpid_src_dir}/java/build/bin/* %{buildroot}%{_awips2_directory}/bin ! -! install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt/qpid-deps -! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-deps-%{version}.jar \ -! %{buildroot}%{_awips2_directory}/lib/opt/qpid-deps -! ! # service script ! mkdir -p %{buildroot}/etc/init.d ! install -pm 755 %SOURCE5 %{buildroot}/etc/init.d +! # logs directory +! mkdir -p %{buildroot}%{_awips2_directory}/log ! ! # qpid configuration ! install -dm 755 %{buildroot}%{_awips2_directory}/etc @@ -188,6 +186,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec ! install -pm 644 %SOURCE4 %{buildroot}%{_awips2_directory}/etc ! ! # 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 ! @@ -241,6 +240,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec ! /awips2/qpid/lib/opt/qpid-broker-plugins-access-control-%{version}.jar ! /awips2/qpid/lib/opt/qpid-broker-plugins-firewall-%{version}.jar ! /awips2/qpid/lib/opt/qpid-broker-plugins-management-http-%{version}.jar +! %dir /awips2/qpid/log ! %defattr(755,awips,fxalpha,755) ! %dir /awips2/qpid/bin ! /awips2/qpid/bin/*