Commit graph

5212 commits

Author SHA1 Message Date
Mike Duff
8f8f5ddd1c Issue #2864 - Change how saved subset files are stored.
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c

Former-commit-id: 3404a4beb4 [formerly a58f279b54] [formerly 82cf444d6f] [formerly 3404a4beb4 [formerly a58f279b54] [formerly 82cf444d6f] [formerly 890faf2d73 [formerly 82cf444d6f [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]]]
Former-commit-id: 890faf2d73
Former-commit-id: 6e9e743fdc [formerly dc2a5b0c6f] [formerly ddc580d7996e5dbb65fac9aa71fcaadccf9ac671 [formerly 6d8bead4a7]]
Former-commit-id: 4c9cab1bca5ff66392871ba348388ee4d9e61894 [formerly 583a4b1cea]
Former-commit-id: 8b46df102d
2014-04-11 08:27:42 -05:00
Nate Jensen
5fe9724c63 Merge "Issue #2694 Improve error handling" into development
Former-commit-id: 0ff3ad4f05 [formerly 288aa9b52c] [formerly e327184bdc] [formerly 0ff3ad4f05 [formerly 288aa9b52c] [formerly e327184bdc] [formerly 9357bdfb0e [formerly e327184bdc [formerly a8707e3914a48b27d428340240eaa3eff48832f7]]]]
Former-commit-id: 9357bdfb0e
Former-commit-id: 0137516622 [formerly 64f44d5e6c] [formerly 53e8e082e02b254f2a246e4a78524dfcee827a0f [formerly 3151a36ead]]
Former-commit-id: 42e3c1654a8dfb0fd6ef3bc6377199329d456f20 [formerly a260797465]
Former-commit-id: fc4f5c60e6
2014-04-10 10:23:22 -05:00
Ron Anderson
137c9f7f0d Issue #2694 Improve error handling
Change-Id: I576cd4950d73fd6ce82f982dbc165e18ecb240f3

Former-commit-id: 64a9b021d6 [formerly 11f7c48504] [formerly e66c93553d] [formerly 64a9b021d6 [formerly 11f7c48504] [formerly e66c93553d] [formerly 70faf6e7aa [formerly e66c93553d [formerly b9307d47ad5dabfd9664197025b675e0103e57ad]]]]
Former-commit-id: 70faf6e7aa
Former-commit-id: 1ad7403502 [formerly 563e343ca6] [formerly 45f84345bfe6b816fa4a0b7f84b575feabcc697c [formerly 6891dab959]]
Former-commit-id: 39cb00aa0d279d762aba02c091aff94fd8d989ed [formerly 3886fae260]
Former-commit-id: b5adcd9707
2014-04-10 10:11:22 -05:00
Brad Gonzales
c091089ad7 Issue #2937 Consolidated LogEntry to string and from string conversions in utility
methods.  Made LogEntry immutable.  Error handling updates processing LogEntries
read from the log and when processing room updates.

Amend: Create new DateFormatter for the the DetailedFeedLogPlugin purge thread.
       Added patterns and pipe constant to LogEntry.

Change-Id: I0d4963a54f5cf9fe236fef46fdd41f6c6822a0db

Former-commit-id: 19f4b1b64a [formerly fe95275a34] [formerly 056dbdbdff] [formerly 19f4b1b64a [formerly fe95275a34] [formerly 056dbdbdff] [formerly d50f39e98d [formerly 056dbdbdff [formerly 38594a026e343bcf9db7d55816ae29fa77716f05]]]]
Former-commit-id: d50f39e98d
Former-commit-id: ce28c5b32a [formerly 7472fb8084] [formerly fdd1fbec562ec709c2e1ddc6bf77a84a8df0074a [formerly 178e4fe8bb]]
Former-commit-id: 594fbd7a5cd20c9d9e2c10b81e484a4e90c1d0e0 [formerly ebcb2cb414]
Former-commit-id: 60f66cda85
2014-04-09 18:47:09 -05:00
Richard Peter
81522eea15 Merge "Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks." into development
Former-commit-id: 4e4a4a955b [formerly 8925673f3c] [formerly 394a41738f] [formerly 4e4a4a955b [formerly 8925673f3c] [formerly 394a41738f] [formerly 8b98ee101c [formerly 394a41738f [formerly cfbbae53d8466f647a7258047604bb10c9fef682]]]]
Former-commit-id: 8b98ee101c
Former-commit-id: cfe3c6a7af [formerly 923b6887dc] [formerly d7aced76be64291849b374dda327ee3a084f3600 [formerly dfd19e7904]]
Former-commit-id: b2f0d623b1434355679fafffa4fa118315d8083b [formerly 7a66487514]
Former-commit-id: 79e207774f
2014-04-09 16:42:31 -05:00
Nate Jensen
0dd650eb92 Merge "Issue #2907 fix redbook decoding of month" into development
Former-commit-id: b1dfcd4c63 [formerly a7776cf961] [formerly 3aa8d0bfea] [formerly b1dfcd4c63 [formerly a7776cf961] [formerly 3aa8d0bfea] [formerly 01834f722a [formerly 3aa8d0bfea [formerly e8054a6cba060649a2bbe31ce4f2d8c704150ecf]]]]
Former-commit-id: 01834f722a
Former-commit-id: 22724017f5 [formerly 889db28e82] [formerly dbef326ddea1bc9331d7019a1f20c7f9c1eafd4e [formerly dac775ed4e]]
Former-commit-id: 6ab9787fe1f4a0b0bffa9f7fbe95b7309ad03e0e [formerly ab92e421cb]
Former-commit-id: 00fea2a73c
2014-04-09 16:10:45 -05:00
Nate Jensen
163dbc6762 Issue #2907 fix redbook decoding of month
Change-Id: Ieccea813452ba5708f039ea8aad0fd6f83c16f9a

Former-commit-id: 3f08f9e032 [formerly 8b9e22751a] [formerly 411779ce6f] [formerly 3f08f9e032 [formerly 8b9e22751a] [formerly 411779ce6f] [formerly 5905ff0dcf [formerly 411779ce6f [formerly 74340639a9522668ea6b2113771d5828919c7f02]]]]
Former-commit-id: 5905ff0dcf
Former-commit-id: 8af38ce197 [formerly 08f3535a49] [formerly 2d6f9c59e93904ff7331c795337cf06ccc2fbf3f [formerly 0630c1bc0c]]
Former-commit-id: cbde321428a136b31742201b1ab209ca5f26af8b [formerly c1005eec2d]
Former-commit-id: 5e95530353
2014-04-09 16:07:56 -05:00
Nate Jensen
d0dc37282a Merge "Issue #2725 Add new project to alertviz feature" into development
Former-commit-id: d784482c45 [formerly 56b820ab97] [formerly ec40cb3dfc] [formerly d784482c45 [formerly 56b820ab97] [formerly ec40cb3dfc] [formerly eaf1382178 [formerly ec40cb3dfc [formerly 9cacee78da76f5da13b0a78a3e0a347a647050cf]]]]
Former-commit-id: eaf1382178
Former-commit-id: 1822ef2a7e [formerly a0e2342126] [formerly 86328e4c52cd162460d6569d863534fac351186a [formerly 952586230a]]
Former-commit-id: 25a80ca929270716b1243b0d7b6bff35ee5cfdf7 [formerly 8c6704e442]
Former-commit-id: c2f1f5542a
2014-04-09 16:07:25 -05:00
Everett Kladstrup
159fbc311c Issue #2725 Add new project to alertviz feature
Former-commit-id: e4be485bf7 [formerly 963ce8716e] [formerly e4633811fc] [formerly e4be485bf7 [formerly 963ce8716e] [formerly e4633811fc] [formerly 02b47e4d5a [formerly e4633811fc [formerly 804dae43dd8f5cfc90fb7f17c7549b5151f63c7e]]]]
Former-commit-id: 02b47e4d5a
Former-commit-id: 2c4f13742b [formerly c2a96ba985] [formerly feed7806f268e67eb9fd6dedff48a2ee5e474222 [formerly 55638c0916]]
Former-commit-id: 2422c429e6bd19bb6e0015c95fb3b4e1082f5fa2 [formerly a00b1dd9f6]
Former-commit-id: de0f935f69
2014-04-09 16:01:57 -05:00
Nate Jensen
6e7aafce71 Merge "Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps." into development
Former-commit-id: 3a88116cb1 [formerly ad961bb84d] [formerly 0dd55f63ba] [formerly 3a88116cb1 [formerly ad961bb84d] [formerly 0dd55f63ba] [formerly 88d0e400fb [formerly 0dd55f63ba [formerly 4d91a4fedbba2164f1e11a2fbaea8e0b1dbe6340]]]]
Former-commit-id: 88d0e400fb
Former-commit-id: d39ebe23fe [formerly dfac2a42c2] [formerly 3475ac1a7fc2f3432054d40ed5ff81e416e0c344 [formerly a2c4c63852]]
Former-commit-id: ac447025122f51366daee7f2a658479bf013990f [formerly 5a2f9a2e04]
Former-commit-id: 560bdaf4c8
2014-04-09 14:07:09 -05:00
Everett Kladstrup
5a57115156 Issue #2725 Remove datacube plugin from viz.core feature
Former-commit-id: ffdcf503ca [formerly b670fa67f6] [formerly 50346d5aec] [formerly ffdcf503ca [formerly b670fa67f6] [formerly 50346d5aec] [formerly ef21ea5c1f [formerly 50346d5aec [formerly 1c72a291c9623f3930ca71da67e87ef884c81a94]]]]
Former-commit-id: ef21ea5c1f
Former-commit-id: dfbf285867 [formerly fd9bd8282a] [formerly 2969dd971742c263227ae7f907962d513b487eaf [formerly 9faba2afbf]]
Former-commit-id: d15efafa7449f648ef9bc459525b92bda4fbdc24 [formerly 21c7199512]
Former-commit-id: 136af85d0c
2014-04-09 13:59:11 -05:00
Roger Ferrel
d80872ab60 Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908

Former-commit-id: 76883956dd [formerly 032ee7ef77] [formerly 226b1be015] [formerly 76883956dd [formerly 032ee7ef77] [formerly 226b1be015] [formerly c86d738d5b [formerly 226b1be015 [formerly 09e4f116a482f2a197c01cdec3609e10e1d2285d]]]]
Former-commit-id: c86d738d5b
Former-commit-id: e6938244b4 [formerly eec1d22987] [formerly 553d6ed782fb095faff61739f4995edf91a39016 [formerly 0d85ae72e0]]
Former-commit-id: 60458c98c7fe869e82691802e91bc0911c1ddf00 [formerly 388ea1349a]
Former-commit-id: 6508e30611
2014-04-09 13:57:55 -05:00
Everett Kladstrup
d10f5398f1 Issue #2725 Add new plugin to uf.viz.base feature
Former-commit-id: 11e432a9a5 [formerly 91673b18b0] [formerly 8d918404d5] [formerly 11e432a9a5 [formerly 91673b18b0] [formerly 8d918404d5] [formerly 28364c8618 [formerly 8d918404d5 [formerly 828a32f1753a40613bb0351281458bee1d45cba6]]]]
Former-commit-id: 28364c8618
Former-commit-id: 9248f426c8 [formerly d968a60023] [formerly b46b79c0e0435ebeaaed5f2f37fbfa85e03a4d6f [formerly 378193b61f]]
Former-commit-id: 25f241f16c489ee231c138e8ae79c0dc863411ab [formerly 64dad45a1c]
Former-commit-id: 619ccff21b
2014-04-09 13:43:09 -05:00
Ben Steffensmeier
98ed8197a6 Issue #2950 Fix GL errors when mosaicing or using ginormous colormaps.
Former-commit-id: e74539a3e3 [formerly 9c5eb936d3] [formerly 5328415054] [formerly e74539a3e3 [formerly 9c5eb936d3] [formerly 5328415054] [formerly daff2b9d9d [formerly 5328415054 [formerly 67302674101992ae5416f342f92acab9233a113d]]]]
Former-commit-id: daff2b9d9d
Former-commit-id: 73083d370e [formerly 88f5dbe81d] [formerly f590a0574524916e7a70b9bcfcc701a011f106d2 [formerly f5271a94d6]]
Former-commit-id: 26cb4d1f5baa3c690d78e05d00e4e06ea1cc98a8 [formerly cf81a60e7c]
Former-commit-id: 28f06f5bfc
2014-04-09 13:19:21 -05:00
Richard Peter
044170c8ad Merge "Issue #2725 Post "derived parameter move" changes" into development
Former-commit-id: 44b93e4838 [formerly bf4617bc39] [formerly c6dd5bee41] [formerly 44b93e4838 [formerly bf4617bc39] [formerly c6dd5bee41] [formerly c1dde5cb3a [formerly c6dd5bee41 [formerly 635ea082393013a6967f177c419204197c9741f2]]]]
Former-commit-id: c1dde5cb3a
Former-commit-id: 5fd5d98f2f [formerly caa3b3c51f] [formerly a38cd0faf22d09b2b5d25515bb7c697eecfaf19e [formerly 4084c12c27]]
Former-commit-id: 3c8897167aca6977d94e55338fedbbe17d3459c3 [formerly f9619588bd]
Former-commit-id: 80ad3d483f
2014-04-09 11:37:09 -05:00
Nate Jensen
35d43dfe6a Merge "Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist" into development
Former-commit-id: af412382b6 [formerly 187a895056] [formerly b58bb8500c] [formerly af412382b6 [formerly 187a895056] [formerly b58bb8500c] [formerly 2c2e324401 [formerly b58bb8500c [formerly c66a85a125bb590abad607eb751b0baf9c07a3ba]]]]
Former-commit-id: 2c2e324401
Former-commit-id: 344f074849 [formerly f574c535f5] [formerly 94cbd5ff0ac104e99e8caffdaf43085926994028 [formerly 8999051f04]]
Former-commit-id: 4c9a2d7ed684eeb57227da279bc197467712447c [formerly 4af6b91229]
Former-commit-id: edc55ee2ca
2014-04-09 11:22:07 -05:00
Nate Jensen
66f604ece7 Merge "Issue #2950 Add option to interpolate image colors." into development
Former-commit-id: 5aa9e39af6 [formerly 0da28c9c7a] [formerly 1f2809ced0] [formerly 5aa9e39af6 [formerly 0da28c9c7a] [formerly 1f2809ced0] [formerly d729cc70af [formerly 1f2809ced0 [formerly 1db00446a00b6cd268b169871eadd1bef407e268]]]]
Former-commit-id: d729cc70af
Former-commit-id: 4281ca0951 [formerly 6f36916c31] [formerly 4e3e0a1ac7417f8887477ecc5573ff6370319711 [formerly c460736793]]
Former-commit-id: f7341b81d2f73ce291feb0437ee52d12ce610a73 [formerly 91ef6f7b9c]
Former-commit-id: 801f6f7a5c
2014-04-09 11:20:59 -05:00
Everett Kladstrup
a3f44810f9 Issue #2725 Post "derived parameter move" changes
* move derived parameter definitions to base localization level
* remove java 7 exception constructor from inventory plugin
* move python function adapter to derivparam.python plugin


Former-commit-id: e222fc706e [formerly 0e88702cea] [formerly 16b4c9253e] [formerly e222fc706e [formerly 0e88702cea] [formerly 16b4c9253e] [formerly 41b154802c [formerly 16b4c9253e [formerly c54110914a3a64a2ea7c22093327c9e0d84689b2]]]]
Former-commit-id: 41b154802c
Former-commit-id: 4c979bd398 [formerly 2ace82f815] [formerly bbcf6ba629d8e4a1649178671bcae72d11e64f57 [formerly f6bf1f43bd]]
Former-commit-id: 10f940c3c864c69ac5c7993834bc5f3162aceaca [formerly a89211f60a]
Former-commit-id: abf4bd55a1
2014-04-09 11:20:14 -05:00
Nate Jensen
e2273ed91d Merge "Issue #2950 Support dynamic color counts for color map editing." into development
Former-commit-id: 992a00b18c [formerly 6989999e95] [formerly 5129002e91] [formerly 992a00b18c [formerly 6989999e95] [formerly 5129002e91] [formerly 5bad21f3e6 [formerly 5129002e91 [formerly b196bf0463ea59d55dec4e70373ca731152123f9]]]]
Former-commit-id: 5bad21f3e6
Former-commit-id: 7c7b5851a7 [formerly 58516f3a9f] [formerly 80e6eaeae66bf6576685319ea3e0cf04186e38c2 [formerly 92f0182d3f]]
Former-commit-id: a18f7fab710c311296f870364da3764831a1befa [formerly a08e3a4f1a]
Former-commit-id: 4fe2e3a01b
2014-04-09 11:20:04 -05:00
Mike Duff
5c337b904a Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133

Former-commit-id: 981306d474 [formerly 5e39f5a61c] [formerly 23474c5ead] [formerly 981306d474 [formerly 5e39f5a61c] [formerly 23474c5ead] [formerly eafa177f4b [formerly 23474c5ead [formerly a1f94a19ba7f0bff7bbf76fa24ff6ace9019d0f1]]]]
Former-commit-id: eafa177f4b
Former-commit-id: 612ee41f8d [formerly 1363155c34] [formerly 6b9f38ad83f0cd349b068977532f23df7c700056 [formerly ee80debc36]]
Former-commit-id: c2d92de63f38a5b736fc7c0860072fcf815a1662 [formerly 6e6ac425af]
Former-commit-id: 494c577a1b
2014-04-09 10:17:22 -05:00
Richard Peter
f302a409bb Merge "Issue #2725 Move derived parameters logic to common" into development
Former-commit-id: b86321616b [formerly 16e1018dd9] [formerly ea4d09c674] [formerly b86321616b [formerly 16e1018dd9] [formerly ea4d09c674] [formerly ed25b71ff1 [formerly ea4d09c674 [formerly d97da3eb67c00a8d5bf1af0fae453fa9c96aacc4]]]]
Former-commit-id: ed25b71ff1
Former-commit-id: 8ee15aba37 [formerly a32e066d95] [formerly 4968784e25043d1fa4fe8bf73e2308272466e2d1 [formerly ce7e0f9a31]]
Former-commit-id: a490ece0103acf148ef362bd1b98df41db0c1f2e [formerly 5fd6492386]
Former-commit-id: 17f405cbaa
2014-04-09 09:33:56 -05:00
Nate Jensen
58c07a218e Merge "Issue #2920 Fix serialization of DrawStringEvent." into development
Former-commit-id: c8ed059461 [formerly 6aa42816ec] [formerly abee6815ad] [formerly c8ed059461 [formerly 6aa42816ec] [formerly abee6815ad] [formerly 143c3e1801 [formerly abee6815ad [formerly 663db14c5fa57c1d9ccd9c3d6ef82862d330a4b4]]]]
Former-commit-id: 143c3e1801
Former-commit-id: 165ad12513 [formerly 9899b9ecab] [formerly ad20b8d2488e9d35df5bb49d9b58237c03c3af22 [formerly 0ea487feec]]
Former-commit-id: 52cbf448115dddeb4a8cd70fdc4c877e2f8b568a [formerly 030857c8a9]
Former-commit-id: a396472116
2014-04-09 09:32:39 -05:00
Everett Kladstrup
f815fbcb60 Issue #2725 Move derived parameters logic to common
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 29ce7781c9 [formerly 86bf2b5ea0] [formerly eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc]]
Former-commit-id: 41d01092799ccea952f65c9d6b66d93b56557541 [formerly d96b56c91a]
Former-commit-id: 7b2683532a
2014-04-09 09:31:12 -05:00
Ben Steffensmeier
7cab1bdb01 Issue #2920 Fix serialization of DrawStringEvent.
Former-commit-id: b921f6bb4e [formerly d09b87736a] [formerly 0abf71f719] [formerly b921f6bb4e [formerly d09b87736a] [formerly 0abf71f719] [formerly d43e5abf29 [formerly 0abf71f719 [formerly d88bdcccb805896e32766373bc07185364741d4e]]]]
Former-commit-id: d43e5abf29
Former-commit-id: 02596282ca [formerly 41e508b0da] [formerly 1eb3a1fd0725f2b68c866f6793a038c710d184f7 [formerly 6327c3a673]]
Former-commit-id: 3402d4e3cdc37ca5702a999d5b5bb91df2d27bcf [formerly 4e33194b36]
Former-commit-id: b81d14f2ea
2014-04-09 09:21:45 -05:00
Nate Jensen
f25d331ee0 Merge "Issue #2785 - Change connection order of events Fixed classpath Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb" into development
Former-commit-id: 323e6beb3e [formerly 44f93acd4d] [formerly 847481950c] [formerly 323e6beb3e [formerly 44f93acd4d] [formerly 847481950c] [formerly ea3a8e29c3 [formerly 847481950c [formerly 2f4d6ca7b78e40d11a3dbfd66969681ddd2135fd]]]]
Former-commit-id: ea3a8e29c3
Former-commit-id: d252a00965 [formerly 7a9f211997] [formerly 2d66ea60e65694f8edb4f2b29eaafcecb6c33f34 [formerly e99ad67ada]]
Former-commit-id: f491d7a9948a90e0073d24ddc5b74ef2db239732 [formerly f487346af7]
Former-commit-id: 83917ecb21
2014-04-09 08:50:45 -05:00
Ben Steffensmeier
883474adf0 Issue #2950 Support dynamic color counts for color map editing.
Former-commit-id: c23ef56706 [formerly 9d7504e2c3] [formerly c5a48642eb] [formerly c23ef56706 [formerly 9d7504e2c3] [formerly c5a48642eb] [formerly c805a5fed7 [formerly c5a48642eb [formerly 85528bf2bbdbbaacc9631b76ef710e9fd0210110]]]]
Former-commit-id: c805a5fed7
Former-commit-id: 4c72a79253 [formerly cf3456c6cd] [formerly be88286e2cfc17a580f9a83f0f911cee38d4ed27 [formerly 16446101a4]]
Former-commit-id: 075aeccc30fd1d6a00f2c10de006958f3601b57d [formerly e0ff68736e]
Former-commit-id: 80476e1f60
2014-04-08 15:27:57 -05:00
Ben Steffensmeier
ae3e9e92cd Issue #2950 Add option to interpolate image colors.
Former-commit-id: 5dee593089 [formerly c2e028f178] [formerly bd3ad2a477] [formerly 5dee593089 [formerly c2e028f178] [formerly bd3ad2a477] [formerly 525cf4053f [formerly bd3ad2a477 [formerly 5bb0c1e3cc65fc86b48565603f2f78a4ad1e1be7]]]]
Former-commit-id: 525cf4053f
Former-commit-id: c8fa54c867 [formerly de4386e102] [formerly 417e51c1aea500c36281264f72ebb85553d4da5d [formerly 9481062a43]]
Former-commit-id: 914ded998fd1bba651ecf874ba7ca4b4574535bb [formerly 96ad01ec91]
Former-commit-id: ac3489121d
2014-04-08 15:19:00 -05:00
Nate Jensen
61e4984dda Merge "Issue #2920 Allow strings to use mulitple styles." into development
Former-commit-id: f0ef64f03c [formerly b793ce20bc] [formerly 811364eb73] [formerly f0ef64f03c [formerly b793ce20bc] [formerly 811364eb73] [formerly 3fff4e77d4 [formerly 811364eb73 [formerly 1b07e87178947df4d579dbc32057e883b61a7de2]]]]
Former-commit-id: 3fff4e77d4
Former-commit-id: df17c66980 [formerly 41a7098166] [formerly db49414e20c75fd602d8f320d136a06df8df5843 [formerly 2fdac5fec2]]
Former-commit-id: fa99e30081c43e0fe28d6f3d4ff05fc9846c5074 [formerly a87b131d94]
Former-commit-id: 7d8ea4b1cb
2014-04-08 14:28:44 -05:00
Mike Duff
dc7d97752f Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: 7c9a7d609e [formerly bdde561f8a] [formerly efefe62e0f] [formerly 7c9a7d609e [formerly bdde561f8a] [formerly efefe62e0f] [formerly 7da1547c22 [formerly efefe62e0f [formerly a2d595f4232e86606f7e2338ece59961649080a3]]]]
Former-commit-id: 7da1547c22
Former-commit-id: 6fd58b3778 [formerly 2b67272b60] [formerly 130275c111513af444bdaa0efc7abcffce08c460 [formerly 7145820d62]]
Former-commit-id: 8e79399cf0153a7c7c8746851927e35e63f1b36b [formerly 3c6c0824ce]
Former-commit-id: 2b520fe31e
2014-04-08 14:14:20 -05:00
Nate Jensen
bf16e13af2 Merge "Issue #2968 improve efficiency by only compressing/serializing persisted objects once" into development
Former-commit-id: 72c10fed8c [formerly 8bf64d8006] [formerly e7aed56884] [formerly 72c10fed8c [formerly 8bf64d8006] [formerly e7aed56884] [formerly e44d1143c0 [formerly e7aed56884 [formerly e2cd80cc4e2fbaaca7a8b34b6657a818d35cee4d]]]]
Former-commit-id: e44d1143c0
Former-commit-id: d408e99850 [formerly f7096faf91] [formerly b26bd53dda0eae57d21e4632ba4254db9a3356d4 [formerly c1e383f8bf]]
Former-commit-id: ae9cacff8e0c350130969ffb3682aab3399c96ec [formerly cfe82eb2c5]
Former-commit-id: 0bcbf71dc5
2014-04-08 13:16:45 -05:00
Nate Jensen
2feed8888a Issue #2968 improve efficiency by only compressing/serializing persisted
objects once

