Commit graph

4077 commits

Author SHA1 Message Date
Steve Harris
f25d638bc2 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]
Former-commit-id: 560b0075cd
Former-commit-id: a103a0e8ac
2013-10-28 15:58:12 -05:00
Nate Jensen
c1a5165bf9 Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]
Former-commit-id: ac65672cb2
Former-commit-id: 4cd0b3fed7
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
642e80aadb Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07

Former-commit-id: 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]
Former-commit-id: 65522e83c9
Former-commit-id: 4e86bb8e5f
2013-10-28 13:16:23 -05:00
Ron Anderson
283404400d Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]
Former-commit-id: fa5b6dce02
Former-commit-id: dd3ef2844c
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
ef2a281d45 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]
Former-commit-id: 27165cea30
Former-commit-id: 0c66089721
2013-10-28 10:14:08 -05:00
Nate Jensen
3843a2fe2d Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: cda57ce742 [formerly ca2e057635 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]
Former-commit-id: ca2e057635
Former-commit-id: b8d194e4cd
2013-10-28 09:31:28 -05:00
Nate Jensen
ea89d218a8 Issue #2359 fix for extra long messages
Former-commit-id: 3abe5b9f18 [formerly 665e224c75 [formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]
Former-commit-id: 665e224c75
Former-commit-id: e7763c0864
2013-10-28 09:15:20 -05:00
Nate Jensen
9e65845da0 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]
Former-commit-id: 4b19d287ea
Former-commit-id: 13eafc05c2
2013-10-28 09:07:04 -05:00
Nate Jensen
fe6680fb56 Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]
Former-commit-id: 5840b34e67
Former-commit-id: f98764cfb6
2013-10-28 09:05:01 -05:00
Nate Jensen
16ff44c65a Merge "Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins." into development
Former-commit-id: 70421fd756 [formerly 6dd1198fdf [formerly d4adddcf9b5e860cb4976535a1b2309f8fd47783]]
Former-commit-id: 6dd1198fdf
Former-commit-id: 8ca435c9e7
2013-10-28 09:04:12 -05:00
Ben Steffensmeier
e796e01586 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]
Former-commit-id: 2a83b45f93
Former-commit-id: 3b68ce8d72
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
54130af4c9 Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]
Former-commit-id: 88ad284e71
Former-commit-id: a629f974a5
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
230309c25f Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]
Former-commit-id: c14cc609a8
Former-commit-id: f34bfc1e5b
2013-10-25 15:31:39 -05:00
Ben Steffensmeier
bb59c04696 Issue #2491 fix d2d xy bundles.
Former-commit-id: 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]
Former-commit-id: 5b6e32f47e
Former-commit-id: 9922b11f75
2013-10-25 14:46:43 -05:00
Nate Jensen
2903ad6e2b Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 68150f49ef [formerly 5f457fbad6 [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]
Former-commit-id: 5f457fbad6
Former-commit-id: 540d0ee576
2013-10-24 20:06:08 -05:00
Nate Jensen
2c88b7d9b3 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]
Former-commit-id: 002005139f
Former-commit-id: 3a453d5442
2013-10-24 20:02:18 -05:00
Nate Jensen
c513cbaa22 Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]
Former-commit-id: b17fc59a5a
Former-commit-id: 408ea200fc
2013-10-24 19:52:13 -05:00
Nate Jensen
5e54da3258 Merge "Issue #2454 Ice model, general ensemble model troubles, null cycle times" into development
Former-commit-id: 298114500c [formerly 5d96feb00e [formerly 58686a03e01b6d151b3774bd63ee55b0276b1880]]
Former-commit-id: 5d96feb00e
Former-commit-id: b2cdbd6fc5
2013-10-24 19:51:49 -05:00
Dave Hladky
68002da957 Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]
Former-commit-id: 3c33f6e5ea
Former-commit-id: 577e2b84e9
2013-10-24 13:52:45 -05:00
Jonathan Sanchez
2c38de5fc5 Issue #2496 Updated gfe spring files to support GFE grids in hazard services.
Change-Id: Icd58f77266a9e6c67c001badcdd1f7590640b162

