xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1750 - qpid updates for compatibility with operational servers

Browse source 
- 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

Conflicts:

	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0


Former-commit-id: 1000dac7ad [formerly 1000dac7ad [formerly e30dff6e530b247c01d6ff4cff826abcda92ff29]]
Former-commit-id: 1cea2404c8
Former-commit-id: 22a2c082b8
This commit is contained in:
Bryan Kowal 2013-03-28 15:58:10 -05:00 • committed by Steve Harris
parent 879b3bc84e
commit 5034964bfa
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rpms/awips2.qpid/0.18/SOURCES/awips.patch
View file

@ -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

12
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
View file

@ -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-04 10:47:12.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 ----
@ -175,13 +175,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
@ -192,6 +190,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
!
@ -247,6 +246,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
! /awips2/qpid/lib/opt/qpid-broker-%{version}-sources.jar
! /awips2/qpid/lib/opt/qpid-broker-plugins-management-jmx-%{version}.jar
! /awips2/qpid/lib/opt/qpid-broker-plugins-management-jmx-%{version}-sources.jar
! %dir /awips2/qpid/log
! %defattr(755,awips,fxalpha,755)
! %dir /awips2/qpid/bin
! /awips2/qpid/bin/*