Change-Id: Iba90717d049571b801254852a7fd5a73202701f2

Former-commit-id: 0949264e48 [formerly 579584c346] [formerly e3df98635a] [formerly 0949264e48 [formerly 579584c346] [formerly e3df98635a] [formerly aaf2d3c8a4 [formerly e3df98635a [formerly a35a103be0818ec80c7e2d98a74782b8278b4383]]]]
Former-commit-id: aaf2d3c8a4
Former-commit-id: c557c6570a [formerly 45ccb7d7fe] [formerly a6b37f03d074f8bb7e3b6be39e76118f7884e57e [formerly 8cb284d2c2]]
Former-commit-id: 358a7f70cc06dacaf01c661c62b6e51041329f7c [formerly 773dad337d]
Former-commit-id: 65e26b4418
2014-04-08 12:59:16 -05:00
Brad Gonzales
3923191768 Issue #2694 Added missing org.codehaus.jackson dependency to com.raytheon.uf.edex.base.feature.
Amend:  removed org.codehaus.jackson dependency from com.raytheon.uf.edex.datadelivery.core.feature.

Change-Id: Id36525e4e0e4764c648a4abca938e4131b23f3e0

Former-commit-id: d1d858d68f [formerly 100252664e] [formerly 579ba2a117] [formerly d1d858d68f [formerly 100252664e] [formerly 579ba2a117] [formerly 2909580bc3 [formerly 579ba2a117 [formerly 43e4da8b175ce20c9a4f9b94b1cb243c4355e72b]]]]
Former-commit-id: 2909580bc3
Former-commit-id: d8f6c4d758 [formerly 2f5c99f364] [formerly dee7e361d3a6cf613d4f4f0be42d1bd287cf3b08 [formerly db463891cd]]
Former-commit-id: 2ee6a9b5a13cf8f3b09224f2897eccdba55c2be9 [formerly e7d2d8720e]
Former-commit-id: 0c3ca023de
2014-04-08 11:55:23 -05:00
Richard Peter
6356c0f5e6 Merge "Issue #2694 Fix dependency issues in the build." into development
Former-commit-id: c1670250bc [formerly 00ccec2f02] [formerly 98050f9c32] [formerly c1670250bc [formerly 00ccec2f02] [formerly 98050f9c32] [formerly 06c531a0f6 [formerly 98050f9c32 [formerly 88d577c5be8349367df7e29b78b31b7ea5e5ab53]]]]
Former-commit-id: 06c531a0f6
Former-commit-id: 9cb93f8e6f [formerly ca9e1c334d] [formerly 8cab7983cf33251b6ecd25d126c25cc3aa2585f4 [formerly 401eeaff70]]
Former-commit-id: 15f3c4abdfb7ecea7835e17d77a238b25ee1c3ba [formerly be925652a7]
Former-commit-id: 93b7e76a4c
2014-04-08 09:57:13 -05:00
Ron Anderson
4e0a55e0c0 Issue #2694 Fix dependency issues in the build.
Change-Id: Ie0bc386851869bb0b7e56c117193c84e5fa03e91