Former-commit-id: cb5ac5c835 [formerly ec2f7c8ce7 [formerly 0946721292171cc2d14b173a60c273731b73af12]]
Former-commit-id: ec2f7c8ce7
Former-commit-id: c289f77965
2013-10-24 12:22:02 -05:00
Bryan Kowal
e72cf1aa46 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 49eed21398 [formerly a7b85498ef [formerly 1bfc1a0c02691dfe620909a8c551fa2a79c5a484]]
Former-commit-id: a7b85498ef
Former-commit-id: 6e0737e65f
2013-10-24 11:32:04 -05:00
Ben Steffensmeier
f98448d19f Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]
Former-commit-id: bfc3faf08f
Former-commit-id: a935ffadf7
2013-10-24 11:28:06 -05:00
Bryan Kowal
d67bbce7f3 Issue #2476 - re-compile 64-bit jep for RHEL6
Former-commit-id: 8036733372 [formerly 4c3cdbb28e [formerly f4fc8fb61073ffd0ed88e9ac5520d9b538481516]]
Former-commit-id: 4c3cdbb28e
Former-commit-id: 069cb9645e
2013-10-23 17:12:02 -05:00
Richard Peter
ddcfb3785f Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
Former-commit-id: b5072746fe [formerly 2220ce9aa3 [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]
Former-commit-id: 2220ce9aa3
Former-commit-id: 32131b3b27
2013-10-23 16:57:28 -05:00
Richard Peter
6d62f99937 Merge "Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer" into development
Former-commit-id: 1750224476 [formerly 5fc3956337 [formerly 381be8f02831002b29a8a90831b1c116d023c48f]]
Former-commit-id: 5fc3956337
Former-commit-id: 859dd8272d
2013-10-23 16:53:22 -05:00
Richard Peter
3cd286ba60 Merge "Issue #1682 Fixed registry query that prevented deletions of subscriptions" into development
Former-commit-id: 6b4c675600 [formerly 7ec76c0634 [formerly 3054f3682a955395f381d3d9c78728c4a4492b69]]
Former-commit-id: 7ec76c0634
Former-commit-id: 2e7836431e
2013-10-23 16:41:57 -05:00
Richard Peter
e79bc34c91 Merge "Issue #1538 Reworked registry database connection strategy" into development
Former-commit-id: ffb7a6e6ae [formerly 58d4da8db6 [formerly 2051ba7e62c8ba4fc953917bd0be72afbdacae76]]
Former-commit-id: 58d4da8db6
Former-commit-id: b6541dfb40
2013-10-23 16:33:29 -05:00
Ron Anderson
68ef7c7062 Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089

Former-commit-id: cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]
Former-commit-id: 002bb6ab89
Former-commit-id: 680ba97826
2013-10-23 16:02:40 -05:00
Nate Jensen
60e33eb620 Merge "Issue #2361 remove dependencies on mesowest and delete dead grichardson code" into development
Former-commit-id: dc11d7be9e [formerly 334e1d4da7 [formerly 1c3b27e873403cd9a78d3ef38948ba41511cbebd]]
Former-commit-id: 334e1d4da7
Former-commit-id: 12b3aea7bf
2013-10-23 15:58:44 -05:00
Richard Peter
9b5d2fa69f Merge branch 'development' into development_on_RHEL6
Conflicts:
	cots/org.jep.linux64/libjep.so

Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d

Former-commit-id: 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]
Former-commit-id: cb33f5ada7
Former-commit-id: f69bbf7952
2013-10-23 15:50:25 -05:00
Bryan Kowal
554b8ed515 Issue #2476 - recompiled Jep for Windows
Former-commit-id: 79f2f2694f [formerly 0e1c5b51ba [formerly 408bf5a265f558f22d86295e2c541166868d8d1b]]
Former-commit-id: 0e1c5b51ba
Former-commit-id: 243ffb4b93
2013-10-23 15:12:42 -05:00
Bryan Kowal
3cecffdc41 Issue #2476 - recompiled jep for Linux
Former-commit-id: 9fe5429068 [formerly a3cfae3510 [formerly b33a29abbb89d392b7bba2862db4b3d06b2c24a5]]
Former-commit-id: a3cfae3510
Former-commit-id: 701b9de382
2013-10-23 15:12:42 -05:00
Nate Jensen
bd9578dd6d Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]
Former-commit-id: 477c64c8bd
Former-commit-id: 65d7d4dac9
2013-10-23 14:52:29 -05:00
Brad Gonzales
3a450cd3c0 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: e3883dba15 [formerly 60d7a13afd [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]]
Former-commit-id: 60d7a13afd
Former-commit-id: df1e60b078
2013-10-23 14:13:03 -05:00
Nate Jensen
55fd890223 Issue #2359 better email addresses
Former-commit-id: b56c67a8fb [formerly a609706b5e [formerly 03be0960bfbbd8072166bc0a06e4100538dbc7ca]]
Former-commit-id: a609706b5e
Former-commit-id: fd55a9792d
2013-10-23 14:02:31 -05:00
Nate Jensen
dd641d8c1a Merge "Issue #2361 once again try to remove more common ISerializableObject" into development
Former-commit-id: 65962ae15a [formerly 4c7bee41a7 [formerly 5ec014c2fccf9b5e417738310b50beccd70ee62d]]
Former-commit-id: 4c7bee41a7
Former-commit-id: d3a21bc431
2013-10-23 14:00:28 -05:00
Benjamin Phillippe
142639abf7 Issue #1682 Fixed registry query that prevented deletions of subscriptions
Change-Id: I92da9f43cfb86711d6238c07a86cad94742777f2

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

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

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

