Commit graph

4136 commits

Author SHA1 Message Date
Steve Harris
89bf1adcf5 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 354a736ed5 [formerly 1a9ff8df10] [formerly 2e0db025f3] [formerly a956fd7f4d [formerly 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]]
Former-commit-id: a956fd7f4d
Former-commit-id: ab6310aa243dfb8185d05a0491fd0532879e343a [formerly 6d20cd89ff]
Former-commit-id: 02907147b6
2013-11-04 20:29:07 -06:00
Nate Jensen
df5e99425d Merge "Issue #2472 Replacing lost commit" into development
Former-commit-id: 0a64209482 [formerly ab969fde67] [formerly 68e60576dc] [formerly f595fc9bb3 [formerly 68e60576dc [formerly 82513b3d8d53a089f9884e0922de5e8ebdc26a37]]]
Former-commit-id: f595fc9bb3
Former-commit-id: 18e2570f35f96550538b024e247026d93639993d [formerly 6f29a5f7a0]
Former-commit-id: 7fb0844a84
2013-11-04 16:53:17 -06:00
Dave Hladky
aaa709a11d Issue #2472 Replacing lost commit
Former-commit-id: a6182c2af0 [formerly 62d08dbe93] [formerly 1f1469fe82] [formerly 9c6a430d40 [formerly 1f1469fe82 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]]
Former-commit-id: 9c6a430d40
Former-commit-id: 5ba22e77f9a88fb32b78daae0e95bb5adceda6ea [formerly 47b946fc3b]
Former-commit-id: 2a2b35d62c
2013-11-04 16:24:14 -06:00
Ron Anderson
adbe3c511c Merge "Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization." into development
Former-commit-id: 0c45807d11 [formerly 196e2fc2d1] [formerly 8e1c3a80a7] [formerly 8ecd11fe71 [formerly 8e1c3a80a7 [formerly 1caad52e03dfddb4e3c64fff79d5b6aca9c73a6f]]]
Former-commit-id: 8ecd11fe71
Former-commit-id: cd7dd37b55235c539cc6af0609aee88341b550b7 [formerly 844146fcd7]
Former-commit-id: 20e455c431
2013-11-04 15:55:36 -06:00
Ron Anderson
e9771d375e Issue #2508 Added DiscreteGridSlice.setKeys() to fix error in serialization.
Change-Id: I0edcf4e113f7226650a8363a3d7f0225f482c8f8

Former-commit-id: 950fc4f17d [formerly a5820f8ddf] [formerly b6eb0df14c] [formerly 9a737b2d4a [formerly b6eb0df14c [formerly fe6f8beb1174e605a1935899eb2e5ad6d1babd57]]]
Former-commit-id: 9a737b2d4a
Former-commit-id: 7116ac3154251e73e3e8c936fce97daf3822c787 [formerly 833e84b5b8]
Former-commit-id: 99a63bc182
2013-11-04 15:22:32 -06:00
Nate Jensen
3cfb49215f Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141