Former-commit-id: c46e9801c0 [formerly e71d8778c2] [formerly c20a2f2e0d] [formerly c46e9801c0 [formerly e71d8778c2] [formerly c20a2f2e0d] [formerly 5e7a694eb7 [formerly c20a2f2e0d [formerly 6f530a08a2a823ce01ef66b8e10ff52d9626de3f]]]]
Former-commit-id: 5e7a694eb7
Former-commit-id: 5062057d01 [formerly fc6a3264e0] [formerly bfdad7e72322604f8c20d3e91a463cfda783d70f [formerly bba62096a1]]
Former-commit-id: e06d35a21773e9a28ad2f2516561ce30f90922de [formerly 6d0ba04567]
Former-commit-id: 8896109c0d
2014-04-08 09:49:56 -05:00
Nate Jensen
199dcb3422 Merge "Issue #2968 fix buffer thread safety issues" into development
Former-commit-id: cb858dc39e [formerly ccb6c8fc2c] [formerly e3e5a25484] [formerly cb858dc39e [formerly ccb6c8fc2c] [formerly e3e5a25484] [formerly a03ca229e7 [formerly e3e5a25484 [formerly 30eee9a48d797c2e6cd509fd878b1b2ee759c105]]]]
Former-commit-id: a03ca229e7
Former-commit-id: c38fd5990f [formerly f16f51aa12] [formerly 0870db93156ebb3d82d832d6ebde4a0411034deb [formerly ac7f0b69a4]]
Former-commit-id: 340060992df0535e8499b6926c1c30ebc34f43df [formerly 46f7341c14]
Former-commit-id: 00a0ffd1b1
2014-04-08 09:46:11 -05:00
Nate Jensen
6e1aaade63 Merge "Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM" into development
Former-commit-id: 269eebc2d5 [formerly 000c6e7138] [formerly 9423a189a9] [formerly 269eebc2d5 [formerly 000c6e7138] [formerly 9423a189a9] [formerly 2626eaee24 [formerly 9423a189a9 [formerly 82ab9e637e9877f0c55495852001cb541754708e]]]]
Former-commit-id: 2626eaee24
Former-commit-id: 3095bf9a48 [formerly 7705fc909a] [formerly 7ace1096ce9620b69c3c98a9360e77662752fa4c [formerly 9b4f8ca1fc]]
Former-commit-id: 7668c26b36a2c0a3ec0a53f1c3246d5614b9bf5f [formerly ac7ee4c039]
Former-commit-id: 99c8cd3c01
2014-04-08 09:08:45 -05:00
Nate Jensen
9211cb1f0c Issue #2968 fix buffer thread safety issues
Change-Id: I8c8cbf69ea9821ce82fc72b98cf17b0b5f1a93c2

