Commit graph

4294 commits

Author SHA1 Message Date
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
Ron Anderson
a9c8950fe6 Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]]
Former-commit-id: cc991ed528
Former-commit-id: a0f67a006f [formerly f453d92818] [formerly c1140f67ed8f586264c71a61de18f87988cedd70 [formerly deb89a88f5]]
Former-commit-id: b4e8d1a865f6177e1d0672dcd506844aafc34864 [formerly 84adff8e96]
Former-commit-id: 638b57e188
2013-11-01 11:07:39 -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
Slav Korolev
50d1a73c83 Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]]
Former-commit-id: f7d1939b36
Former-commit-id: 9c8b7d1e96 [formerly fcbe5d09da] [formerly 3a1615d06dc67187bd2ec2e01aff550ea0b6e6b1 [formerly 386db59985]]
Former-commit-id: f9f5e3df75e6feba297093a0bd714b22f8fc7384 [formerly 57fc9a2183]
Former-commit-id: 884ca2167c
2013-11-01 11:03:06 -04: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
fde1c7e23f Issue #2476 - re-compile jep for RHEL6 64-bit
Former-commit-id: 4a22b3ce5f [formerly fc05fd7140] [formerly 5b99b99d3c] [formerly 4a22b3ce5f [formerly fc05fd7140] [formerly 5b99b99d3c] [formerly d034d82744 [formerly 5b99b99d3c [formerly 39a2c09fe71d3fbafa1a10dc08e7348f7710579c]]]]
Former-commit-id: d034d82744
Former-commit-id: ea5b64b722 [formerly bde48968ca] [formerly 5af137f626136247835c40325feecbdfe2991c62 [formerly 7e94e4cd78]]
Former-commit-id: 208a3b4fc0e99b4f630a6b5853a5b910b30552a1 [formerly 4006fd8f54]
Former-commit-id: 9bf7652dbd
2013-10-31 15:56:34 -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
Bryan Kowal
a7d9b9fc11 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: 2ebed2011f [formerly 4d7a4aefec] [formerly 665911b033] [formerly 2ebed2011f [formerly 4d7a4aefec] [formerly 665911b033] [formerly c76c856340 [formerly 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]]
Former-commit-id: c76c856340
Former-commit-id: f37abe3599 [formerly 7a83214b1c] [formerly a87ff201ab972ea4012700b7f82b08857452a1f6 [formerly 0954490a5a]]
Former-commit-id: da8082dd7ce7ed30ca84ffbe89c5465a9f2b305e [formerly 6e08dc72c0]
Former-commit-id: 731efe0fb6
2013-10-31 15:23:08 -05:00
Bryan Kowal
a89b081ba5 Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: 60904307b5 [formerly ecda7100be] [formerly c74123f5a8] [formerly 60904307b5 [formerly ecda7100be] [formerly c74123f5a8] [formerly e9b76cf185 [formerly c74123f5a8 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]]]
Former-commit-id: e9b76cf185
Former-commit-id: df0ae3ba94 [formerly 02cdbe0173] [formerly 9902031682720d70e9b58e2fde57c57da41262d1 [formerly d08a1af457]]
Former-commit-id: 2287564d3c4d6587a1fef7d747e5c4b647a3d562 [formerly 71b5ef4733]
Former-commit-id: 44d773b663
2013-10-31 14:53:27 -05:00
David Gillingham
dc6a531641 Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af

Former-commit-id: 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 82721bfe07 [formerly 3776f258a3] [formerly 345b0c83f25f83ef27ba6cbf8e70827c774b053d [formerly 3bac577a31]]
Former-commit-id: 5b6106d6a9109e95e2fa9e2742d6f3022a33ac54 [formerly 5df42898ad]
Former-commit-id: 4862c1d171
2013-10-31 14:07:20 -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
Nate Jensen
b7c11ac174 Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly de50a9214b [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]]
Former-commit-id: de50a9214b
Former-commit-id: 2aa3471a8a [formerly c9d9070600] [formerly c89ecfda3d23b19bae8caa3e9277339aa3c12a03 [formerly d6fcc98e76]]
Former-commit-id: ae9c745301a10896244f2d9c9846983381ddd2ac [formerly c24d8c63cd]
Former-commit-id: 3c1f343be5
2013-10-31 12:24:23 -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
Bryan Kowal
feb28fd07f Re-enable the build of the awips2 rpm.
Former-commit-id: bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly 326144970c [formerly 40e8a94235 [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]]]]
Former-commit-id: 326144970c
Former-commit-id: 8479f5a2a3 [formerly 897b7fbd27] [formerly 1c783532062ff1679c7f78199095439201056d75 [formerly 1c0a469975]]
Former-commit-id: 2e7c59ec7e88a1e173edadefda380988bb11ee5d [formerly 8bd4b5dd9a]
Former-commit-id: abe6b1151f
2013-10-30 15:24:01 -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
Bryan Kowal
eb907d00da Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: d2bd276fee [formerly e4e2c8c796] [formerly eb4c27003f] [formerly d2bd276fee [formerly e4e2c8c796] [formerly eb4c27003f] [formerly b082ea89c5 [formerly eb4c27003f [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]]]
Former-commit-id: b082ea89c5
Former-commit-id: 2a36503bf0 [formerly 63324cda6a] [formerly 67b06516357f8371d7d025ab695b2a9be1b02fc1 [formerly 428dd993d9]]
Former-commit-id: 7f604c9d9dbf2ed9afef8c5efbddff94468a14f2 [formerly 4789797de5]
Former-commit-id: dbe9ed1433
2013-10-30 09:23:55 -05:00
Ben Steffensmeier
e193ba7f0f Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]]
Former-commit-id: 27a392f90e
Former-commit-id: 8ec09e8f61 [formerly 78efdb7572] [formerly 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]]
Former-commit-id: a33b0178c5a7309ae9c12ac4f7b2267997da8f07 [formerly 9d87eb50e2]
Former-commit-id: 02b9133d50
2013-10-29 17:35:55 -05:00
Nate Jensen
05101dcbe4 Merge "Issue #2267 Removed java.nio.file dependencies from FilenameFilter." into development
Former-commit-id: 5531ba7fd8 [formerly e024af7e4f] [formerly 7a9fa0c5d3] [formerly 5531ba7fd8 [formerly e024af7e4f] [formerly 7a9fa0c5d3] [formerly c1fb07bc57 [formerly 7a9fa0c5d3 [formerly e7d71688c83961922b6089e719226fc631d65e9a]]]]
Former-commit-id: c1fb07bc57
Former-commit-id: 40243bbcc4 [formerly e7b26af054] [formerly 217ae9701811bd936b4275c58d21ee4bae50be5c [formerly 893e91d386]]
Former-commit-id: b53d0ac1061308f2097908508f3bb55eb8baa856 [formerly a5a0c5457c]
Former-commit-id: 7bf4f27a31
2013-10-29 17:11:15 -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
Ben Steffensmeier
1430560357 Issue #2491 Clean resource datas out of ncep plugins.
Former-commit-id: 5bb82eb545 [formerly b713ae826d] [formerly e1180db74b] [formerly 5bb82eb545 [formerly b713ae826d] [formerly e1180db74b] [formerly 1ac69169fa [formerly e1180db74b [formerly e1259eb7fa31d3142ca9ce43bf46c52f00fb098e]]]]
Former-commit-id: 1ac69169fa
Former-commit-id: 7b540cb830 [formerly fe29ef1c58] [formerly 103ccd01e73879c3d8b3bd01b0c764cb47ddfafe [formerly e1054d923c]]
Former-commit-id: babcf70e4d62a3c89bab9088e0587a9ccceb1687 [formerly bec7eb3d7f]
Former-commit-id: ef52238100
2013-10-29 16:47:06 -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
Nate Jensen
fce988f3a4 Merge "Issue #2361 Moved to private JAXB" into development
Former-commit-id: 20d0ba97f4 [formerly 8de69e035a] [formerly 11a5776652] [formerly 20d0ba97f4 [formerly 8de69e035a] [formerly 11a5776652] [formerly f9d9b0a1dc [formerly 11a5776652 [formerly c55568de340105c89b118ff3f719c7816dcb5e3b]]]]
Former-commit-id: f9d9b0a1dc
Former-commit-id: 5fe13ba2f8 [formerly 9fee5aedc7] [formerly a550df4093e56b611c726b3100d0e568e0dac1a2 [formerly 35209c8a5d]]
Former-commit-id: 6f8e0390cfea3f9531c9e170d1c1bc59ef50d594 [formerly 0fc40b4406]
Former-commit-id: 429b2bdfd5
2013-10-29 13:59:00 -05:00
Mike Duff
589da45d3f Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5

Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 3f502364c9 [formerly 4beb79d5a7] [formerly 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]]
Former-commit-id: ae4c63d618c1eb58242c2ffdaf294d319749571c [formerly 2c7dbda379]
Former-commit-id: 26941f1033
2013-10-29 13:49:47 -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
e4530f8d27 Merge "Issue #2491 Move ncep bundles off od SerializationUtil." into development
Former-commit-id: a608282545 [formerly 484271d2a1] [formerly bfa5681bfc] [formerly a608282545 [formerly 484271d2a1] [formerly bfa5681bfc] [formerly cfd62f8693 [formerly bfa5681bfc [formerly 08f8e4274f547455e6a9fc09a3ab025a68f097a7]]]]
Former-commit-id: cfd62f8693
Former-commit-id: fea475b821 [formerly afe952cce9] [formerly c2f30c72fa99980c359172342d3a96d3a96a07d2 [formerly 84deb7d911]]
Former-commit-id: f6b7e0d43d7541ae538df4c537b864fd8ec93992 [formerly d0b49f4979]
Former-commit-id: b962c61c17
2013-10-29 12:31:40 -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
Ben Steffensmeier
9c4692235f Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly 204b47c67d [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]]
Former-commit-id: 204b47c67d
Former-commit-id: 7e0cb095c2 [formerly 09347cdd5a] [formerly 479b38fd22c3992c7e8afaec4ff032e7fa45f9d9 [formerly 9540b309b3]]
Former-commit-id: 4bf44aa82f7b082680aa650f926af4dfec1c5040 [formerly fd931a3e64]
Former-commit-id: c57dc46dfc
2013-10-29 12:28:07 -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
Bryan Kowal
9d0f21ad44 Issue #2268 - fix CAVE installation error
Former-commit-id: 6cc545e8b6 [formerly 203c5d7288] [formerly 7772aca092] [formerly 6cc545e8b6 [formerly 203c5d7288] [formerly 7772aca092] [formerly 5bc115c56c [formerly 7772aca092 [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]]]]
Former-commit-id: 5bc115c56c
Former-commit-id: 2c3b6c622d [formerly a89499f399] [formerly 43a2360244f03c9fa2d4d4bd82907faa7bb9c7f2 [formerly a34d7b254f]]
Former-commit-id: 82c464eb9285b8e1ee9cf196e42de986b7c808a5 [formerly 893a2cf334]
Former-commit-id: fba7e48970
2013-10-29 11:44:48 -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