Commit graph

396 commits

Author SHA1 Message Date
Brian Clements
05b2a015cb Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: aa24bc6fce [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]
Former-commit-id: 5e7f2f0bdf
2013-11-19 17:53:39 -06:00
Steve Harris
e8c6af3060 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 65ebfc1a18 [formerly c333fe23736110bcb273aafd90ee6551ff7e921d]
Former-commit-id: c0bb3a1102
2013-11-19 15:45:06 -06:00
Steve Harris
ef6e0b0304 14.1.1-10 baseline
Former-commit-id: ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]
Former-commit-id: 9248695a1f
2013-11-19 16:40:25 -05:00
Steve Harris
d97edb20d1 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 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]
Former-commit-id: 2f0d53c9b2
2013-11-15 13:05:40 -06:00
Steve Harris
8c136f202d 14.1.1-9 baseline
Former-commit-id: f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]
Former-commit-id: 5a0a40e67c
2013-11-15 12:47:49 -05:00
Greg Armendariz
ce0a05242f Merge "Issue #2547 - fix RHEL6 nativeLib build in 14.1.1" into omaha_14.1.1
Former-commit-id: 83ac36721b [formerly bb6b56a08a09a01a7e6c5a256c16ac246214818a]
Former-commit-id: 3f6281fdbe
2013-11-13 15:30:55 -06:00
Steve Harris
bc45f3668b Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 0a37219d2a [formerly ebde6dc849a1ca9753f959423109186c836b4525]
Former-commit-id: 2e7a594d51
2013-11-13 11:34:17 -06:00
Steve Harris
0123596fd9 14.1.1-8 baseline
Former-commit-id: aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]
Former-commit-id: c7d36eb6ad
2013-11-13 12:32:17 -05:00
Bryan Kowal
48d5d8c3a1 Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]
Former-commit-id: e3639da703
2013-11-12 19:57:25 -06:00
Steve Harris
224d25217b Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 51ff88796c [formerly 2a95ac857fe960ed2147545731acc3c093bb73b5]
Former-commit-id: 3236374cc0
2013-11-07 11:37:25 -06:00
Steve Harris
155bc487ff 14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: 2d36bc2c1f [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]
Former-commit-id: b835dad501
2013-11-07 12:09:23 -05:00
Steve Harris
7c71117a50 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: c218866826 [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]
Former-commit-id: d8afc4c58c
2013-11-06 13:22:12 -06:00
Steve Harris
48df058653 14.1.1-7 baseline
Former-commit-id: 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 4fff87723f
2013-11-06 14:16:14 -05:00
Steve Harris
26da1ce793 14.1.1-6 baseline
Former-commit-id: 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]
Former-commit-id: 6067af4252
2013-11-06 14:08:33 -05:00
Bryan Kowal
0954490a5a 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 412bcb0f21b7385a170d14b3a88dd67c91a301a2]
Former-commit-id: c76c856340
2013-10-31 15:23:08 -05:00
Steve Harris
af2707389c 14.1.1-5 baseline
Former-commit-id: 877776a04c [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]
Former-commit-id: f4c53b02fa
2013-10-28 12:14:27 -04:00
Steve Harris
7590a56e0e 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: 99e3707c5b
2013-10-28 10:55:16 -04:00
Steve Harris
4a6a209aea 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 5739b4f832
2013-10-28 10:46:02 -04:00
Bryan Kowal
f892849313 Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: b7b11dc747 [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]
Former-commit-id: 9a472e1bbe
2013-10-16 12:54:58 -05:00
Bryan Kowal
53af4c7284 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 d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]
Former-commit-id: 8f14318bc7
2013-10-08 10:35:03 -05:00
Steve Harris
d89fbf73d9 13.5.2-8 baseline
Former-commit-id: 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]
Former-commit-id: 18325949fb
2013-10-04 11:30:03 -04:00
Bryan Kowal
f100a9c96a Issue #2432 - fix qpid build
Former-commit-id: 5db663c2ae [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]
Former-commit-id: 6736231873
2013-10-03 08:33:15 -05:00
Steve Harris
c6a4241c5b 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 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]
Former-commit-id: 84ad96f2e0
2013-10-01 15:34:01 -05:00
Steve Harris
02d6145782 13.5.2-7 baseline
Former-commit-id: 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]
Former-commit-id: a212c30bd7
2013-09-30 13:05:31 -04:00
Steve Harris
22cb9b98cd 13.5.2-6 baseline
Former-commit-id: 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]
Former-commit-id: 3837fbe670
2013-09-23 10:03:15 -04:00
Bryan Kowal
34f85b41c2 Issue #2334 - only free memory when we actually no longer care about its contents.
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4

