Commit graph

1798 commits

Author SHA1 Message Date
Bryan Kowal
d366e70934 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: feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]
Former-commit-id: c8d7a32e2e
2013-10-31 15:34:46 -05:00
Greg Armendariz
4fb0e0bd2f Merge branch 'development' into development_on_RHEL6
Former-commit-id: f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]
Former-commit-id: 64dd62005b
2013-10-30 14:52:16 -05:00
Nate Jensen
5c4d8b4310 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: d92bd5b69a [formerly 05de1d88cdc4841483864a623346ad16b015d395]
Former-commit-id: 62a5739feb
2013-10-30 11:28:58 -05:00
Brad Gonzales
9325d477a9 Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733

Former-commit-id: 011c42b806 [formerly 36571478911119efe7195d51f6c820d6e745ccee]
Former-commit-id: 057ba113b5
2013-10-29 17:04:00 -05:00
Brad Gonzales
aeccaa2329 Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2

Former-commit-id: f1480cfc62 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]
Former-commit-id: 6bc585aaf6
2013-10-29 15:10:20 -05:00
Nate Jensen
f2751f017e 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: f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]
Former-commit-id: 6880a18f1a
2013-10-29 14:33:53 -05:00
Dave Hladky
b55b05fa8b Issue #2361 Moved to private JAXB
Former-commit-id: 5b5e1ca293 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]
Former-commit-id: 33a0890d31
2013-10-29 13:45:05 -05:00
Dave Hladky
a8ab9072cc Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 6cb541d1a1 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]
Former-commit-id: 15aed68c02
2013-10-29 13:05:47 -05:00
Nate Jensen
4929a59b3e Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: a5f2414070 [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]
Former-commit-id: 4879c19e0b
2013-10-29 12:31:08 -05:00
Dave Hladky
c5137923c0 Issue #2361 Harvester JAXB fixed up
Former-commit-id: 70d2ad2cdc [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]
Former-commit-id: bcfa7d7a8f
2013-10-29 12:20:53 -05:00
Richard Peter
c27c764c61 Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: 1d85220363 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]
Former-commit-id: 1b7b6f0134
2013-10-29 12:18:55 -05:00
Richard Peter
c56806b9b7 Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: f75b431a40 [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]
Former-commit-id: 89b992c01c
2013-10-29 12:17:14 -05:00
Richard Peter
4765eaefad 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: fe45d2b7e6 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]
Former-commit-id: b6ffed0066
2013-10-29 12:15:35 -05:00
Ben Steffensmeier
ca5a125829 Issue #2489 Fix SfcObs NPE.
Former-commit-id: f9ee49fac5 [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]
Former-commit-id: ddf506ceac
2013-10-29 10:59:36 -05:00
Steve Harris
eced243e6a Merge branch 'development' into development_on_RHEL6
Former-commit-id: 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]
Former-commit-id: 6ea4ac62ed
2013-10-28 15:58:12 -05:00
Bryan Kowal
cc0f6832c9 Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: a6d7822698 [formerly 06a166ef6c963585eb65da223610a21665f9545a]
Former-commit-id: cda8d04831
2013-10-28 14:50:28 -05:00
Ron Anderson
dda2eb89c1 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]
Former-commit-id: f2cfc0c686
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
1f33a1997e Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]
Former-commit-id: 44a6f05986
2013-10-28 10:14:08 -05:00
Steve Harris
7590a56e0e 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: 99e3707c5b
2013-10-28 10:55:16 -04:00
Steve Harris
4a6a209aea 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 5739b4f832
2013-10-28 10:46:02 -04:00
Nate Jensen
aa0e2ca80a Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]
Former-commit-id: e4aa2b8a94
2013-10-28 09:07:04 -05:00
Ben Steffensmeier
fbdcadb456 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]
Former-commit-id: 4c03fc93f1
2013-10-25 15:50:10 -05:00
Nate Jensen
2002f94568 Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 5f457fbad6 [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]
Former-commit-id: 68150f49ef
2013-10-24 20:06:08 -05:00
Nate Jensen
cf63b37257 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]
Former-commit-id: 5a99163569
2013-10-24 20:02:18 -05:00
Nate Jensen
803c9a8217 Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]
Former-commit-id: b1244552e4
2013-10-24 19:52:13 -05:00
Nate Jensen
fc1898234d Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development
Former-commit-id: 5d96feb00e [formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]
Former-commit-id: 298114500c
2013-10-24 19:51:49 -05:00
Dave Hladky
2b5ffeab74 Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]
Former-commit-id: 36d7c60914
2013-10-24 13:52:45 -05:00
Jonathan Sanchez
2420f1a231 Issue #2496 Updated gfe spring files to support GFE grids in hazard services.
Change-Id: Icd58f77266a9e6c67c001badcdd1f7590640b162