Former-commit-id: 917e1ed8fd [formerly 5c775618e3] [formerly e11a5c4559] [formerly 917e1ed8fd [formerly 5c775618e3] [formerly e11a5c4559] [formerly f2b18b76f2 [formerly e11a5c4559 [formerly edc629d4b63f2a873752a232ee8f6530ec314595]]]]
Former-commit-id: f2b18b76f2
Former-commit-id: 3649961255 [formerly f5d594bddc] [formerly 27cad95bf8fbd0f9b7e8f6e916202f0a2685b801 [formerly ae9c53fd05]]
Former-commit-id: d98b7ed0ef4394790d9b3a86cc2e43a275499339 [formerly e936e5cac3]
Former-commit-id: a2d09fd948
2014-04-07 17:30:27 -05:00
Mike Duff
d25712d022 Issue #2860 - Implement the redbook upper air model graphics and cpc charts for NDM
Change-Id: If01865b85f7ed18edea63757426cb76e44587b0e

Former-commit-id: 97fb67b7b2 [formerly 09802cfde2] [formerly 692d8841d1] [formerly 97fb67b7b2 [formerly 09802cfde2] [formerly 692d8841d1] [formerly 418c80640e [formerly 692d8841d1 [formerly 4ae763f1f1865d7c16eefb8d3647e3f94c5c1c22]]]]
Former-commit-id: 418c80640e
Former-commit-id: 49d3dd00ba [formerly 7bb7f3c4eb] [formerly 9721d262ea6ec4e5bc559f295bf2f4efcca6c33a [formerly 80bb9e41f5]]
Former-commit-id: cbc2ef87beeba70924ef3f1965bac77b86a48003 [formerly cd81b821b3]
Former-commit-id: 43bd945f3f
2014-04-07 16:17:28 -05:00
Ron Anderson
871f619b99 Issue #2694 Converted GetBrokerConnections to Java.
Change-Id: Ic9445906ed88036d6598ffec0319de9c89f8c163

