Commit graph

7219 commits

Author SHA1 Message Date
Nathan Bowler
93b2dfc2c9 Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba

Former-commit-id: 1df2418409 [formerly e1470cb4ce03b49ac85936760469a22786195a99]
Former-commit-id: 33e141dd38
2014-10-10 13:20:04 -04:00
Brian.Dyke
748007cad1 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 862712a00f [formerly 4b2f00f3baeb6715ff76beb823978605742bc13d]
Former-commit-id: 05e4e92e65
2014-10-10 13:17:54 -04:00
Shawn.Hooper
c2acd70bc5 ASM #13467 - GFE: Need to add Beach Hazards Statement
Change-Id: Icd52e8f1cd05f1f1ecd0b43458593e95496e0db6

Former-commit-id: cea5061c61 [formerly 457c467d7437c5550bb8727e813d8aa9d9c338a9]
Former-commit-id: 0c61661989
2014-10-10 13:14:25 -04:00
Nate Jensen
93c71345ae Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1
Former-commit-id: 70561d721a [formerly bcc0d1c4f9516e90205d4c140ede99910d1af3b9]
Former-commit-id: e7d524c06a
2014-10-10 11:47:32 -05:00
Richard Peter
421fb43d60 Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: e7fbc0c012 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]
Former-commit-id: b41be59fd6
2014-10-10 11:13:12 -05:00
Nathan Bowler
0adb2897fb Omaha #3595 Fix sed call and man/sigw indices for proper comparison.
Change-Id: Iee0ce15d06e2c84ac8bb4f5a3cf82a3c237222d2

Former-commit-id: 36d77f1098 [formerly 97555449ae12eab272ef3307297b89145b97363b]
Former-commit-id: 27cdd53ea8
2014-10-10 12:05:16 -04:00
Benjamin Phillippe
d7c1c5805f Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734

Former-commit-id: 825aa0d5b2 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]
Former-commit-id: df6b3b3832
2014-10-10 10:59:16 -05:00
Nathan Bowler
aa36802cdf Omaha #3595 Adding original, unmodified raobs scripts.
Change-Id: I466b5b89790bff9887022a35deda7c9f9871bc80

Former-commit-id: 104b47daa2 [formerly d6793fc17662a0ea0d5814524f4e641e1524ebde]
Former-commit-id: 4241eab8ac
2014-10-10 11:33:07 -04:00
Brian.Dyke
36571c8238 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f85eb2d0ac [formerly 344f436cfabfa5c1d0aa552467be7a6f9656a1ec]
Former-commit-id: 6ae3795b7c
2014-10-10 11:01:01 -04:00
David Friedman
96a5bd13cc ASM #258 - cross section - switching the log plot to z-coordinate scale
Change-Id: Ie2fd21c0b65d17f778d69daf7120e47a6f4e552a

Former-commit-id: 40f7e8df44 [formerly f187f262a28e0ee9df2b75eff7d1f5382a729ac3]
Former-commit-id: ad73a90b53
2014-10-10 14:18:54 +00:00
Nate Jensen
c552655866 Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e

Former-commit-id: afb64bc4bb [formerly 4a5b66b00fbb53b4fcb4340366347ae4b08e6992]
Former-commit-id: b638e6e0f6
2014-10-10 09:01:29 -05:00
Nate Jensen
2c17405d5f Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: 3cc3b38539 [formerly 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc]
Former-commit-id: ee51fe1977
2014-10-09 18:30:33 -05:00
Nate Jensen
c3d936373f Merge "Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml." into omaha_14.4.1
Former-commit-id: 13f4746613 [formerly 7751e4e17ac543ba18abbd3ba7f2355c13c81d4e]
Former-commit-id: 22fce26b0e
2014-10-09 15:32:38 -05:00
Mark Peters
5b5fac85b8 Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27

Former-commit-id: cf1bff0d02 [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]
Former-commit-id: 6bb4f5dbdf
2014-10-09 15:30:23 -05:00
Mark Peters
bcb39bffb5 Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513

Former-commit-id: 087dabe3bb [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]
Former-commit-id: 63069f5adc
2014-10-09 11:17:53 -05:00
Richard Peter
bdb3bb263d Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: ed2bd7a261 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]
Former-commit-id: 26e4c16da4
2014-10-09 11:09:32 -05:00
Brian Clements
6be495b787 Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631

Former-commit-id: 119b2bff17 [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]
Former-commit-id: fbabf6f18d
2014-10-09 11:04:49 -05:00
Nate Jensen
145db4077e Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: f6601e4ee1 [formerly 05a008ed69414e3977998cca45516a736181d5b6]
Former-commit-id: 1a24808709
2014-10-09 09:38:27 -05:00
Nate Jensen
2a962aedf7 Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: 0d33e661f2 [formerly 5ae10ba1a54ec5b20d1569d6c78c2762015c35de]
Former-commit-id: 98518f4cb6
2014-10-09 09:02:36 -05:00
Brian Clements
eac32a0fa0 Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818

Former-commit-id: 87964cb500 [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]
Former-commit-id: f0921db20c
2014-10-09 08:38:45 -05:00
Brian Clements
2de14cf885 Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f

Former-commit-id: 8a4cda892f [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]
Former-commit-id: 577b3a5e11
2014-10-08 16:47:10 -05:00
Robert Blum
153fdb982f Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008

