Commit graph

2024 commits

Author SHA1 Message Date
Steve Harris
c3ac33582f 13.5.3-4 baseline
Former-commit-id: 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly da7d1ce05e [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]]
Former-commit-id: da7d1ce05e
Former-commit-id: a4cc3f0bf6 [formerly 7454b37d59] [formerly 7369078223f22949c985fdf82f677dcb829640f5 [formerly b8d3fd62d0]]
Former-commit-id: 0df02f675ff87a29fb8942ecbcc9ef833301020e [formerly 8f9b121f90]
Former-commit-id: 90f27a16c9
2013-11-01 14:20:00 -04:00
Nate Jensen
a7846af6d0 Issue #2361 remove XML annotations from TAF and CCFP
Former-commit-id: bc61b966b0 [formerly c52c207c80] [formerly 942936e815] [formerly bc61b966b0 [formerly c52c207c80] [formerly 942936e815] [formerly cd49daccf9 [formerly 942936e815 [formerly 2587a9b13ec6576007081a165f6042dd5a82b7eb]]]]
Former-commit-id: cd49daccf9
Former-commit-id: 97ddb715af [formerly a6cfeb5626] [formerly 88bb0c0a4afa8b6b966ef66dfd8c75302ba2c2cb [formerly d935c4f547]]
Former-commit-id: c241139fa71f916cb26400e739096ef94c514689 [formerly 6dafd588d0]
Former-commit-id: 1d8522d45d
2013-11-01 13:19:28 -05:00
Nate Jensen
66f7549b72 Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9

Former-commit-id: 37eaab4490 [formerly 2e28d72fb7] [formerly 2413c854c0] [formerly 37eaab4490 [formerly 2e28d72fb7] [formerly 2413c854c0] [formerly 5efd1b7218 [formerly 2413c854c0 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]]]
Former-commit-id: 5efd1b7218
Former-commit-id: a9a4963f09 [formerly 3753b45c0c] [formerly c4286e81e6c3ef5daac753ed4597591ab4297c22 [formerly f4cdcb2fae]]
Former-commit-id: 86c0b5067bdcc4d17f2ccdab389fb0d29eb56085 [formerly 96cd52250a]
Former-commit-id: 2ee7f2e275
2013-11-01 12:09:43 -05:00
Greg Armendariz
6f74a2427d Issue #2509 - Fix merge issue
Former-commit-id: 7ab7156b61 [formerly a281147055] [formerly b4c3337ffd] [formerly 7ab7156b61 [formerly a281147055] [formerly b4c3337ffd] [formerly fadf9346d2 [formerly b4c3337ffd [formerly d742b452ab114935b76cb9097db7d6a08651bb2e]]]]
Former-commit-id: fadf9346d2
Former-commit-id: cbf9f6fe6b [formerly 1561f091e3] [formerly 4f461d5d2d81a6c8c37fb34ea3a2a847bafb9adc [formerly d530a65ee3]]
Former-commit-id: 1bcfa976fd51ce58285b7672804c82c121a4a90f [formerly c90f8115f3]
Former-commit-id: 3061eb1bc0
2013-11-01 10:31:08 -05:00
Dave Hladky
eba1c80d0b Issue #2292 Stopped subscriptions from checking against themselves. This prevented subscriptions from being updatable.
Former-commit-id: 07c70d72cc [formerly 1594cc6a72] [formerly e5896397f6] [formerly 07c70d72cc [formerly 1594cc6a72] [formerly e5896397f6] [formerly 422dabf3eb [formerly e5896397f6 [formerly 6edfeb94cfb14785d68d90b41fc636faa2ece074]]]]
Former-commit-id: 422dabf3eb
Former-commit-id: fd96474a8b [formerly d589bced40] [formerly c56edc32fb745fdee96b63e71aaf76cca3d28fa8 [formerly ca1f2fc340]]
Former-commit-id: b5130373dbabc32643d34913298bac79e8bc89eb [formerly 448d13c266]
Former-commit-id: b8b78939e3
2013-11-01 10:23:56 -05:00
Benjamin Phillippe
32725adb31 Issue #1538 Moved data delivery specific web services out of registry plugins
-- Added registry federation admin page
            -- Made registry service clients non-static