Former-commit-id: 7c9f4091c2 [formerly d16380e50e] [formerly a6794beaa5] [formerly 7c9f4091c2 [formerly d16380e50e] [formerly a6794beaa5] [formerly df9c5c81d6 [formerly a6794beaa5 [formerly 102c81e1aafdcfa171440df1cba97d27b2ba3c2a]]]]
Former-commit-id: df9c5c81d6
Former-commit-id: 454323fd74 [formerly d1cb494222] [formerly 7524b26cc572e199e0f694889a08af77618fbbde [formerly d778e9dac6]]
Former-commit-id: 5c9146609d77cf7f728cb45e3c2fdc22d4df085c [formerly 8bb878a61d]
Former-commit-id: 840c8131b6
2014-04-07 15:18:01 -05:00
Nate Jensen
b527c4bc13 Merge "Issue #2959 fix watches/warnings handling of color change" into development
Former-commit-id: 2148e9eda8 [formerly a225458f15] [formerly 1373e975d6] [formerly 2148e9eda8 [formerly a225458f15] [formerly 1373e975d6] [formerly aa689e99c4 [formerly 1373e975d6 [formerly 85b329c8fd18e361d2def7516f814ffef72896bb]]]]
Former-commit-id: aa689e99c4
Former-commit-id: 8441c8054b [formerly db548612b2] [formerly e0b7dcd050fe557e0942a822e01ea872dbce7127 [formerly 23f3ea9fa4]]
Former-commit-id: 5dc865411214c939a199ea85beb9b8d0181c90ca [formerly 46513c14c7]
Former-commit-id: d1ec34307f
2014-04-07 13:44:43 -05:00
Nate Jensen
5de4fc4b2c Issue #2959 fix watches/warnings handling of color change
Change-Id: Ic8d510e6cce1949d784cd480e58cf4347527b79e