Former-commit-id: 5e334a7b0e [formerly ac3d847501e41668f923f2ea40572c3894e8dc79]
Former-commit-id: 706920aed6
2013-09-19 17:32:08 -05:00
Bryan Kowal
8ce22ec91a Issue #2382 - fix qpid amqp path
Former-commit-id: b9f4e93687 [formerly 263ce6e82d1ecf3164961b599c2d4aac7d61f783]
Former-commit-id: b002df8a06
2013-09-17 17:51:43 -05:00
Steve Harris
6202bacae1 13.5.2-5 baseline
Former-commit-id: 0745317d53 [formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]
Former-commit-id: 67cceefe5d
2013-09-16 10:14:25 -04:00
Bryan Kowal
8d936cbfc3 Issue #2356 - update httpd-collaboration configuration for new httpd version and RHEL6
Former-commit-id: 21d395a914 [formerly 21ac850e9cf61f58a324f17ee687f50cda7c5804]
Former-commit-id: 646d61335d
2013-09-12 13:08:07 -05:00
Steve Harris
abed443b59 13.5.2-4 baseline
Former-commit-id: e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]
Former-commit-id: 58c6821427
2013-09-12 11:13:59 -04:00
Bryan Kowal
1a59a35500 Issue #2356 - pypies configuration updates and RHEL6 compatibility updates
Former-commit-id: 826d5e1c78 [formerly 2f1617632a5d24748e915066a7209839bca3f68a]
Former-commit-id: ca9597b66a
2013-09-11 17:34:19 -05:00
Bryan Kowal
aa88d48c30 Issue #2343 - resolve AWIPS II httpd depenency issue
Former-commit-id: 18756316ce [formerly b5081a38c6d90f47a625fde975f717ff4f63215f]
Former-commit-id: 9a370ca614
2013-09-10 17:04:35 -05:00
Bryan Kowal
4c1a283575 Issue #2163 - disable Java 7 build
Former-commit-id: f8c0886d52 [formerly eb2bba4ac4a43eff894a23f714c8b71fba20419c]
Former-commit-id: 101fd09211
2013-09-09 09:46:09 -05:00
Bryan Kowal
aa8eb47b95 Issue #2163 - convert the few remaining python rpms for 14.1.1; remove 13.6 feature modifications
Former-commit-id: 1adf764747 [formerly 4503735d3a05071878683f4a523d0dbd37e47ea3]
Former-commit-id: 79e88c19aa
2013-09-06 12:30:01 -05:00
Bryan Kowal
4670dcb9a7 Issue #2163 - fix Eclipse CDT metadata after merge
Former-commit-id: 351824fb85 [formerly 7502d12a78c68f56e33a41bae7b3346d195ad79f]
Former-commit-id: b88a13d3b5
2013-09-04 14:49:47 -05:00
Bryan Kowal
65bb1ec74b Issue #2163 - build dynamicserialize and ufpy with the redhat 6 build
Former-commit-id: a02d910023 [formerly 422e9b611535e9c20338041e0e1af62d38aab047]
Former-commit-id: 03cadc5aa9
2013-09-04 13:48:08 -05:00
Steve Harris
c666ac7283 13.5.2-3 baseline
Former-commit-id: 9fdd0e51a0 [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]
Former-commit-id: bae0a20b8e
2013-09-04 14:13:29 -04:00
Bryan Kowal
573aeaa238 Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
- Amend: restore mpe changes
- Amend: attempt rebase

Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90

Conflicts:

	nativeLib/edex_com/.cproject
	nativeLib/edex_notify/.cproject


Former-commit-id: 9db548db3e [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]
Former-commit-id: 326cae8be4
2013-09-04 10:08:21 -05:00
Steve Harris
0514103d87 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 b2674e0f626c643f0f81f865ea56351af2531c6a]
Former-commit-id: 7fe19d898c
2013-09-03 16:05:44 -05:00
Bryan Kowal
17b8ded082 Issue #2163 - RHEL6 14.1.1 build updates
Former-commit-id: 9415560b38 [formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]
Former-commit-id: ab3485a3ed
2013-09-03 13:46:19 -05:00
Steve Harris
5de6d566f0 13.5.2-2 baseline
Former-commit-id: 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]
Former-commit-id: 9e4bf0cf2e
2013-08-29 15:01:29 -04:00
Steve Harris
4ecb349ed8 13.5.2-1 baseline
Former-commit-id: 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]
Former-commit-id: 542b2c3d18
2013-08-28 09:43:48 -04:00
Steve Harris
2f9aa87a9f 13.5.1-18 baseline
Former-commit-id: afb34814dd [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]
Former-commit-id: 0a7acf96c7
2013-08-22 09:12:43 -04:00
Steve Harris
a192a3ebb1 13.5.1-17 baseline
Former-commit-id: 9dd7dc5d20 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]
Former-commit-id: b210c90245
2013-08-19 16:34:24 -04:00
Bryan Kowal
110fb14b91 Issue #2163 - build the java and awips2-common-base rpms
Former-commit-id: a3a5c799fc [formerly dcd9e70f94deda8a26e8df00ee9bc8ffc13abe43]
Former-commit-id: 7f8226d319
2013-08-15 15:40:18 -05:00
Bryan Kowal
50ab20be95 Issue #2163 - copy additional httpd source to the rpm SOURCES directory
Former-commit-id: 32f3e63bd5 [formerly b22a36d559ba6db6d1bd3d3c6785984353449a92]
Former-commit-id: 382cb87fa3
2013-08-15 15:40:05 -05:00
Bryan Kowal
6b305d4ea3 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 45adc2b64e9037273e1013631ba7a8fbef400c35]
Former-commit-id: c0458d512d
2013-08-15 15:39:37 -05:00
Bryan Kowal
5dffc9321c 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 0a735f5fe81d5329bc02a421ecc39a0974d48d37]
Former-commit-id: 8b51e353f1
2013-08-15 15:38:11 -05:00
Bryan Kowal
75c6d4ebf6 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 58a80b4b6d31d11b0ca722545bfd788a2feee488]
Former-commit-id: 94eacfc460
2013-08-15 15:30:05 -05:00
Bryan Kowal
1f5e92aac9 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 d0f73c3852e45ec7b2363b46c77a94d7b3a47143]
Former-commit-id: 36eca9bbfb
2013-08-15 15:25:52 -05:00