Change-Id: I9672f11b4886019dcd8834b4bae417a0aa4809ad

Former-commit-id: 311fa32377 [formerly 98b56cf02a] [formerly a7e53870fb] [formerly 311fa32377 [formerly 98b56cf02a] [formerly a7e53870fb] [formerly d8de923f8b [formerly a7e53870fb [formerly 0a67c8d68548ed8daa76d782ca3213956b984795]]]]
Former-commit-id: d8de923f8b
Former-commit-id: e9b49b288f [formerly 7cb19682c1] [formerly 628fd3115dbabe88f9d202b5257352679e5c521b [formerly 221d197c01]]
Former-commit-id: 8e5cdd4d72fc495f2978e8dd7305962714cf62b8 [formerly 73c53ed846]
Former-commit-id: c3f684e7fb
2013-11-01 09:20:00 -05:00
Dave Hladky
128a7c3854 Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
Change-Id: I75269bad24731990720d30683ebf5f27344661f3

Former-commit-id: f79ba58a3a [formerly 0eba787d3e] [formerly 4227f3a59f] [formerly f79ba58a3a [formerly 0eba787d3e] [formerly 4227f3a59f] [formerly 9161962813 [formerly 4227f3a59f [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]]]
Former-commit-id: 9161962813
Former-commit-id: ea17726866 [formerly ba31efaf03] [formerly cc3ebf4fc7bd5a908a51ab6d7ccbfde59ee5656b [formerly d55d68fe5a]]
Former-commit-id: 94e7a513a18ed9462a0201d4dece78d3907851ba [formerly 85003bf022]
Former-commit-id: e30272c56b
2013-11-01 08:23:16 -05:00
Nate Jensen
3efcc68e75 Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 685c6034b2 [formerly 6ed6df6ed0] [formerly 1d11102b6e40b4f27646f1cf7aba32281be912e3 [formerly 47fc100053]]
Former-commit-id: 3b5342860c273add5e1cf001ce17db765d7f54d6 [formerly 6164feb2da]
Former-commit-id: 3858434dc3
2013-10-31 18:11:13 -05:00
Bryan Kowal
7cd17382dc Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Former-commit-id: fd5a5096de [formerly 04bcd7e6dc] [formerly 49422aea62] [formerly fd5a5096de [formerly 04bcd7e6dc] [formerly 49422aea62] [formerly d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]]
Former-commit-id: d08a652e23
Former-commit-id: 874bd8aa36 [formerly d53ec9c750] [formerly 2f7241bd44af27a962760419963b91198396fa99 [formerly adb62df96a]]
Former-commit-id: 7bb259e517c1ed9b9182d1d9842aa0cc9ad29f26 [formerly 70d4374ce8]
Former-commit-id: 0d8ab84604
2013-10-31 15:43:29 -05:00
Bryan Kowal
6a0ddf11e4 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: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
2013-10-31 15:34:46 -05:00
Ben Steffensmeier
a15afe6f6c Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]]
Former-commit-id: fdeff81da2
Former-commit-id: d27369f59b [formerly 89c999410e] [formerly 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]]
Former-commit-id: 8474d807f157d7a0e7fc99090b358e9a371bb8fe [formerly a0e805ded6]
Former-commit-id: a92af46f59
2013-10-31 14:06:37 -05:00
Ron Anderson
2b4809ead7 Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c