Former-commit-id: 4aea30fbea [formerly 300c26820f] [formerly 5a1877d8a3] [formerly 4aea30fbea [formerly 300c26820f] [formerly 5a1877d8a3] [formerly e4c52e83e2 [formerly 5a1877d8a3 [formerly fd9234aa70a7712101de73c892fd92f329e533e7]]]]
Former-commit-id: e4c52e83e2
Former-commit-id: 43b52d6340 [formerly 3167c3bd96] [formerly 22e497f441e2210c18b0f84b208424ea7065f6e4 [formerly 5cb4f195f9]]
Former-commit-id: bf3268f9d82a634f502e0e3b46a61ad4aa216d05 [formerly 224b711195]
Former-commit-id: d30cf9f381
2014-04-07 13:31:58 -05:00
Nate Jensen
98a02705b9 Merge "Issue #2905 removed java 1.7 specific code" into development
Former-commit-id: ef099dee95 [formerly f32249d79c] [formerly 174677f71b] [formerly ef099dee95 [formerly f32249d79c] [formerly 174677f71b] [formerly 44bfeea419 [formerly 174677f71b [formerly 64475f30f8d1818342761e95f96e4d6e5a3e270f]]]]
Former-commit-id: 44bfeea419
Former-commit-id: 0ab946a58a [formerly 9f80655bdd] [formerly b732cb4ad21bf019a1d8a8a61bcbbc2e83d25363 [formerly 723a1e2cd7]]
Former-commit-id: 9d0d9137f1251028c68de0b3335971757a785e4c [formerly 0fbb8959b9]
Former-commit-id: ec000abbee
2014-04-07 13:05:05 -05:00
Brian Clements
07cfd47dd2 Issue #2905 removed java 1.7 specific code
use of Integer.compare()