Former-commit-id: ef0d0e2393 [formerly b192fd81c4 [formerly e9e4d1ae4bbe6098f637dbca64f684c90313d478]]
Former-commit-id: b192fd81c4
Former-commit-id: 16cf053ba9
2013-10-23 10:48:40 -05:00
Richard Peter
9f05ea1112 Merge "Issue #1682 Delta script for ebxml registry query changes" into development
Former-commit-id: 598c254561 [formerly d371192e2b [formerly 07df23bc04234340a3c2386c3279195c45cdb427]]
Former-commit-id: d371192e2b
Former-commit-id: 6fb995ca9f
2013-10-23 10:02:12 -05:00
Benjamin Phillippe
9617e2ee10 Issue #1682 Delta script for ebxml registry query changes
Change-Id: I84a3007a3c23697c333e5862d8fd4a4aba9f23a2

Former-commit-id: 02dc390b98 [formerly 0c56d5e859 [formerly 9b6a0ce7404017dcd29cd0a14f0dba5d30e480b1]]
Former-commit-id: 0c56d5e859
Former-commit-id: d0c3d9575a
2013-10-23 10:01:34 -05:00
Richard Peter
8dc43c5bc1 Merge "Issue #1538 Made http timeouts configurable on registry service http connections" into development
Former-commit-id: 9cf347fe7f [formerly 4776e83979 [formerly a12bc6ddd2fd4388fc541015926e2e51aa40e090]]
Former-commit-id: 4776e83979
Former-commit-id: d7036ceeb4
2013-10-23 10:01:00 -05:00
Benjamin Phillippe
23af775648 Issue #1538 Made http timeouts configurable on registry service http connections
Change-Id: I2f91b713475027a3e514d0fd98605fc83bdac447

Former-commit-id: 2c39b78ded [formerly dd57ea1cd4 [formerly cf9f51098a2778f747984940a764ab5089afd231]]
Former-commit-id: dd57ea1cd4
Former-commit-id: 71168e4791
2013-10-23 09:57:52 -05:00
Lee Venable
1a52e2b388 Issue #2483 - Fixed image memory leak.
Former-commit-id: 3d6547d644 [formerly a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]
Former-commit-id: a2f75e547d
Former-commit-id: 73caae724c
2013-10-23 08:26:49 -05:00
Dave Hladky
589f99beb8 Issue #2454 Ice model, general ensemble model troubles, null cycle times
Former-commit-id: 94b5bd79f9 [formerly ba2e1ed3fc [formerly 5fd82b153d87228037e594c838dc3c445c8874aa]]
Former-commit-id: ba2e1ed3fc
Former-commit-id: 7659bcd183
2013-10-22 16:48:54 -05:00
Nate Jensen
d936dc839d Merge "Issue #2361 undo loading maps at startup" into development
Former-commit-id: 88ca2a78de [formerly ced02a508a [formerly 9e3b9ba67aafbcb0bfe7de147d00c44aa37403ac]]
Former-commit-id: ced02a508a
Former-commit-id: 0e5ea7744e
2013-10-22 13:05:22 -05:00
Nate Jensen
4879e1d7d3 Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 938e4a3073 [formerly 5e2ebbaad8 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]]
Former-commit-id: 5e2ebbaad8
Former-commit-id: e65d392677
2013-10-22 12:42:41 -05:00
Slav Korolev
34300d63a1 Issue #2455. Fixed error from test.
Former-commit-id: 981544290e [formerly 359c281b1e [formerly 86967352eba1893eb4ec40187638bfc33d06cc21]]
Former-commit-id: 359c281b1e
Former-commit-id: f64d667715
2013-10-22 12:34:34 -04:00
Richard Peter
dfae264dad Merge "Issue #2476 fix in a better way the rare leak of local references of java args being passed to java methods" into development
Former-commit-id: 7f48bb07b6 [formerly d44293baa9 [formerly 7e62204e22f4c12d4baa38bf416df3cf72b2d8a1]]
Former-commit-id: d44293baa9
Former-commit-id: ca57f47081
2013-10-21 17:49:27 -05:00