Commit graph

492 commits

Author SHA1 Message Date
Steve Harris
0b0c0e247b Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: dbd8615fc6 [formerly b93c4d7cd0] [formerly dbd8615fc6 [formerly b93c4d7cd0] [formerly 47778131b0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]]
Former-commit-id: 47778131b0
Former-commit-id: 687b0848ee [formerly 079a007217]
Former-commit-id: bf0d783e52
2013-11-07 11:32:42 -06:00
Steve Harris
e8e1307ee0 13.5.3-5 baseline
Former-commit-id: 5b3cd9befd [formerly 06b5e0e0ec] [formerly 5b3cd9befd [formerly 06b5e0e0ec] [formerly f175680b89 [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]]
Former-commit-id: f175680b89
Former-commit-id: d9efe087e5 [formerly 31b57882cb]
Former-commit-id: b816e9e555
2013-11-07 12:22:32 -05:00
Steve Harris
878d57675c Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: cdb514cb5c [formerly c218866826] [formerly cdb514cb5c [formerly c218866826] [formerly d8afc4c58c [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]]
Former-commit-id: d8afc4c58c
Former-commit-id: a48b85a0b2 [formerly 7c71117a50]
Former-commit-id: ff548f8557
2013-11-06 13:22:12 -06:00
Steve Harris
cfb3194426 14.1.1-7 baseline
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
2013-11-06 14:16:14 -05:00
Steve Harris
0aa90a7855 14.1.1-6 baseline
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793]
Former-commit-id: 270c5f1a2d
2013-11-06 14:08:33 -05:00
Bryan Kowal
2c31c6f4ab Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh

Former-commit-id: d73aaf9753 [formerly 4bad21e6cd] [formerly d73aaf9753 [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]
Former-commit-id: 3255bf3861
Former-commit-id: 400b4a1328 [formerly 76726372e5]
Former-commit-id: 748ab480fb
2013-11-05 19:03:22 -06:00
Greg Armendariz
bb2f387371 Issue #2520 - Update rpm query calls
Change-Id: I2fc1ac0fa8b9e199149fd2db3ab25bac9ba90024

Former-commit-id: 67ae7d2244 [formerly 62324b5194] [formerly 67ae7d2244 [formerly 62324b5194] [formerly b078f57dc7 [formerly 95c604d179e14d110e0782a5a911f8b6d5104941]]]
Former-commit-id: b078f57dc7
Former-commit-id: 9959fe56ae [formerly f125f963b3]
Former-commit-id: 2c581c0c73
2013-11-05 13:30:01 -06:00
Steve Harris
4d1b869ee4 Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 569ecb35d5 [formerly 3c862170db] [formerly 569ecb35d5 [formerly 3c862170db] [formerly 18609de83d [formerly dbbf326f4fbfb3e07c97f6a7c380fa7e37544b72]]]
Former-commit-id: 18609de83d
Former-commit-id: 7031baf4ef [formerly 5f71d7795f]
Former-commit-id: da5e3ea0a9
2013-11-01 13:23:28 -05:00
Steve Harris
90f27a16c9 13.5.3-4 baseline
Former-commit-id: 0ee69293ec [formerly 8aeae1c481] [formerly 0ee69293ec [formerly 8aeae1c481] [formerly da7d1ce05e [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]
Former-commit-id: da7d1ce05e
Former-commit-id: 7454b37d59 [formerly b8d3fd62d0]
Former-commit-id: 8f9b121f90
2013-11-01 14:20:00 -04:00
Bryan Kowal
f5bb76a01e Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
2013-10-31 15:34:46 -05:00
Bryan Kowal
731efe0fb6 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: 4d7a4aefec [formerly 665911b033] [formerly 4d7a4aefec [formerly 665911b033] [formerly c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]
Former-commit-id: c76c856340
Former-commit-id: 7a83214b1c [formerly 0954490a5a]
Former-commit-id: 6e08dc72c0
2013-10-31 15:23:08 -05:00
Steve Harris
3f27e1cc23 Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 7768ee1c36 [formerly 2257eb5ddd] [formerly 7768ee1c36 [formerly 2257eb5ddd] [formerly 855b444073 [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]
Former-commit-id: 855b444073
Former-commit-id: c953a6574d [formerly 83dc6d8e2a]
Former-commit-id: 60a5ddc88f
2013-10-31 11:58:04 -05:00
Steve Harris
ef72863e6f 13.5.3-3 baseline
Former-commit-id: 883ad32443 [formerly baa036cd62] [formerly 883ad32443 [formerly baa036cd62] [formerly 1503847a4b [formerly c261e0753eb106a2912314056a1b4903695750c5]]]
Former-commit-id: 1503847a4b
Former-commit-id: a58b825dde [formerly 6b879b2465]
Former-commit-id: 5be6e21405
2013-10-31 12:52:07 -04:00
Bryan Kowal
abe6b1151f Re-enable the build of the awips2 rpm.
Former-commit-id: 16e83e3455 [formerly 40e8a94235] [formerly 16e83e3455 [formerly 40e8a94235] [formerly 326144970c [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]]]
Former-commit-id: 326144970c
Former-commit-id: 897b7fbd27 [formerly 1c0a469975]
Former-commit-id: 8bd4b5dd9a
2013-10-30 15:24:01 -05:00
Greg Armendariz
c846280439 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 0daf07742e [formerly f6d98d6317] [formerly 0daf07742e [formerly f6d98d6317] [formerly 64dd62005b [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]
Former-commit-id: 64dd62005b
Former-commit-id: 5cf091c499 [formerly 4fb0e0bd2f]
Former-commit-id: eefcbf7dcb
2013-10-30 14:52:16 -05:00
Steve Harris
6da47cfbdd Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 5aac54b9f9 [formerly 0ab03f2796] [formerly 5aac54b9f9 [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]
Former-commit-id: 83d2194a5a
Former-commit-id: 771be074c0 [formerly 0efff318b8]
Former-commit-id: f5fc091e48
2013-10-30 12:36:53 -05:00
Steve Harris
e90722d781 13.5.3-2 baseline
Former-commit-id: c6d951b390 [formerly 055783655b] [formerly c6d951b390 [formerly 055783655b] [formerly 6d85d944a6 [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]
Former-commit-id: 6d85d944a6
Former-commit-id: 0c17777164 [formerly aef0e828d2]
Former-commit-id: 1cc13c9992
2013-10-30 12:53:25 -04:00
Bryan Kowal
dbe9ed1433 Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: e4e2c8c796 [formerly eb4c27003f] [formerly e4e2c8c796 [formerly eb4c27003f] [formerly b082ea89c5 [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]]
Former-commit-id: b082ea89c5
Former-commit-id: 63324cda6a [formerly 428dd993d9]
Former-commit-id: 4789797de5
2013-10-30 09:23:55 -05:00
Bryan Kowal
fba7e48970 Issue #2268 - fix CAVE installation error
Former-commit-id: 203c5d7288 [formerly 7772aca092] [formerly 203c5d7288 [formerly 7772aca092] [formerly 5bc115c56c [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]]]
Former-commit-id: 5bc115c56c
Former-commit-id: a89499f399 [formerly a34d7b254f]
Former-commit-id: 893a2cf334
2013-10-29 11:44:48 -05:00
Steve Harris
f49a22bae2 Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: f04be86698 [formerly 602f138493] [formerly f04be86698 [formerly 602f138493] [formerly 972339d60f [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]
Former-commit-id: 972339d60f
Former-commit-id: a444c93ee7 [formerly 4c0599bae8]
Former-commit-id: 0bf9020c49
2013-10-28 14:39:22 -05:00
Steve Harris
09eee9a31a 14.1.1-5 baseline
Former-commit-id: 933e7395ac [formerly 877776a04c] [formerly 933e7395ac [formerly 877776a04c] [formerly f4c53b02fa [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]]
Former-commit-id: f4c53b02fa
Former-commit-id: 3b738baba8 [formerly af2707389c]
Former-commit-id: 92851705fc
2013-10-28 12:14:27 -04:00
Steve Harris
da4589ec2b 14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
2013-10-28 10:55:16 -04:00
Steve Harris
472c0a1a5e 14.1.1-3 baseline
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67 [formerly 4a6a209aea]
Former-commit-id: 8d67ffede4
2013-10-28 10:46:02 -04:00
Steve Harris
0e99e713e6 13.5.3-1 baseline
Former-commit-id: 059083170d [formerly 1d8a2026f6] [formerly 059083170d [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]
Former-commit-id: 30f65c2858
Former-commit-id: 06f5dcf801 [formerly 9df3027bf0]
Former-commit-id: 43610e510c
2013-10-28 10:30:57 -04:00
Steve Harris
2864f20285 Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java

Former-commit-id: 64062fa355 [formerly 702b66ee52] [formerly 64062fa355 [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 6aab62b7b9 [formerly 38e4e0c572]
Former-commit-id: 3a2a83bc4b
2013-10-25 10:51:42 -05:00
Steve Harris
c71631dd28 13.5.2-13 baseline
Former-commit-id: ba50a26e70 [formerly 2100a15013] [formerly ba50a26e70 [formerly 2100a15013] [formerly e7b1702032 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]
Former-commit-id: e7b1702032
Former-commit-id: 96c50ba394 [formerly bc3eff506b]
Former-commit-id: 6bff2d159f
2013-10-25 10:06:56 -04:00
Steve Harris
f97c128cc8 13.5.2-12 baseline
Former-commit-id: e2b9baf2ed [formerly a532896473] [formerly e2b9baf2ed [formerly a532896473] [formerly bcb531e671 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]
Former-commit-id: bcb531e671
Former-commit-id: 15d9848170 [formerly b70ec5732d]
Former-commit-id: 248e79aa2f
2013-10-25 09:59:15 -04:00
Steve Harris
d63a07d248 13.5.2-11 baseline
Former-commit-id: 9215a213a1 [formerly b820a28276] [formerly 9215a213a1 [formerly b820a28276] [formerly cbfde2f52a [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]
Former-commit-id: cbfde2f52a
Former-commit-id: ecad06c80d [formerly c1473d8a72]
Former-commit-id: 49b1168f5e
2013-10-25 09:45:58 -04:00
Bryan Kowal
15cb18c19f Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 2ad7db4f5d [formerly b7b11dc747] [formerly 2ad7db4f5d [formerly b7b11dc747] [formerly 9a472e1bbe [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]]
Former-commit-id: 9a472e1bbe
Former-commit-id: b1bdf0dbc5 [formerly f892849313]
Former-commit-id: 83c0c7e365
2013-10-16 12:54:58 -05:00
Bryan Kowal
ab3041ff05 Issue #2297 - fix 14.2.1 CAVE build.
Former-commit-id: 476c19464d [formerly 8b3f402dd8] [formerly 476c19464d [formerly 8b3f402dd8] [formerly de09a30a4d [formerly d71631f5cabae72a1ceb30f36ce574b2559c235d]]]
Former-commit-id: de09a30a4d
Former-commit-id: b8d164bb71 [formerly 3eeefe9e56]
Former-commit-id: c7a890d8c2
2013-10-15 16:07:23 -05:00
Bryan Kowal
5a8bfe3756 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 3f4263fa07 [formerly a929dec887] [formerly 3f4263fa07 [formerly a929dec887] [formerly c13018301e [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]]
Former-commit-id: c13018301e
Former-commit-id: f731c424bb [formerly 0a06af1fdd]
Former-commit-id: c846630ac7
2013-10-14 17:58:22 -05:00
Greg Armendariz
57728ed486 Merge "Issue #2297 - fix 14.2.1 qpid build" into development
Former-commit-id: 14d90768e0 [formerly aa0d3bdab4] [formerly 14d90768e0 [formerly aa0d3bdab4] [formerly 01a1ada89b [formerly 6a11a118261a0cbad93933d99d6a89187c831a02]]]
Former-commit-id: 01a1ada89b
Former-commit-id: f53973e153 [formerly 0d066c50cd]
Former-commit-id: 0d62d1886c
2013-10-14 09:08:05 -05:00
Bryan Kowal
a0c583ceb6 Issue #2402 - re-compile 32-bit grib2.so
Former-commit-id: 410b9b6669 [formerly 05954f89b8] [formerly 410b9b6669 [formerly 05954f89b8] [formerly 3eee9edb58 [formerly e70561d259082645390f95df823ad4583aea8bbe]]]
Former-commit-id: 3eee9edb58
Former-commit-id: c79a66452b [formerly c7381d7ce2]
Former-commit-id: 8553bbc350
2013-10-10 12:49:49 -05:00
Bryan Kowal
f452978591 Issue #2297 - fix 14.2.1 qpid build
Former-commit-id: a8dfd1ef01 [formerly 9d7ad6908a] [formerly a8dfd1ef01 [formerly 9d7ad6908a] [formerly 584d8b2ae4 [formerly 7863a68ae1c67188450ab7c3a9cc2c912533300c]]]
Former-commit-id: 584d8b2ae4
Former-commit-id: a4ea738a10 [formerly be0d60134b]
Former-commit-id: e12cae21f4
2013-10-10 11:21:11 -05:00
Bryan Kowal
53a110866d Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: 585f63e88c [formerly 9c3c123631] [formerly 585f63e88c [formerly 9c3c123631] [formerly bb9b1e4279 [formerly ae2923791512c7488805c19a773390ef1de5150b]]]
Former-commit-id: bb9b1e4279
Former-commit-id: 80127ae62d [formerly 9d57206173]
Former-commit-id: 49c19e4bb6
2013-10-09 18:38:58 -05:00
Bryan Kowal
d65db49046 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 82559064ef [formerly 37d1dd492b] [formerly 82559064ef [formerly 37d1dd492b] [formerly 2b26c4c242 [formerly 2e6b76af19b308392e90dfee4c950200ec5c2560]]]
Former-commit-id: 2b26c4c242
Former-commit-id: 68434c23ef [formerly daeb4b7ecb]
Former-commit-id: f31f6ea11d
2013-10-09 17:07:10 -05:00
Richard Peter
bb0bd3fe2c Merge branch 'development' into development_on_RHEL6
Conflicts:
	edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
	edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	rpms/awips2.cave/Installer.cave-feature/component.spec

Former-commit-id: 62b322c18d [formerly 1a664aed21] [formerly 62b322c18d [formerly 1a664aed21] [formerly c0643db0ba [formerly fee86c220c12c09c714245fa8666bc08f4f9775b]]]
Former-commit-id: c0643db0ba
Former-commit-id: 1c74c3cbde [formerly ecba2f7317]
Former-commit-id: 93c2c93969
2013-10-09 13:14:06 -05:00
Ben Steffensmeier
870631902b Issue #2402 Modify grib decoder to work on file extents.
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9

Former-commit-id: c896c9bf30 [formerly 7d2b48de48] [formerly c896c9bf30 [formerly 7d2b48de48] [formerly 2b089b0848 [formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]]]
Former-commit-id: 2b089b0848
Former-commit-id: 7c6a89b623 [formerly 633a075052]
Former-commit-id: 839c602669
2013-10-09 12:50:02 -05:00
Bryan Kowal
93dbbc2321 Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
	cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
	edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
	edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: bb5ef114d1 [formerly aa4ea792c1] [formerly bb5ef114d1 [formerly aa4ea792c1] [formerly 542f5f2349 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]
Former-commit-id: 542f5f2349
Former-commit-id: de61382dc7 [formerly 5d5ccb7599]
Former-commit-id: 86f7af5968
2013-10-08 14:44:38 -05:00
Richard Peter
bc32641181 Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml

Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371

Former-commit-id: f141fdd5ab [formerly 9adbe25ceb] [formerly f141fdd5ab [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]
Former-commit-id: b6395cc834
Former-commit-id: 0e7dccd18f [formerly 3abe952ca0]
Former-commit-id: 1895c9f914
2013-10-08 10:59:50 -05:00
Bryan Kowal
b8c2ece19c Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	rpms/awips2.qpid/0.18/deploy.builder/build.sh

Former-commit-id: 96c800f3f4 [formerly 5eba3290c8] [formerly 96c800f3f4 [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]
Former-commit-id: 8f14318bc7
Former-commit-id: 72ed6c5f7a [formerly 53af4c7284]
Former-commit-id: 5477a06781
2013-10-08 10:35:03 -05:00
Richard Peter
d321c61259 Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf

Former-commit-id: f0c05dc6d8 [formerly 31c87ab01e] [formerly f0c05dc6d8 [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]
Former-commit-id: d9eae3ea28
Former-commit-id: 94d0913bd9 [formerly f4b47dda50]
Former-commit-id: 33b4f0c247
2013-10-08 09:45:27 -05:00
Bryan Kowal
f7c5884c21 Issue #2033 - deploy the CAVE localization to the etc directory at installation time
Change-Id: I899b89c12d2bbe2fb739ba15b3bafbc9855e6102

Former-commit-id: 5f72ab9b4e [formerly 73ccd8245d] [formerly 5f72ab9b4e [formerly 73ccd8245d] [formerly c3a65f9882 [formerly 40d1633bb60c1d9aefcc79022158a66b50cca054]]]
Former-commit-id: c3a65f9882
Former-commit-id: 0f9d525ac1 [formerly e27bfa7c27]
Former-commit-id: 2f2c57b448
2013-10-07 12:22:50 -05:00
Steve Harris
e1f7463a41 13.5.2-8 baseline
Former-commit-id: 8ba7d392d6 [formerly 94aa71fcd1] [formerly 8ba7d392d6 [formerly 94aa71fcd1] [formerly 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 21b84f0290 [formerly d89fbf73d9]
Former-commit-id: 088eb89ca7
2013-10-04 11:30:03 -04:00
Bryan Kowal
07a882ac48 Revert "Issue #2033 - pde and rpm build updates"
Undo copying localization into etc at build time.

This reverts commit 2cda5c37636a512f1a9ef3de04b0dac3ca31e120 [formerly 9a77e3553a] [formerly 33a9270304 [formerly 6023c61bca] [formerly 33a9270304 [formerly 6023c61bca] [formerly 9a77e3553a [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]].


Former-commit-id: a75ed2b079 [formerly bb2e914c00] [formerly a75ed2b079 [formerly bb2e914c00] [formerly 9d47e7565d [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]]]
Former-commit-id: 9d47e7565d
Former-commit-id: d4eba48f94 [formerly 4d08d7a1c3]
Former-commit-id: 2f6791dc19
2013-10-04 09:47:59 -05:00
Steve Harris
a9d0caa9d7 Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.java/1.6/component.spec

Former-commit-id: 96f30b4793 [formerly 8622cc6efa] [formerly 96f30b4793 [formerly 8622cc6efa] [formerly df206f83bb [formerly d1246136b73673acd22df53fee02adbd51022b4b]]]
Former-commit-id: df206f83bb
Former-commit-id: 00cc9bc926 [formerly 05ac206277]
Former-commit-id: b225dffea0
2013-10-03 16:04:21 -05:00
Bryan Kowal
16efd625bb Issue #2423 - Java 7 Revision 40 for Linux
Former-commit-id: ef93741056 [formerly 3b1f089cbd] [formerly ef93741056 [formerly 3b1f089cbd] [formerly 26f787ac83 [formerly 665399b4e10d7d001edc2533b29324da48b78aa9]]]
Former-commit-id: 26f787ac83
Former-commit-id: 2e9836e506 [formerly 429c534da0]
Former-commit-id: 9f7222a1b3
2013-10-03 11:54:23 -05:00
Bryan Kowal
e874f182ef Issue #2432 - fix qpid build
Former-commit-id: fdf31a8a6e [formerly 5db663c2ae] [formerly fdf31a8a6e [formerly 5db663c2ae] [formerly 6736231873 [formerly ef1e8ac70bec7c9d242c5aed0cf07acaaf2bb31b]]]
Former-commit-id: 6736231873
Former-commit-id: bd93d164c7 [formerly f100a9c96a]
Former-commit-id: 751cd48248
2013-10-03 08:33:15 -05:00
Bryan Kowal
a249b45111 Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: efd377f12f [formerly 61527c0b80] [formerly efd377f12f [formerly 61527c0b80] [formerly 87087a5ea4 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]
Former-commit-id: 87087a5ea4
Former-commit-id: af4b729522 [formerly fe4e9ca3f8]
Former-commit-id: 297ee050ca
2013-10-02 18:41:11 -05:00
Steve Harris
160a5819f9 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: 59f753ee0d [formerly fc0cdf4996] [formerly 59f753ee0d [formerly fc0cdf4996] [formerly 84ad96f2e0 [formerly 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3]]]
Former-commit-id: 84ad96f2e0
Former-commit-id: c2fa80310e [formerly c6a4241c5b]
Former-commit-id: 9aa19b42b5
2013-10-01 15:34:01 -05:00