Former-commit-id: 16074e6a14 [formerly 27f09b8096] [formerly 6064000389] [formerly b36d28c9fd [formerly 6064000389 [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]
Former-commit-id: b36d28c9fd
Former-commit-id: e86e430428d15356370e7a0929a62a10de34aaa1 [formerly 3e3400dc7c]
Former-commit-id: 5d2ec98600
2013-11-04 14:30:00 -06:00
Nate Jensen
73117fd1ce Issue #2361 remove XML annotations from bufrmos
Former-commit-id: e7f7b77e3c [formerly b1409d4002] [formerly 9b9d57bc94] [formerly 1a25186415 [formerly 9b9d57bc94 [formerly f6a873e20e4cb7ce6fb47654ce3292b4f3bab99e]]]
Former-commit-id: 1a25186415
Former-commit-id: 5eae392eb0ff88203cd5c173328a6f33e1e2156c [formerly b2847dd446]
Former-commit-id: 173bff3eb8
2013-11-04 13:34:01 -06:00
Ben Steffensmeier
dd2bb59742 Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: c694721b6dae8a56fdf9390a3bc7d8934e8b3711 [formerly 08e73de883]
Former-commit-id: d38879158d
2013-11-04 13:01:49 -06:00
Nate Jensen
c8e354e52a Merge "Issue #2361 remove XML annotations from TAF and CCFP" into development
Former-commit-id: 2ee0cfe872 [formerly 8688681a8a] [formerly a72197e828] [formerly 3ef349882c [formerly a72197e828 [formerly 0a74b17463864bb9fb50b4e9450592b04a4dd481]]]
Former-commit-id: 3ef349882c
Former-commit-id: e0223b638af06335d366d69114aeb47d9cfde773 [formerly 6bab0640a7]
Former-commit-id: 823de65f07
2013-11-04 11:48:04 -06:00
Lee Venable
07e89ee05d Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 0b3346d699 [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: 608f6b9d8262abfc44e2d399f8c52580ba4437af [formerly f6f1b16c0c]
Former-commit-id: c7d03bf267
2013-11-02 10:43:48 -05:00
Slav Korolev
4b225552e2 Issue #2431. Changed labels on the table.
Former-commit-id: 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 0801f8dedd [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 77ecd7c42b3304b4ff77b15d1213ecb427f5661a [formerly 7d0198b356]
Former-commit-id: 6b3481ca26
2013-11-01 15:06:19 -04:00
Nate Jensen
97ddb715af Issue #2361 remove XML annotations from TAF and CCFP
Former-commit-id: bc61b966b0 [formerly c52c207c80] [formerly 942936e815] [formerly cd49daccf9 [formerly 942936e815 [formerly 2587a9b13ec6576007081a165f6042dd5a82b7eb]]]
Former-commit-id: cd49daccf9
Former-commit-id: 88bb0c0a4afa8b6b966ef66dfd8c75302ba2c2cb [formerly d935c4f547]
Former-commit-id: a6cfeb5626
2013-11-01 13:19:28 -05:00
Nate Jensen
064fa413cf Merge "Issue #2361 move ebxml away from using SerializationUtil for XML processing" into development
Former-commit-id: eb504de3a0 [formerly 1ac6a4ea18] [formerly 7156ac5d4f] [formerly 6fac918395 [formerly 7156ac5d4f [formerly 84226cbd63d12c6c1624dfc1dd72b42360d0e54d]]]
Former-commit-id: 6fac918395
Former-commit-id: 9d0ec1d71c57a9298742cd4dc01ef04de0897694 [formerly b5d457f566]
Former-commit-id: 8c3eb7612c
2013-11-01 12:27:21 -05:00
Nate Jensen
a9a4963f09 Issue #2361 move ebxml away from using SerializationUtil for XML processing
Change-Id: I04decec05b44a9c1881963f1a902adf6742aafa9

Former-commit-id: 37eaab4490 [formerly 2e28d72fb7] [formerly 2413c854c0] [formerly 5efd1b7218 [formerly 2413c854c0 [formerly ebf2c3c32945fefe8fd8c054b163fba238ac0ee5]]]
Former-commit-id: 5efd1b7218
Former-commit-id: c4286e81e6c3ef5daac753ed4597591ab4297c22 [formerly f4cdcb2fae]
Former-commit-id: 3753b45c0c
2013-11-01 12:09:43 -05:00
Ron Anderson
a0f67a006f 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 cc991ed528 [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]
Former-commit-id: cc991ed528
Former-commit-id: c1140f67ed8f586264c71a61de18f87988cedd70 [formerly deb89a88f5]
Former-commit-id: f453d92818
2013-11-01 11:07:39 -05:00
Greg Armendariz
cbf9f6fe6b Issue #2509 - Fix merge issue
Former-commit-id: 7ab7156b61 [formerly a281147055] [formerly b4c3337ffd] [formerly fadf9346d2 [formerly b4c3337ffd [formerly d742b452ab114935b76cb9097db7d6a08651bb2e]]]
Former-commit-id: fadf9346d2
Former-commit-id: 4f461d5d2d81a6c8c37fb34ea3a2a847bafb9adc [formerly d530a65ee3]
Former-commit-id: 1561f091e3
2013-11-01 10:31:08 -05:00
Dave Hladky
fd96474a8b Issue #2292 Stopped subscriptions from checking against themselves. This prevented subscriptions from being updatable.
Former-commit-id: 07c70d72cc [formerly 1594cc6a72] [formerly e5896397f6] [formerly 422dabf3eb [formerly e5896397f6 [formerly 6edfeb94cfb14785d68d90b41fc636faa2ece074]]]
Former-commit-id: 422dabf3eb
Former-commit-id: c56edc32fb745fdee96b63e71aaf76cca3d28fa8 [formerly ca1f2fc340]
Former-commit-id: d589bced40
2013-11-01 10:23:56 -05:00
Slav Korolev
9c8b7d1e96 Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]
Former-commit-id: f7d1939b36
Former-commit-id: 3a1615d06dc67187bd2ec2e01aff550ea0b6e6b1 [formerly 386db59985]
Former-commit-id: fcbe5d09da
2013-11-01 11:03:06 -04:00
Dave Hladky
ea17726866 Issue #2448 Fixed retrievals before activePeriod begins and after activePeriod expires.
Change-Id: I75269bad24731990720d30683ebf5f27344661f3

Former-commit-id: f79ba58a3a [formerly 0eba787d3e] [formerly 4227f3a59f] [formerly 9161962813 [formerly 4227f3a59f [formerly 060e719f27c20f24bae9a5603cc51d90434b8fa4]]]
Former-commit-id: 9161962813
Former-commit-id: cc3ebf4fc7bd5a908a51ab6d7ccbfde59ee5656b [formerly d55d68fe5a]
Former-commit-id: ba31efaf03
2013-11-01 08:23:16 -05:00
Nate Jensen
685c6034b2 Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 1d11102b6e40b4f27646f1cf7aba32281be912e3 [formerly 47fc100053]
Former-commit-id: 6ed6df6ed0
2013-10-31 18:11:13 -05:00
Bryan Kowal
ea5b64b722 Issue #2476 - re-compile jep for RHEL6 64-bit
Former-commit-id: 4a22b3ce5f [formerly fc05fd7140] [formerly adba11b2be3b957d26498aad06800b4acd80b3ef [formerly 5b99b99d3c]] [formerly d034d82744 [formerly 5b99b99d3c [formerly 39a2c09fe71d3fbafa1a10dc08e7348f7710579c]]]
Former-commit-id: d034d82744
Former-commit-id: 5af137f626136247835c40325feecbdfe2991c62 [formerly 7e94e4cd78]
Former-commit-id: bde48968ca
2013-10-31 15:56:34 -05:00
Bryan Kowal
874bd8aa36 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Former-commit-id: fd5a5096de [formerly 04bcd7e6dc] [formerly 49422aea62] [formerly d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]
Former-commit-id: d08a652e23
Former-commit-id: 2f7241bd44af27a962760419963b91198396fa99 [formerly adb62df96a]
Former-commit-id: d53ec9c750
2013-10-31 15:43:29 -05:00
Bryan Kowal
d3062ea58f 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 c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]
Former-commit-id: f02d4b7a0b
2013-10-31 15:34:46 -05:00
Bryan Kowal
f37abe3599 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 c76c856340 [formerly 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]
Former-commit-id: c76c856340
Former-commit-id: a87ff201ab972ea4012700b7f82b08857452a1f6 [formerly 0954490a5a]
Former-commit-id: 7a83214b1c
2013-10-31 15:23:08 -05:00
Bryan Kowal
df0ae3ba94 Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: 60904307b5 [formerly ecda7100be] [formerly c74123f5a8] [formerly e9b76cf185 [formerly c74123f5a8 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]]
Former-commit-id: e9b76cf185
Former-commit-id: 9902031682720d70e9b58e2fde57c57da41262d1 [formerly d08a1af457]
Former-commit-id: 02cdbe0173
2013-10-31 14:53:27 -05:00
David Gillingham
82721bfe07 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 c4f5cc53bb [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 345b0c83f25f83ef27ba6cbf8e70827c774b053d [formerly 3bac577a31]
Former-commit-id: 3776f258a3
2013-10-31 14:07:20 -05:00
Ben Steffensmeier
d27369f59b Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 76b03c41b24dd6bcae696afd2a7ee339f6c0f727 [formerly 3d36cec7be]] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]
Former-commit-id: 89c999410e
2013-10-31 14:06:37 -05:00
Ron Anderson
dd1b50d116 Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c

Former-commit-id: f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]
Former-commit-id: 42e924e021
Former-commit-id: e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0]
Former-commit-id: 2f23072e41
2013-10-31 14:04:55 -05:00
Nate Jensen
2aa3471a8a 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 de50a9214b [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]
Former-commit-id: de50a9214b
Former-commit-id: c89ecfda3d23b19bae8caa3e9277339aa3c12a03 [formerly d6fcc98e76]
Former-commit-id: c9d9070600
2013-10-31 12:24:23 -05:00
Richard Peter
7b0ad6bacc 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 b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]
Former-commit-id: b482eb2b48
Former-commit-id: f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134]
Former-commit-id: fca3d73aa7
2013-10-31 11:46:25 -05:00
Mike Duff
ce2afdf1b3 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 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]
Former-commit-id: 3fc811102e
Former-commit-id: ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461]
Former-commit-id: b0c54d7c17
2013-10-31 09:22:50 -05:00
Greg Armendariz
83262b6cc4 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 795d6cf541 [formerly 0daf07742e] [formerly f6d98d6317] [formerly 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]
Former-commit-id: 64dd62005b
Former-commit-id: 3a7bea98c42e7d77a7480bbc262fa233cb1f6a6b [formerly 4fb0e0bd2f]
Former-commit-id: 5cf091c499
2013-10-30 14:52:16 -05:00
David Gillingham
2ddacaea30 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 b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124]
Former-commit-id: 68b0b2e3db
2013-10-30 11:34:46 -05:00
Nate Jensen
937981d2f9 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 62a5739feb [formerly d92bd5b69a [formerly 05de1d88cdc4841483864a623346ad16b015d395]]]
Former-commit-id: 62a5739feb
Former-commit-id: 9bd9983d48f00002ef7fd475ecf0bf5a3403c4c1 [formerly 5c4d8b4310]
Former-commit-id: 90d99fe627
2013-10-30 11:28:58 -05:00
Bryan Kowal
2a36503bf0 Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: d2bd276fee [formerly e4e2c8c796] [formerly eb4c27003f] [formerly b082ea89c5 [formerly eb4c27003f [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]]
Former-commit-id: b082ea89c5
Former-commit-id: 67b06516357f8371d7d025ab695b2a9be1b02fc1 [formerly 428dd993d9]
Former-commit-id: 63324cda6a
2013-10-30 09:23:55 -05:00
Ben Steffensmeier
8ec09e8f61 Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6

Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]
Former-commit-id: 27a392f90e
Former-commit-id: 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]
Former-commit-id: 78efdb7572
2013-10-29 17:35:55 -05:00
Nate Jensen
40243bbcc4 Merge "Issue #2267 Removed java.nio.file dependencies from FilenameFilter." into development
Former-commit-id: 5531ba7fd8 [formerly e024af7e4f] [formerly 7a9fa0c5d3] [formerly c1fb07bc57 [formerly 7a9fa0c5d3 [formerly e7d71688c83961922b6089e719226fc631d65e9a]]]
Former-commit-id: c1fb07bc57
Former-commit-id: 217ae9701811bd936b4275c58d21ee4bae50be5c [formerly 893e91d386]
Former-commit-id: e7b26af054
2013-10-29 17:11:15 -05:00
Brad Gonzales
d1d0dc770e Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733