Former-commit-id: f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]]
Former-commit-id: 42e924e021
Former-commit-id: dd1b50d116 [formerly 2f23072e41] [formerly e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0]]
Former-commit-id: 6420457c498cf2f6184538b3831ba133f0623c15 [formerly e3a0440825]
Former-commit-id: 49ea9c0444
2013-10-31 14:04:55 -05:00
Steve Harris
f07e5b778e Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 855b444073 [formerly 2257eb5ddd [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]]
Former-commit-id: 855b444073
Former-commit-id: 23a1f33d89 [formerly c953a6574d] [formerly 2c8c708ed1c375e99805b56ce3ded641d901d6ca [formerly 83dc6d8e2a]]
Former-commit-id: bee869e597b8fb94bb5d2c695cae5fb58d860aab [formerly 60a5ddc88f]
Former-commit-id: 3f27e1cc23
2013-10-31 11:58:04 -05:00
Steve Harris
4d2a15c959 13.5.3-3 baseline
Former-commit-id: 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]]]
Former-commit-id: 1503847a4b
Former-commit-id: 3a5911368f [formerly a58b825dde] [formerly e27f6359a046d1d0047ec0fc1c24c9d171c5bf82 [formerly 6b879b2465]]
Former-commit-id: 00b390ce880010abcc3167a5427b564527ba940c [formerly 5be6e21405]
Former-commit-id: ef72863e6f
2013-10-31 12:52:07 -04:00
Richard Peter
2baf599758 Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]]
Former-commit-id: b482eb2b48
Former-commit-id: 7b0ad6bacc [formerly fca3d73aa7] [formerly f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134]]
Former-commit-id: 1019515624c081b6c221e0d3722489ce94b4ad06 [formerly 300f907c46]
Former-commit-id: ab890140fb
2013-10-31 11:46:25 -05:00
Mike Duff
e48beadbc6 Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments

Change-Id: I33df9cc7e368778943e25420d18b343781304c7a

Former-commit-id: fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]]
Former-commit-id: 3fc811102e
Former-commit-id: ce2afdf1b3 [formerly b0c54d7c17] [formerly ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461]]
Former-commit-id: ece01cf9cf7d6b3d925c922f4d1d6fe84edf0f17 [formerly 26ca1b4d72]
Former-commit-id: 5ff3fe2791
2013-10-31 09:22:50 -05:00
Greg Armendariz
a7d7c6447f Merge branch 'development' into development_on_RHEL6
Former-commit-id: 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]]
Former-commit-id: 64dd62005b
Former-commit-id: 83262b6cc4 [formerly 5cf091c499] [formerly 3a7bea98c42e7d77a7480bbc262fa233cb1f6a6b [formerly 4fb0e0bd2f]]
Former-commit-id: cc39f166545faa38560a0e3c8a7dafc13408d077 [formerly eefcbf7dcb]
Former-commit-id: c846280439
2013-10-30 14:52:16 -05:00
Steve Harris
071a47944f 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: 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 0ab03f2796 [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]]
Former-commit-id: 83d2194a5a
Former-commit-id: eff76c3566 [formerly 771be074c0] [formerly f7cdd9e73c5d19a1d50e670a5eeceaa5bc626e90 [formerly 0efff318b8]]
Former-commit-id: a4fea6a1d532840bbb0cc77ad3e807e6be10e9b3 [formerly f5fc091e48]
Former-commit-id: 6da47cfbdd
2013-10-30 12:36:53 -05:00
Steve Harris
e979d6caa1 13.5.3-2 baseline
Former-commit-id: 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]]
Former-commit-id: 6d85d944a6
Former-commit-id: fef629ce26 [formerly 0c17777164] [formerly 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2]]
Former-commit-id: 33aa78b83a8657172de9ca0d0ef491a27006efe6 [formerly 1cc13c9992]
Former-commit-id: e90722d781
2013-10-30 12:53:25 -04:00
David Gillingham
c7e966b43e Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.

Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c