Former-commit-id: 9bef0b91f8 [formerly 8c609041f3cabc11588d282b0a91b514a569073a]
Former-commit-id: f8661bdb73
2014-10-08 13:05:23 -05:00
Ben Steffensmeier
44d2085dad Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: b7c0eb89ad [formerly e0ec387c62e64a19a4d598578f18ee17686f312a]
Former-commit-id: b865762b4f
2014-10-08 12:21:03 -05:00
Richard Peter
d97655272f Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: e8bc97501b [formerly 157588d388b9033424ddc46a22d74ccc302eea85]
Former-commit-id: fa15d4ff21
2014-10-08 12:02:17 -05:00
Juliya Dynina
404d6667fb Merge "ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM" into asm_14.3.1
Former-commit-id: 240917cf96 [formerly 7a0da7440a3e5e1696cc676dc3405d2aaa95252b]
Former-commit-id: 4911f61f10
2014-10-08 12:00:39 -05:00
Nate Jensen
32fda0ae19 Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 4e582d0bde [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]
Former-commit-id: 5cf1821a6a
2014-10-08 11:36:44 -05:00
Nate Jensen
affddd1b8b Merge "Omaha #3594 Update profiler script to use DAF." into omaha_14.4.1
Former-commit-id: aa9567ccbe [formerly 617994f10079a9b905f37c1bf1c1b83e6a210e61]
Former-commit-id: ea23c651a1
2014-10-07 17:18:51 -05:00
Richard Peter
1be207dccb Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

Former-commit-id: a4bfd2d28b [formerly 110499cec453532545431a6fa05057f47af66ed2]
Former-commit-id: a9562d992c
2014-10-07 16:32:48 -05:00
Richard Peter
c6cb389a3d Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 1adac05f5a [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]
Former-commit-id: 1bc24c3be2
2014-10-07 15:13:11 -05:00
Nathan Bowler
a23f95abdc Omaha #3594 Update profiler script to use DAF.
Change-Id: Id0553c1c8745ae4371776fcdb4ec610f8f142ab0

Former-commit-id: 1fd0ece81a [formerly 3c55fd78ca42a04ee0b0a9bbb88034c83f30e583]
Former-commit-id: e7f86f19c1
2014-10-07 15:23:38 -04:00
Sean Webb
e72d2cdc73 Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: c3f3140c4f [formerly 986a78cef3d8814e04035b00545a289171c7cc8a]
Former-commit-id: 01b52daea2
2014-10-07 14:04:58 -05:00
Kevin.Johnson
b0e68c1ed1 ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: 355274e7ac [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]
Former-commit-id: 5cf5cac9f7
2014-10-07 14:55:41 -04:00
Nate Jensen
5051b47832 Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: 70521e80f8 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]
Former-commit-id: 6d0d6c2a96
2014-10-07 13:54:08 -05:00
Nate Jensen
557c040868 Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: 11f460f876 [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]
Former-commit-id: 726eea342f
2014-10-07 13:53:43 -05:00
Nate Jensen
b63050a0e9 Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: c066e8264d [formerly 60155e8f96ba20204c6049206ef35a840f64a767]
Former-commit-id: b0f025c0df
2014-10-07 13:53:33 -05:00
Nate Jensen
0425092c20 Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 1e16abcfcd [formerly 747f8fc91e2ff977724f634b6e610c96150cb4ad]
Former-commit-id: 09cf5de2dd
2014-10-07 13:52:36 -05:00
Nathan Bowler
efbe205ba8 Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9

Former-commit-id: ab2e0edb82 [formerly e57506f274da8a2d917c6cf061e789e50993b5c3]
Former-commit-id: b84fee6aed
2014-10-07 14:40:49 -04:00
Steve Harris
fc35b7313d Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]
Former-commit-id: c9e37bf440
2014-10-07 13:35:58 -05:00
Brian Clements
574005859a Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac

Former-commit-id: 66705190b5 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]
Former-commit-id: 42cefd3655
2014-10-07 13:28:34 -05:00
Mark Peters
c50ae98b5f Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e

Former-commit-id: 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]
Former-commit-id: 5ed537572a
2014-10-07 11:42:44 -05:00
Brian Clements
c964fb1e80 Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407

Former-commit-id: 773619f741 [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]
Former-commit-id: ec37971eff
2014-10-07 10:43:47 -05:00
Brian Clements
c3d7cd6e7f Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701

Former-commit-id: f39ffcc63f [formerly a69773742e571a334ef1fd000ff8311805f9c737]
Former-commit-id: 81c73519c2
2014-10-07 08:37:47 -05:00
Ben Steffensmeier
7e910088c9 Omaha #3702 register database plugin to fxa database.
Former-commit-id: 6a2b2efb1a [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]
Former-commit-id: 997bfd689d
2014-10-06 20:00:19 -05:00
Nate Jensen
58c8b04318 Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: ef6da2a181 [formerly 03ed17c8994b00ea37c1c591760c9b7c452dfcde]
Former-commit-id: b2dcfdf572
2014-10-06 15:53:19 -05:00
Nate Jensen
00adad9546 Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0

Former-commit-id: 446e0bcdf6 [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095]
Former-commit-id: 9025e166dd
2014-10-06 15:41:42 -05:00
Roger Ferrel
96f484e323 Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: dfbf07f377 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]
Former-commit-id: d4ef865375
2014-10-06 15:34:30 -05:00
Qinglu.Lin
4589f2e183 ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892

Former-commit-id: 636f054077 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba]
Former-commit-id: 47be3aa143
2014-10-06 16:05:26 -04:00
Michael Gamazaychikov
4613f0e9d1 ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410

Former-commit-id: f0b644d92e [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]
Former-commit-id: e6d3baaa9c
2014-10-06 15:32:10 -04:00
Steve Harris
3542caf090 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]
Former-commit-id: 2db03d95b3
2014-10-06 13:57:59 -05:00
Nate Jensen
e7c6cf60d5 Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 87d80afd0b [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]
Former-commit-id: de8b9cf0b8
2014-10-06 11:37:54 -05:00