Former-commit-id: 95afe3cd1e [formerly 433ee7d942] [formerly 011c42b806] [formerly 057ba113b5 [formerly 011c42b806 [formerly 36571478911119efe7195d51f6c820d6e745ccee]]]
Former-commit-id: 057ba113b5
Former-commit-id: 65615958da30edfa31cf83debed3017ef1f056db [formerly 9325d477a9]
Former-commit-id: 3c0bd6db16
2013-10-29 17:04:00 -05:00
Ben Steffensmeier
7b540cb830 Issue #2491 Clean resource datas out of ncep plugins.
Former-commit-id: 5bb82eb545 [formerly b713ae826d] [formerly e1180db74b] [formerly 1ac69169fa [formerly e1180db74b [formerly e1259eb7fa31d3142ca9ce43bf46c52f00fb098e]]]
Former-commit-id: 1ac69169fa
Former-commit-id: 103ccd01e73879c3d8b3bd01b0c764cb47ddfafe [formerly e1054d923c]
Former-commit-id: fe29ef1c58
2013-10-29 16:47:06 -05:00
Brad Gonzales
bf1d2cb85a 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 6bc585aaf6 [formerly f1480cfc62 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]]
Former-commit-id: 6bc585aaf6
Former-commit-id: 3ebdb55d0083b9e2bf2524a8b3b7cd9acaf899a2 [formerly aeccaa2329]
Former-commit-id: 47690ea8d0
2013-10-29 15:10:20 -05:00
Nate Jensen
dced4c4d11 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 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]
Former-commit-id: 6880a18f1a
Former-commit-id: df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]
Former-commit-id: 19043faeaa
2013-10-29 14:33:53 -05:00
Nate Jensen
5fe13ba2f8 Merge "Issue #2361 Moved to private JAXB" into development
Former-commit-id: 20d0ba97f4 [formerly 8de69e035a] [formerly 11a5776652] [formerly f9d9b0a1dc [formerly 11a5776652 [formerly c55568de340105c89b118ff3f719c7816dcb5e3b]]]
Former-commit-id: f9d9b0a1dc
Former-commit-id: a550df4093e56b611c726b3100d0e568e0dac1a2 [formerly 35209c8a5d]
Former-commit-id: 9fee5aedc7
2013-10-29 13:59:00 -05:00
Mike Duff
3f502364c9 Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5

Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]
Former-commit-id: 4beb79d5a7
2013-10-29 13:49:47 -05:00
Dave Hladky
fab58a547c Issue #2361 Moved to private JAXB
Former-commit-id: c863bb2c97 [formerly be351c82ed] [formerly 5b5e1ca293] [formerly 33a0890d31 [formerly 5b5e1ca293 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]]
Former-commit-id: 33a0890d31
Former-commit-id: 6708b8f73ec0bd3504932f11002f618a7640713b [formerly b55b05fa8b]
Former-commit-id: 3eff51897b
2013-10-29 13:45:05 -05:00
Dave Hladky
ba1de528c3 Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 91e69b800d [formerly f5b9d3be39] [formerly 7d0bb5825fabe6056e054ebed4b8de6346b820b9 [formerly 6cb541d1a1]] [formerly 15aed68c02 [formerly 6cb541d1a1 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]]
Former-commit-id: 15aed68c02
Former-commit-id: 0423445a8ccf01b94283305bba59e4481390d48e [formerly a8ab9072cc]
Former-commit-id: b5e309f973
2013-10-29 13:05:47 -05:00
Nate Jensen
fea475b821 Merge "Issue #2491 Move ncep bundles off od SerializationUtil." into development
Former-commit-id: a608282545 [formerly 484271d2a1] [formerly bfa5681bfc] [formerly cfd62f8693 [formerly bfa5681bfc [formerly 08f8e4274f547455e6a9fc09a3ab025a68f097a7]]]
Former-commit-id: cfd62f8693
Former-commit-id: c2f30c72fa99980c359172342d3a96d3a96a07d2 [formerly 84deb7d911]
Former-commit-id: afe952cce9
2013-10-29 12:31:40 -05:00
Nate Jensen
7ab5fe0249 Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: e38de1ea51 [formerly c45f619260] [formerly a5f2414070] [formerly 4879c19e0b [formerly a5f2414070 [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]]
Former-commit-id: 4879c19e0b
Former-commit-id: 78c6fcd26016e4e02e9043303063932ef64058c0 [formerly 4929a59b3e]
Former-commit-id: 96c901b958
2013-10-29 12:31:08 -05:00
Ben Steffensmeier
7e0cb095c2 Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly 204b47c67d [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]
Former-commit-id: 204b47c67d
Former-commit-id: 479b38fd22c3992c7e8afaec4ff032e7fa45f9d9 [formerly 9540b309b3]
Former-commit-id: 09347cdd5a
2013-10-29 12:28:07 -05:00
Dave Hladky
8e3023b575 Issue #2361 Harvester JAXB fixed up
Former-commit-id: daf770c215 [formerly 1deca13487] [formerly 70d2ad2cdc] [formerly bcfa7d7a8f [formerly 70d2ad2cdc [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: 4a4db7d882a3b343c5cb1266afa5a2391bddced2 [formerly c5137923c0]
Former-commit-id: 1a889e84b1
2013-10-29 12:20:53 -05:00
Richard Peter
e5ae2ac89f Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: f5208d359a [formerly 6cdbad069a] [formerly 1d85220363] [formerly 1b7b6f0134 [formerly 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]]
Former-commit-id: 1b7b6f0134
Former-commit-id: 0cd653cbbf4d6de4d91974c87380cb964aeb3f6f [formerly c27c764c61]
Former-commit-id: 4b612a3fa0
2013-10-29 12:18:55 -05:00