Former-commit-id: ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 2ddacaea30 [formerly 68b0b2e3db] [formerly 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124]]
Former-commit-id: 88b3c16c68fc66755ed20e6b4157548ca26d3124 [formerly eef2c93d6c]
Former-commit-id: 75acd532a1
2013-10-30 11:34:46 -05:00
Nate Jensen
86eed97dac Merge "Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code" into development
Former-commit-id: 79eb4d400a [formerly 411b909107] [formerly d92bd5b69a] [formerly 79eb4d400a [formerly 411b909107] [formerly d92bd5b69a] [formerly 62a5739feb [formerly d92bd5b69a [formerly 05de1d88cdc4841483864a623346ad16b015d395]]]]
Former-commit-id: 62a5739feb
Former-commit-id: 937981d2f9 [formerly 90d99fe627] [formerly 9bd9983d48f00002ef7fd475ecf0bf5a3403c4c1 [formerly 5c4d8b4310]]
Former-commit-id: 5bb580041f80eda58be2a045874066d9241a9953 [formerly 68658bf885]
Former-commit-id: fdb54d5810
2013-10-30 11:28:58 -05:00
Brad Gonzales
5442f43210 Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733

Former-commit-id: 95afe3cd1e [formerly 433ee7d942] [formerly 011c42b806] [formerly 95afe3cd1e [formerly 433ee7d942] [formerly 011c42b806] [formerly 057ba113b5 [formerly 011c42b806 [formerly 36571478911119efe7195d51f6c820d6e745ccee]]]]
Former-commit-id: 057ba113b5
Former-commit-id: d1d0dc770e [formerly 3c0bd6db16] [formerly 65615958da30edfa31cf83debed3017ef1f056db [formerly 9325d477a9]]
Former-commit-id: 4c8ee2bdc7d28f6fb8e681a48e9619289c46c73b [formerly 759c3b2cef]
Former-commit-id: 7be6923520
2013-10-29 17:04:00 -05:00
Brad Gonzales
2c902ab8e7 Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2

