Commit graph

149 commits

Author SHA1 Message Date
Steve Harris
57355f5eaf Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/gridslice.so (took the master_14.1.1 version)

Former-commit-id: cc79281795 [formerly cc79281795 [formerly bf9379caa6a1f156997e21a271f27b86d7689ef0]]
Former-commit-id: ce7808a309
Former-commit-id: 7611759aaa
2013-12-04 16:48:47 -06:00
Steve Harris
234ca267ed 14.1.1-12 baseline
Former-commit-id: b24d9c80b0 [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: a3ec45a99f
Former-commit-id: 14421048af
2013-12-04 16:47:59 -05:00
Steve Harris
2e47683d4a Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 65d5f13864 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]
Former-commit-id: b98eb9ffa4
Former-commit-id: 6539b80ded
2013-12-02 16:17:38 -06:00
Steve Harris
f88a635a58 14.1.1-11 baseline
Former-commit-id: 70a6f1936e [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]
Former-commit-id: 71ae71c850
Former-commit-id: 5526a8999d
2013-12-02 17:10:10 -05:00
Bryan Kowal
e39159052c Increment python release for gridslice update.
Former-commit-id: 5f634773fe [formerly 5f634773fe [formerly 5c5a81739c64ff1ab7f8812be8ac9390e8d85588]]
Former-commit-id: c48a946923
Former-commit-id: f7438d4fa6
2013-11-20 17:40:18 -06:00
Brian Clements
a8c2c5870c Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: aa24bc6fce [formerly aa24bc6fce [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: 05b2a015cb
2013-11-19 17:53:39 -06:00
Steve Harris
70536b40ba Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 65ebfc1a18 [formerly 65ebfc1a18 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]]
Former-commit-id: c0bb3a1102
Former-commit-id: e8c6af3060
2013-11-19 15:45:06 -06:00
Steve Harris
36d788890a 14.1.1-10 baseline
Former-commit-id: ca0f65bd9a [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: 9248695a1f
Former-commit-id: ef6e0b0304
2013-11-19 16:40:25 -05:00
Steve Harris
7127a1e665 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)

Former-commit-id: 1015e180f1 [formerly 1015e180f1 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: d97edb20d1
2013-11-15 13:05:40 -06:00
Steve Harris
ea382798b5 14.1.1-9 baseline
Former-commit-id: f8f995b697 [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 8c136f202d
2013-11-15 12:47:49 -05:00
Steve Harris
1fdc64c7e7 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 0a37219d2a [formerly 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]]
Former-commit-id: 2e7a594d51
Former-commit-id: bc45f3668b
2013-11-13 11:34:17 -06:00
Steve Harris
42ece4fb6a 14.1.1-8 baseline
Former-commit-id: aa6c977e7b [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 0123596fd9
2013-11-13 12:32:17 -05:00
Steve Harris
ff548f8557 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: c218866826 [formerly c218866826 [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]
Former-commit-id: d8afc4c58c
Former-commit-id: 7c71117a50
2013-11-06 13:22:12 -06:00
Steve Harris
647b908fed 14.1.1-7 baseline
Former-commit-id: 3328e2dd1d [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 4fff87723f
Former-commit-id: 48df058653
2013-11-06 14:16:14 -05:00
Steve Harris
270c5f1a2d 14.1.1-6 baseline
Former-commit-id: 0cb2978c13 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]
Former-commit-id: 6067af4252
Former-commit-id: 26da1ce793
2013-11-06 14:08:33 -05:00
Bryan Kowal
6e08dc72c0 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	nativeLib/files.native/files.native.ecl
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.cots.g2clib/.project
	nativeLib/rary.cots.g2clib/g2_unpack3.c
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1

Former-commit-id: 665911b033 [formerly 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]
Former-commit-id: c76c856340
Former-commit-id: 0954490a5a
2013-10-31 15:23:08 -05:00
Steve Harris
92851705fc 14.1.1-5 baseline
Former-commit-id: 877776a04c [formerly 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]
Former-commit-id: f4c53b02fa
Former-commit-id: af2707389c
2013-10-28 12:14:27 -04:00
Steve Harris
98ae84da42 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
2013-10-28 10:55:16 -04:00
Steve Harris
8d67ffede4 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 5739b4f832
Former-commit-id: 4a6a209aea
2013-10-28 10:46:02 -04:00
Bryan Kowal
83c0c7e365 Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: b7b11dc747 [formerly b7b11dc747 [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]
Former-commit-id: 9a472e1bbe
Former-commit-id: f892849313
2013-10-16 12:54:58 -05:00
Bryan Kowal
5477a06781 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.qpid/0.18/deploy.builder/build.sh

Former-commit-id: 5eba3290c8 [formerly 5eba3290c8 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]
Former-commit-id: 8f14318bc7
Former-commit-id: 53af4c7284
2013-10-08 10:35:03 -05:00
Steve Harris
088eb89ca7 13.5.2-8 baseline
Former-commit-id: 94aa71fcd1 [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]
Former-commit-id: 18325949fb
Former-commit-id: d89fbf73d9
2013-10-04 11:30:03 -04:00
Bryan Kowal
751cd48248 Issue #2432 - fix qpid build
Former-commit-id: 5db663c2ae [formerly 5db663c2ae [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]
Former-commit-id: 6736231873
Former-commit-id: f100a9c96a
2013-10-03 08:33:15 -05:00
Steve Harris
9aa19b42b5 Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/python.site-packages/Installer.qpid/component.spec

kept the omaha_14.1.1 versions of the .so files


Former-commit-id: fc0cdf4996 [formerly fc0cdf4996 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]
Former-commit-id: 84ad96f2e0
Former-commit-id: c6a4241c5b
2013-10-01 15:34:01 -05:00
Steve Harris
f91cf37d43 13.5.2-6 baseline
Former-commit-id: 3821475d4e [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]
Former-commit-id: 3837fbe670
Former-commit-id: 22cb9b98cd
2013-09-23 10:03:15 -04:00
Bryan Kowal
efe4ee8b48 Issue #2334 - only free memory when we actually no longer care about its contents.
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4

Former-commit-id: 5e334a7b0e [formerly 5e334a7b0e [formerly ac3d847501e41668f923f2ea40572c3894e8dc79]]
Former-commit-id: 706920aed6
Former-commit-id: 34f85b41c2
2013-09-19 17:32:08 -05:00
Bryan Kowal
f10a1a5ac2 Issue #2382 - fix qpid amqp path
Former-commit-id: b9f4e93687 [formerly b9f4e93687 [formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]]
Former-commit-id: b002df8a06
Former-commit-id: 8ce22ec91a
2013-09-17 17:51:43 -05:00
Bryan Kowal
499377b332 Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
Former-commit-id: 21d395a914 [formerly 21d395a914 [formerly 21ac850e9cf61f58a324f17ee687f50cda7c5804]]
Former-commit-id: 646d61335d
Former-commit-id: 8d936cbfc3
2013-09-12 13:08:07 -05:00
Steve Harris
e2398f74e5 13.5.2-4 baseline
Former-commit-id: e3c935d48b [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: 58c6821427
Former-commit-id: abed443b59
2013-09-12 11:13:59 -04:00
Bryan Kowal
c2fbbdc727 Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
Former-commit-id: 826d5e1c78 [formerly 826d5e1c78 [formerly 2f1617632a5d24748e915066a7209839bca3f68a]]
Former-commit-id: ca9597b66a
Former-commit-id: 1a59a35500
2013-09-11 17:34:19 -05:00
Bryan Kowal
00696f6876 Issue #2343 - resolve AWIPS II httpd depenency issue
Former-commit-id: 18756316ce [formerly 18756316ce [formerly b5081a38c6d90f47a625fde975f717ff4f63215f]]
Former-commit-id: 9a370ca614
Former-commit-id: aa88d48c30
2013-09-10 17:04:35 -05:00
Bryan Kowal
2174e72247 Issue #2163 - disable Java 7 build
Former-commit-id: f8c0886d52 [formerly f8c0886d52 [formerly eb2bba4ac4a43eff894a23f714c8b71fba20419c]]
Former-commit-id: 101fd09211
Former-commit-id: 4c1a283575
2013-09-09 09:46:09 -05:00
Bryan Kowal
8dad5af165 Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: 1adf764747 [formerly 1adf764747 [formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]]
Former-commit-id: 79e88c19aa
Former-commit-id: aa8eb47b95
2013-09-06 12:30:01 -05:00
Bryan Kowal
bcb07a8f39 Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: a02d910023 [formerly a02d910023 [formerly 422e9b611535e9c20338041e0e1af62d38aab047]]
Former-commit-id: 03cadc5aa9
Former-commit-id: 65bb1ec74b
2013-09-04 13:48:08 -05:00
Steve Harris
482b9d838d Merge branch 'master_13.5.2' (13.5.2-2) into omaha_14.1.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	nativeLib/edexBridge/.cproject
	nativeLib/edexBridge/edexBridge.cpp
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/ld.so.conf.d/awips2-ldm-i386.conf
	rpms/awips2.qpid/0.18/SOURCES/awips.patch
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/build/common/rpms.sh

Former-commit-id: 18ee1d0092 [formerly 18ee1d0092 [formerly b2674e0f626c643f0f81f865ea56351af2531c6a]]
Former-commit-id: 7fe19d898c
Former-commit-id: 0514103d87
2013-09-03 16:05:44 -05:00
Bryan Kowal
6de01af674 Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: 9415560b38 [formerly 9415560b38 [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]
Former-commit-id: ab3485a3ed
Former-commit-id: 17b8ded082
2013-09-03 13:46:19 -05:00
Steve Harris
180e042b5d 13.5.2-2 baseline
Former-commit-id: 4a47fb97c5 [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 5de6d566f0
2013-08-29 15:01:29 -04:00
Steve Harris
4a9a91ce2e 13.5.2-1 baseline
Former-commit-id: 73dd0f166c [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]
Former-commit-id: 542b2c3d18
Former-commit-id: 4ecb349ed8
2013-08-28 09:43:48 -04:00
Steve Harris
cde7f2a59c 13.5.1-18 baseline
Former-commit-id: afb34814dd [formerly afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]
Former-commit-id: 0a7acf96c7
Former-commit-id: 2f9aa87a9f
2013-08-22 09:12:43 -04:00
Bryan Kowal
64fe4b6760 Issue #2163 - build the java and awips2-common-base rpms
Former-commit-id: a3a5c799fc [formerly a3a5c799fc [formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]]
Former-commit-id: 7f8226d319
Former-commit-id: 110fb14b91
2013-08-15 15:40:18 -05:00
Bryan Kowal
2205b4a02f Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: 32f3e63bd5 [formerly 32f3e63bd5 [formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]]
Former-commit-id: 382cb87fa3
Former-commit-id: 50ab20be95
2013-08-15 15:40:05 -05:00
Bryan Kowal
5b55bd8c72 Issue #2163 - remaining RHEL6 RPM changes
- Amend: update build.sh to build the full set of rpms

Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f

Conflicts:
	rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0

Former-commit-id: 19d80d96c3 [formerly 19d80d96c3 [formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]
Former-commit-id: c0458d512d
Former-commit-id: 6b305d4ea3
2013-08-15 15:39:37 -05:00
Bryan Kowal
9af6b44727 Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so

Former-commit-id: 0b4961e9b0 [formerly 0b4961e9b0 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]
Former-commit-id: 8b51e353f1
Former-commit-id: 5dffc9321c
2013-08-15 15:38:11 -05:00
Bryan Kowal
eab659f961 Issue #2163 - remaining rpms that are not dependent on nativeLib and cleanup
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

Former-commit-id: c1dab22fdb [formerly c1dab22fdb [formerly 58a80b4b6d31d11b0ca722545bfd788a2feee488]]
Former-commit-id: 94eacfc460
Former-commit-id: 75c6d4ebf6
2013-08-15 15:30:05 -05:00
Bryan Kowal
858a41c50d Issue #2163 - additional RHEL6 changes
- updated edexBridge to use the QPID 0.18 API
- awips2-ldm is now ready for RHEL 6
- the QPID 0.18 rpms now build for RHEL 6
- disabled the build of QPID 0.7
- awips2-qpid-lib (new to RHEL 6) is now ready


Former-commit-id: bbca63a8b8 [formerly bbca63a8b8 [formerly d0f73c3852e45ec7b2363b46c77a94d7b3a47143]]
Former-commit-id: 36eca9bbfb
Former-commit-id: 1f5e92aac9
2013-08-15 15:25:52 -05:00
Bryan Kowal
8068e7a7b2 Issue #2163 - pgadmin 3 updated for RHEL 6 compatibility
Former-commit-id: b08a9da804 [formerly b08a9da804 [formerly 417c6abe1a9d7f2df51ca38a8127d06e6a15dc7b]]
Former-commit-id: b1e4e77a13
Former-commit-id: c97d4f42b6
2013-08-15 15:25:43 -05:00
Bryan Kowal
44722e1106 Issue #2163 - updates to PostgreSQL, psql, httpd-pypies, and httpd-collaboration rpms
- httpd has been updated for compatibility


Former-commit-id: 91a84e57b5 [formerly 91a84e57b5 [formerly 8298c43aba3850753b67ff002f71e02e70b12fb0]]
Former-commit-id: c0614bc7d4
Former-commit-id: ba04336262
2013-08-15 15:25:02 -05:00
Bryan Kowal
5b451d09f1 Issue #2163 - 64-bit RHEL6 rpm conversion
- converted ant and added ant source to the repository (will no longer need to be retrieved from awipscm)
- converted Java
- converted the hdf5 tools and lzf is now built from source in addition to the hdf5 tools
- fixed python h5py to correctly include the built libsz libraries


Former-commit-id: 0bee225031 [formerly 0bee225031 [formerly ffc8892888976ee4b9d9edeb315b74edc5bb375f]]
Former-commit-id: e686f9bdda
Former-commit-id: e24b249d5b
2013-08-15 15:24:48 -05:00
Bryan Kowal
8331e2a16a Issue #2163 - python rpm specification and awips2-notification compatibility with RedHat 6
Former-commit-id: e3e596eb5d [formerly e3e596eb5d [formerly f2497ff20afefdcf67b0b4bcc17f9ee358d2288d]]
Former-commit-id: be011d3b92
Former-commit-id: 7b1615ba80
2013-08-15 15:24:11 -05:00
Greg Armendariz
b66fcc40a5 13.5.1-13 baseline
Former-commit-id: 29b823fee4 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 5577e686c1
Former-commit-id: 8bfac41add
2013-08-08 17:00:36 -04:00