Former-commit-id: d909a8e909 [formerly ae3ece84be] [formerly a1d9d323bd] [formerly d909a8e909 [formerly ae3ece84be] [formerly a1d9d323bd] [formerly f53203712f [formerly a1d9d323bd [formerly 223fa62b59a9c8764a33a25d4ccfd0c69cff4be7]]]]
Former-commit-id: f53203712f
Former-commit-id: f18843762b [formerly 8afb7d6473] [formerly e1af86460011a8d2e0f79711e20892a8cadfb316 [formerly 6d2125746e]]
Former-commit-id: a90358355a0f5cfbd2d3fd9542ccc6767a8998a5 [formerly 18a5ebe659]
Former-commit-id: b1bfe11509
2014-04-07 12:22:52 -05:00
Nate Jensen
49ad27bb19 Merge "Issue #2906 fixed mapper no-value checks to do both null and empty set" into development
Former-commit-id: 6c226c90cb [formerly f93420c39e] [formerly 265a778fd5] [formerly 6c226c90cb [formerly f93420c39e] [formerly 265a778fd5] [formerly 14e709a325 [formerly 265a778fd5 [formerly 69d9c6371091ba43b1a48f14c770b8cfb4dcccb2]]]]
Former-commit-id: 14e709a325
Former-commit-id: e10c725e96 [formerly ed29055079] [formerly 2cac4fc2ed5abc0906befeed4945f386391247cc [formerly bee06e7673]]
Former-commit-id: d4553bd2935e998bed2343e666d7d90277937b18 [formerly 350c056c75]
Former-commit-id: 9b3f5b41e3
2014-04-07 12:15:42 -05:00
Nate Jensen
b866a19e74 Merge "Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver rpm to replace it. Changed dependency references to httpd-collaboration to refer to collab-dataserver." into development
Former-commit-id: d5c985025d [formerly 32a5ccef3e] [formerly 3bdad1b6e2] [formerly d5c985025d [formerly 32a5ccef3e] [formerly 3bdad1b6e2] [formerly b95f0df636 [formerly 3bdad1b6e2 [formerly 2e37643df1641a9aa0ee2b87933db8f800616168]]]]
Former-commit-id: b95f0df636
Former-commit-id: c22d529b96 [formerly df09ba8d7e] [formerly 6a919878026e87f0784edbf88532eedde3137b4c [formerly 2e3a809bec]]
Former-commit-id: 4b787dca5543bac3316fd24594a0b4f7b78a09c4 [formerly 498a4f246a]
Former-commit-id: f3b68241ee
2014-04-07 10:01:24 -05:00
Brian Clements
7a00c01840 Issue #2906 fixed mapper no-value checks to do both null and empty set
fixed problem caused by previous change