Former-commit-id: 250730c308 [formerly ac8136bd82] [formerly f1480cfc62] [formerly 250730c308 [formerly ac8136bd82] [formerly f1480cfc62] [formerly 6bc585aaf6 [formerly f1480cfc62 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]]]
Former-commit-id: 6bc585aaf6
Former-commit-id: bf1d2cb85a [formerly 47690ea8d0] [formerly 3ebdb55d0083b9e2bf2524a8b3b7cd9acaf899a2 [formerly aeccaa2329]]
Former-commit-id: 9142f489480470f702fc2b3671eb72d8c6bfc6e1 [formerly 3b2127c103]
Former-commit-id: af7e9dd4ef
2013-10-29 15:10:20 -05:00
Nate Jensen
89b3b81ab3 Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108]
Former-commit-id: f2184b9379
2013-10-29 14:33:53 -05:00
Dave Hladky
35b2feb1f3 Issue #2361 Moved to private JAXB
Former-commit-id: c863bb2c97 [formerly be351c82ed] [formerly 5b5e1ca293] [formerly c863bb2c97 [formerly be351c82ed] [formerly 5b5e1ca293] [formerly 33a0890d31 [formerly 5b5e1ca293 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]]]
Former-commit-id: 33a0890d31
Former-commit-id: fab58a547c [formerly 3eff51897b] [formerly 6708b8f73ec0bd3504932f11002f618a7640713b [formerly b55b05fa8b]]
Former-commit-id: ba45b80971f8793e70e8c68f88baa52539e1a3e3 [formerly b5e892c16e]
Former-commit-id: cec7d35505
2013-10-29 13:45:05 -05:00
Dave Hladky
beee858d72 Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 91e69b800d [formerly f5b9d3be39] [formerly 6cb541d1a1] [formerly 91e69b800d [formerly f5b9d3be39] [formerly 6cb541d1a1] [formerly 15aed68c02 [formerly 6cb541d1a1 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]]]
Former-commit-id: 15aed68c02
Former-commit-id: ba1de528c3 [formerly b5e309f973] [formerly 0423445a8ccf01b94283305bba59e4481390d48e [formerly a8ab9072cc]]
Former-commit-id: 7ee18cf5142219fe531e31224b5735ba2e4b8bd8 [formerly 072fa5de62]
Former-commit-id: 90d3c540a6
2013-10-29 13:05:47 -05:00
Nate Jensen
aa404f688d Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: e38de1ea51 [formerly c45f619260] [formerly a5f2414070] [formerly e38de1ea51 [formerly c45f619260] [formerly a5f2414070] [formerly 4879c19e0b [formerly a5f2414070 [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]]]
Former-commit-id: 4879c19e0b
Former-commit-id: 7ab5fe0249 [formerly 96c901b958] [formerly 78c6fcd26016e4e02e9043303063932ef64058c0 [formerly 4929a59b3e]]
Former-commit-id: b6bc982d0a5ee6e24e7db4cf785f029a2bcd0a04 [formerly cbe8c35605]
Former-commit-id: f377a942fa
2013-10-29 12:31:08 -05:00
Dave Hladky
04f84889d0 Issue #2361 Harvester JAXB fixed up
Former-commit-id: daf770c215 [formerly 1deca13487] [formerly 70d2ad2cdc] [formerly daf770c215 [formerly 1deca13487] [formerly 70d2ad2cdc] [formerly bcfa7d7a8f [formerly 70d2ad2cdc [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: 8e3023b575 [formerly 1a889e84b1] [formerly 4a4db7d882a3b343c5cb1266afa5a2391bddced2 [formerly c5137923c0]]
Former-commit-id: 274ae1d3799435ba4fd3f169d0b7cd96b97db8f6 [formerly 64a9973089]
Former-commit-id: 0d562b64fd
2013-10-29 12:20:53 -05:00
Richard Peter
e97a563366 Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: f5208d359a [formerly 6cdbad069a] [formerly 1d85220363] [formerly f5208d359a [formerly 6cdbad069a] [formerly 1d85220363] [formerly 1b7b6f0134 [formerly 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]]]
Former-commit-id: 1b7b6f0134
Former-commit-id: e5ae2ac89f [formerly 4b612a3fa0] [formerly 0cd653cbbf4d6de4d91974c87380cb964aeb3f6f [formerly c27c764c61]]
Former-commit-id: 5434f1ea5812c8edd641cbe3b74d006b0a8ed158 [formerly 3d812fdeb9]
Former-commit-id: 6ba24ad909
2013-10-29 12:18:55 -05:00
Richard Peter
573ca1001f Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 767cbbf4f2 [formerly 5f1c6f5625] [formerly f75b431a40] [formerly 767cbbf4f2 [formerly 5f1c6f5625] [formerly f75b431a40] [formerly 89b992c01c [formerly f75b431a40 [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]]]
Former-commit-id: 89b992c01c
Former-commit-id: 4386e3b451 [formerly 66d7ccb859] [formerly e5e56997f9e05d9ac3a79690595406c220de7aa3 [formerly c56806b9b7]]
Former-commit-id: cb5d0cecaa758ef70657cd278220a27ea64c5e62 [formerly e4b3ff9029]
Former-commit-id: 74d2e4189c
2013-10-29 12:17:14 -05:00
Richard Peter
75ed6cd788 Merge "Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box." into development
Former-commit-id: 8b8f09f176 [formerly bfc87a0607] [formerly fe45d2b7e6] [formerly 8b8f09f176 [formerly bfc87a0607] [formerly fe45d2b7e6] [formerly b6ffed0066 [formerly fe45d2b7e6 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]]]]
Former-commit-id: b6ffed0066
Former-commit-id: b4c3c775f6 [formerly 5baa99e9c9] [formerly d90ab5bca99a3ce62195970bf8966d8c71b5ec87 [formerly 4765eaefad]]
Former-commit-id: a1d272f4a32086548120bb113252741efc701345 [formerly f1d5148c49]
Former-commit-id: 5ee9b1ce9d
2013-10-29 12:15:35 -05:00
Ben Steffensmeier
1270a5862d Issue #2489 Fix SfcObs NPE.
Former-commit-id: 4f29903ddc [formerly 59d8afc639] [formerly f9ee49fac5] [formerly 4f29903ddc [formerly 59d8afc639] [formerly f9ee49fac5] [formerly ddf506ceac [formerly f9ee49fac5 [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]]]
Former-commit-id: ddf506ceac
Former-commit-id: 552f33af6e [formerly 32427d8b3d] [formerly d7e2058fb64a230ba953b4f8ca0bc8b0b881fbe4 [formerly ca5a125829]]
Former-commit-id: d6ba06d23f105cfc8f54f5aa5fa5ceda635d3600 [formerly bab495ab35]
Former-commit-id: f7f75c86da
2013-10-29 10:59:36 -05:00
Steve Harris
ba80e5f206 Merge branch 'development' into development_on_RHEL6
Former-commit-id: f25d638bc2 [formerly a103a0e8ac] [formerly 560b0075cd] [formerly f25d638bc2 [formerly a103a0e8ac] [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: 0be97d503a [formerly 3b29cf6790] [formerly c51eafcb852c1a8282b6694b8e25e7101b5a76bb [formerly eced243e6a]]
Former-commit-id: 23f5786872767a023465fd464ca03603e3e984fb [formerly 75cdf331b6]
Former-commit-id: 8982d892ba
2013-10-28 15:58:12 -05:00
Bryan Kowal
71a8ee5a68 Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: 90a54524c6 [formerly df575b7be1] [formerly a6d7822698] [formerly 90a54524c6 [formerly df575b7be1] [formerly a6d7822698] [formerly cda8d04831 [formerly a6d7822698 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]]]
Former-commit-id: cda8d04831
Former-commit-id: 3e68d9aaac [formerly 27d2e33769] [formerly 3fa0f0dac5587960c496629c316aa2a1a2f464bc [formerly cc0f6832c9]]
Former-commit-id: 822576469c2608f5a2fcb3645efe10ba1e12bfce [formerly 2615ad7324]
Former-commit-id: 819cb0bcb7
2013-10-28 14:50:28 -05:00
Steve Harris
179be1638a Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]]
Former-commit-id: 972339d60f
Former-commit-id: dd533f0bce [formerly a444c93ee7] [formerly 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8]]
Former-commit-id: 9ec4de5036bebda97665c7c5c43fd0794ee9593d [formerly 0bf9020c49]
Former-commit-id: f49a22bae2
2013-10-28 14:39:22 -05:00
Ron Anderson
b0f0709755 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 306a5d72f4 [formerly 3575496955] [formerly 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]]
Former-commit-id: 53c38fe54d2869c9707556e4244b69af6f55a908 [formerly 1daa0f8649]
Former-commit-id: 643624f1a9
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
5ac77f7f76 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
2013-10-28 10:14:08 -05:00
Steve Harris
cbf859daf6 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Steve Harris
c784003711 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Steve Harris
719dfc4763 13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2fbc08d837 [formerly 06f5dcf801] [formerly 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]]
Former-commit-id: be609d4b1adcd5effdcbb5631255d6839db62e54 [formerly 43610e510c]
Former-commit-id: 0e99e713e6
2013-10-28 10:30:57 -04:00
Nate Jensen
f76f5e9257 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: fa1bd6b2a4 [formerly 8aa02150c4] [formerly ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]]
Former-commit-id: 0b16e90747665fb5bad2de4fb36673726f33e59a [formerly 2741cb4348]
Former-commit-id: 8feeb6be16
2013-10-28 09:07:04 -05:00
Ben Steffensmeier
20d9922f17 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 694511af94 [formerly 4eea088717] [formerly ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]]
Former-commit-id: 122ec98ee5a18fcf8773f9c00abd54bcb37bbc42 [formerly 5645da0b45]
Former-commit-id: ddd58aa99c
2013-10-25 15:50:10 -05:00
Steve Harris
fc9955c2e0 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: 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 426b0662dc [formerly 6aab62b7b9] [formerly 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572]]
Former-commit-id: d8a3fc1a40537d39f3e081ace8795d06803bc0f7 [formerly 3a2a83bc4b]
Former-commit-id: 2864f20285
2013-10-25 10:51:42 -05:00
Steve Harris
e0d7e4cc22 13.5.2-13 baseline
Former-commit-id: e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]]
Former-commit-id: e7b1702032
Former-commit-id: a2442a8e39 [formerly 96c50ba394] [formerly 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b]]
Former-commit-id: 1340f052e588a7cd26a7455f448e5f92f5304a57 [formerly 6bff2d159f]
Former-commit-id: c71631dd28
2013-10-25 10:06:56 -04:00
Steve Harris
d1c823fe65 13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 2e6e031198 [formerly 15d9848170] [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]]
Former-commit-id: d6cb813e26904b36ed5b21ea7664539b21d552fa [formerly 248e79aa2f]
Former-commit-id: f97c128cc8
2013-10-25 09:59:15 -04:00
Steve Harris
4cfed2d3dd 13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]]
Former-commit-id: cbfde2f52a
Former-commit-id: a18eb8fe83 [formerly ecad06c80d] [formerly 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]]
Former-commit-id: b061ebe0205bf516b503d42df7cfdb9aacce9a06 [formerly 49b1168f5e]
Former-commit-id: d63a07d248
2013-10-25 09:45:58 -04:00
Nate Jensen
8e6b5e9e9c Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 2903ad6e2b [formerly 540d0ee576] [formerly 5f457fbad6] [formerly 2903ad6e2b [formerly 540d0ee576] [formerly 5f457fbad6] [formerly 68150f49ef [formerly 5f457fbad6 [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]]]
Former-commit-id: 68150f49ef
Former-commit-id: 7b789fed6f [formerly 403ba0f9cb] [formerly 05df7516efbadb27700857f955931c8c7e2bf6fe [formerly 2002f94568]]
Former-commit-id: 0422f932ce46aaef20084e9af3ff45c5a690a599 [formerly c2f1e3f838]
Former-commit-id: 8cb574a419
2013-10-24 20:06:08 -05:00
Nate Jensen
e95a9d9144 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]]
Former-commit-id: 5a99163569
Former-commit-id: 264555b5d7 [formerly b511177fa1] [formerly 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]]
Former-commit-id: aa9fcf1acc90fd6b11cfb0a4d5eca4720d7a4f65 [formerly c4161d09ba]
Former-commit-id: 213478f84b
2013-10-24 20:02:18 -05:00
Nate Jensen
b9dcdb5c57 Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]]
Former-commit-id: b1244552e4
Former-commit-id: e6e0942d70 [formerly 3a1856b168] [formerly 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]]
Former-commit-id: 644254ee88425258cfd9ef4563cdae5a400c8634 [formerly 9b582b0d83]
Former-commit-id: 9dc852ba9c
2013-10-24 19:52:13 -05:00
Nate Jensen
38b3b9aa7c Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development
Former-commit-id: 5e54da3258 [formerly b2cdbd6fc5] [formerly 5d96feb00e] [formerly 5e54da3258 [formerly b2cdbd6fc5] [formerly 5d96feb00e] [formerly 298114500c [formerly 5d96feb00e [formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]]]]
Former-commit-id: 298114500c
Former-commit-id: d21d7c5283 [formerly 39e7b0fd95] [formerly 251c8ae97f34417aa2812c59e32158d427e4285e [formerly fc1898234d]]
Former-commit-id: 1132a61d15ce06b66c1ae9e4f6b2a86199c6bf77 [formerly 797002f959]
Former-commit-id: f73752af0e
2013-10-24 19:51:49 -05:00