Former-commit-id: ec2f7c8ce7 [formerly 0946721292171cc2d14b173a60c273731b73af12]
Former-commit-id: cb5ac5c835
2013-10-24 12:22:02 -05:00
Benjamin Phillippe
041ce07803 Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager
Change-Id: I7e0e98517ff7d2213957004c6a94e38cf7063cce

Former-commit-id: be09ba9fcf [formerly 40fec1c49a0a4aa2ecb4afdf4cf225e6359efd28]
Former-commit-id: 0905d6ffdd
2013-10-24 11:51:11 -05:00
Bryan Kowal
3c6f5cc08f Merge branch 'development' into development_on_RHEL6
Former-commit-id: a7b85498ef [formerly 1bfc1a0c02691dfe620909a8c551fa2a79c5a484]
Former-commit-id: 49eed21398
2013-10-24 11:32:04 -05:00
Ben Steffensmeier
d927e6b2d7 Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]
Former-commit-id: fa0a0619bc
2013-10-24 11:28:06 -05:00
Dave Hladky
14ea0393a1 Issue #2469 Refined deletion of adhoc subs.
Former-commit-id: 988bb90523 [formerly f8d93b233f32623864f86edf822b77b68aa5e0a0]
Former-commit-id: 6b5543501a
2013-10-24 09:32:41 -05:00
Brad Gonzales
c36cbae577 Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs
on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box.

Amend: Added excludes to sbnSimulator modes.
       Updated FileUtil.listPaths to close the stream and use a LinkedList.
       Added additional logging to SbnSimulator.

Change-Id: I89ff7d4afdd18ba51b8fd4812bb0b871ffc6d3af

Former-commit-id: bd7e5d8940 [formerly f9e593974811896dec76c512c2a76b5769c7a68a]
Former-commit-id: f7a635ebef
2013-10-23 18:44:41 -05:00
Richard Peter
f71d65d257 Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
Former-commit-id: 2220ce9aa3 [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]
Former-commit-id: b5072746fe
2013-10-23 16:57:28 -05:00
Richard Peter
383a774fad Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development
Former-commit-id: 5fc3956337 [formerly 381be8f02831002b29a8a90831b1c116d023c48f]
Former-commit-id: 1750224476
2013-10-23 16:53:22 -05:00
Richard Peter
109474aec7 Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development
Former-commit-id: 7ec76c0634 [formerly 3054f3682a955395f381d3d9c78728c4a4492b69]
Former-commit-id: 6b4c675600
2013-10-23 16:41:57 -05:00
Richard Peter
1b74f629f7 Merge "Issue #1538 Reworked registry database connection strategy" into development
Former-commit-id: 58d4da8db6 [formerly 2051ba7e62c8ba4fc953917bd0be72afbdacae76]
Former-commit-id: ffb7a6e6ae
2013-10-23 16:33:29 -05:00
Ron Anderson
20fcbd322e Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089