Former-commit-id: 23b83ee238 [formerly 1a45c23201] [formerly 9e6da34150] [formerly 23b83ee238 [formerly 1a45c23201] [formerly 9e6da34150] [formerly fe281381ab [formerly 9e6da34150 [formerly 6443a6546083068a3b626eec33eeafb4cf84c403]]]]
Former-commit-id: fe281381ab
Former-commit-id: 7ecb691bdf [formerly 8140800517] [formerly ade9cb87243cf6693cdfcc5064e979e69f6625ec [formerly af01ba2de6]]
Former-commit-id: 1ac3c65503f52cef6e686f5a5fc043cafee1918c [formerly fef7aa970c]
Former-commit-id: accc4c6882
2014-04-07 08:45:56 -05:00
Ben Steffensmeier
85c4c3e521 Issue #2920 Allow strings to use mulitple styles.
Former-commit-id: 72f68e9e2b [formerly ddc97933b8] [formerly 32016d5401] [formerly 72f68e9e2b [formerly ddc97933b8] [formerly 32016d5401] [formerly bb205cdef9 [formerly 32016d5401 [formerly ba3638effd48445bd00b8ef5e3771f05910c2af1]]]]
Former-commit-id: bb205cdef9
Former-commit-id: 045013ad87 [formerly 963901f6b1] [formerly 1b839595fb2bd5d3a3b79985f5a8779a7a6342be [formerly 5b55eb6e39]]
Former-commit-id: cd2a4bf854578bc0dfbb8d4d1b3ef54ce43089f6 [formerly 5b23b2f5b0]
Former-commit-id: 0ab850c00f
2014-04-04 16:16:06 -05:00
Richard Peter
c4dc429906 Merge "Issue #2905 added BUFR parsing utilities" into development
Former-commit-id: 4bd51727d9 [formerly f19f9e2be7] [formerly 5f3ea781f5] [formerly 4bd51727d9 [formerly f19f9e2be7] [formerly 5f3ea781f5] [formerly d25c5118a3 [formerly 5f3ea781f5 [formerly 15f4b09539ac99bfa9d812e64deca2f3af202501]]]]
Former-commit-id: d25c5118a3
Former-commit-id: c89ffe3692 [formerly 90746fe907] [formerly 251a7aedd0b59e25cd19363c502de390135f5392 [formerly f4b86bd592]]
Former-commit-id: 7638c63a99a17fdf9c40e464f8d5a9a65fbed4b9 [formerly 1740741c11]
Former-commit-id: 5eecf9e064
2014-04-04 14:42:10 -05:00
Richard Peter
0fc963bbc8 Merge "Issue #2810 Added comparator to BandwidthAllocations Change-Id: I4320d1d5b00bdf69c0969a349ae249090a389b85" into development
Former-commit-id: 4ba272b071 [formerly 7acdf727ce] [formerly 545203a833] [formerly 4ba272b071 [formerly 7acdf727ce] [formerly 545203a833] [formerly 7093d6ff0e [formerly 545203a833 [formerly 79f857137cdc4bba40c3d6804c72dab8a4fe6ae0]]]]
Former-commit-id: 7093d6ff0e
Former-commit-id: e7cc3044e7 [formerly b3dd0a933c] [formerly c343754cdf22b2f328978110a7fef5d5ee9e7d8b [formerly dc429091da]]
Former-commit-id: 0464101d9194c2a1dfd91fc37f920f04e8dde8ce [formerly ecc9eb5268]
Former-commit-id: 21b77c1310
2014-04-04 14:39:46 -05:00
Ron Anderson
3936bcaf65 Merge "Issue #2737 Make iscMosaic remove data from ISC when grids are deleted." into development
Former-commit-id: d4d7e81799 [formerly 83d660cf2e] [formerly 2042d975c2] [formerly d4d7e81799 [formerly 83d660cf2e] [formerly 2042d975c2] [formerly debde74356 [formerly 2042d975c2 [formerly 93c224f21b0aec4eef0eaf0f57c5f48237c68265]]]]
Former-commit-id: debde74356
Former-commit-id: bb12a4b904 [formerly c3a4664534] [formerly 108d722236ee29849900176e85dc9365b6df27dd [formerly d4fabcc4b1]]
Former-commit-id: d95b981e70d3c0b2174f3e3b70a68d535bf2b492 [formerly 8f487dd5dc]
Former-commit-id: e1fc1365af
2014-04-04 08:35:12 -05:00