Former-commit-id: 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]
Former-commit-id: cc28fca175
2013-10-23 16:02:40 -05:00
Richard Peter
6ecb80e892 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]
Former-commit-id: 14d5b8656e
2013-10-23 15:50:25 -05:00
Nate Jensen
1adac8829f Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]
Former-commit-id: 2f79b34a77
2013-10-23 14:52:29 -05:00
Brad Gonzales
b8cd1d5446 Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler.
Amend: Also applied old patch to fix tool tips on message bar.

Change-Id: I2f83bbd07be9cb07d51c23a7e068144692f44771

Former-commit-id: 60d7a13afd [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]
Former-commit-id: e3883dba15
2013-10-23 14:13:03 -05:00
Nate Jensen
6bd779e459 Merge "Issue #2361 once again try to remove more common ISerializableObject" into development
Former-commit-id: 4c7bee41a7 [formerly 5ec014c2fccf9b5e417738310b50beccd70ee62d]
Former-commit-id: 65962ae15a
2013-10-23 14:00:28 -05:00
Benjamin Phillippe
c07e7fac10 Issue #1682 Fixed registry query that prevented deletions of subscriptions
Change-Id: I92da9f43cfb86711d6238c07a86cad94742777f2

Former-commit-id: 22c8ed7add [formerly b3ef0276414f5009f79e55e3b08c58daeeb56e26]
Former-commit-id: 3a3fb00f78
2013-10-23 13:03:25 -05:00
Nate Jensen
f782d20320 Issue #2361 once again try to remove more common ISerializableObject
Change-Id: I149fa1009b2d85b2c2f5e9247515eecb835dad09

Former-commit-id: 40d8e42b87 [formerly 05585a1d0f9fdab55c8ad2ce83d8e979450521ba]
Former-commit-id: 4b80a31f22
2013-10-23 11:40:13 -05:00
Benjamin Phillippe
84d5c28331 Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer
Change-Id: I2d22199f9e1e35b3425e294ce3884ebb9d2cc99f

Former-commit-id: cd55f3e328 [formerly 18737abc6781a353b831d9c012cc293f60731f89]
Former-commit-id: 68eeb03630
2013-10-23 11:05:38 -05:00
Benjamin Phillippe
5aa04a9a43 Issue #1538 Reworked registry database connection strategy
Change-Id: I6c8a18946ec9cecbd91ac5fbc48407841f28e7ae

Former-commit-id: b192fd81c4 [formerly e9e4d1ae4bbe6098f637dbca64f684c90313d478]
Former-commit-id: ef0d0e2393
2013-10-23 10:48:40 -05:00
Richard Peter
7e171abbb8 Merge "Issue #1538 Made http timeouts configurable on registry service http connections" into development
Former-commit-id: 4776e83979 [formerly a12bc6ddd2fd4388fc541015926e2e51aa40e090]
Former-commit-id: 9cf347fe7f
2013-10-23 10:01:00 -05:00
Benjamin Phillippe
16b21fe41c Issue #1538 Made http timeouts configurable on registry service http connections
Change-Id: I2f91b713475027a3e514d0fd98605fc83bdac447

Former-commit-id: dd57ea1cd4 [formerly cf9f51098a2778f747984940a764ab5089afd231]
Former-commit-id: 2c39b78ded
2013-10-23 09:57:52 -05:00
Dave Hladky
5ca57c8edd Issue #2454 Ice model, general ensemble model troubles, null cycle times
Former-commit-id: ba2e1ed3fc [formerly 5fd82b153d87228037e594c838dc3c445c8874aa]
Former-commit-id: 94b5bd79f9
2013-10-22 16:48:54 -05:00
Nate Jensen
d8a821746c Merge "Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image." into development
Former-commit-id: 50bf735240 [formerly 41462b804bf079368bead7c1271b1abdb7d4bf63]
Former-commit-id: aa0554d073
2013-10-21 14:44:17 -05:00