Commit graph

7083 commits

Author SHA1 Message Date
Robert Blum
fbd1a740f6 Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008

Former-commit-id: da4f5de40f [formerly caee4eba19] [formerly 9bef0b91f8] [formerly da4f5de40f [formerly caee4eba19] [formerly 9bef0b91f8] [formerly f8661bdb73 [formerly 9bef0b91f8 [formerly 8c609041f3cabc11588d282b0a91b514a569073a]]]]
Former-commit-id: f8661bdb73
Former-commit-id: 7023892239 [formerly 58d4b90920] [formerly ca938621e5e22a7d3ede60b023930d1d80849b48 [formerly 153fdb982f]]
Former-commit-id: e436a49aa33b5a2de79281f279c0843d92c4a5ba [formerly d18cb00dc1]
Former-commit-id: 869d81c170
2014-10-08 13:05:23 -05:00
Richard Peter
a936b8612b Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

Former-commit-id: 8ffa01471a [formerly f5dd25c8e4] [formerly a4bfd2d28b] [formerly 8ffa01471a [formerly f5dd25c8e4] [formerly a4bfd2d28b] [formerly a9562d992c [formerly a4bfd2d28b [formerly 110499cec453532545431a6fa05057f47af66ed2]]]]
Former-commit-id: a9562d992c
Former-commit-id: c217191493 [formerly 901877ec7a] [formerly 10f0ab60c2c0a25fca107e20817d044f303c4afe [formerly 1be207dccb]]
Former-commit-id: 0119dd744b38196e2ed0f52406b1c9c17f175d11 [formerly 1ec3bdd877]
Former-commit-id: 3998dac2f0
2014-10-07 16:32:48 -05:00
Richard Peter
9f372715f5 Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 1038af1901 [formerly ee86734625] [formerly 1adac05f5a] [formerly 1038af1901 [formerly ee86734625] [formerly 1adac05f5a] [formerly 1bc24c3be2 [formerly 1adac05f5a [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]]]
Former-commit-id: 1bc24c3be2
Former-commit-id: e660a61fa9 [formerly 4f056d76c8] [formerly dcfabbc95e67fec2343f8bc01a273a0ef2f97589 [formerly c6cb389a3d]]
Former-commit-id: fee614f33d7cd6e30009bae10026ea09adbfa457 [formerly 327d82ed02]
Former-commit-id: 7bb803b504
2014-10-07 15:13:11 -05:00
Nate Jensen
85774367dc Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: 92caee5227 [formerly 0bfc7514a4] [formerly 70521e80f8] [formerly 92caee5227 [formerly 0bfc7514a4] [formerly 70521e80f8] [formerly 6d0d6c2a96 [formerly 70521e80f8 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]]]]
Former-commit-id: 6d0d6c2a96
Former-commit-id: c988ab129d [formerly 52e7dd82c0] [formerly 81b7914b3094bd0fe354bbbce1e009bec017a6d9 [formerly 5051b47832]]
Former-commit-id: c981b036f8f82e3cfc80ab10d981704f1af2defc [formerly 541e10e9d6]
Former-commit-id: 4126b426eb
2014-10-07 13:54:08 -05:00
Nate Jensen
7091f791d8 Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: 056dbe465d [formerly affc326eb7] [formerly 11f460f876] [formerly 056dbe465d [formerly affc326eb7] [formerly 11f460f876] [formerly 726eea342f [formerly 11f460f876 [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]]]]
Former-commit-id: 726eea342f
Former-commit-id: 639938641e [formerly 4267d54502] [formerly 2387192aa4c7f8ef68f1f17c0f603131fa1338e6 [formerly 557c040868]]
Former-commit-id: d82f0ba325f8130d4a49ac6126ba1b31a9438658 [formerly bf0eb369b3]
Former-commit-id: 12e3c3ff75
2014-10-07 13:53:43 -05:00
Nate Jensen
6ab10f279f Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: 3e4434f708 [formerly e63de52465] [formerly c066e8264d] [formerly 3e4434f708 [formerly e63de52465] [formerly c066e8264d] [formerly b0f025c0df [formerly c066e8264d [formerly 60155e8f96ba20204c6049206ef35a840f64a767]]]]
Former-commit-id: b0f025c0df
Former-commit-id: dec72bc6c5 [formerly 0b10454635] [formerly ce928a70b87a81dd02c2e04fea570e6de94ae2ba [formerly b63050a0e9]]
Former-commit-id: dcfc7a4fcee1eaad28a80eb0597e7899bfdb5d34 [formerly 416a45b417]
Former-commit-id: 6e2dc7f7d3
2014-10-07 13:53:33 -05:00
Nate Jensen
f99ca416ca Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 860f584065 [formerly e3a1adb7f2] [formerly 1e16abcfcd] [formerly 860f584065 [formerly e3a1adb7f2] [formerly 1e16abcfcd] [formerly 09cf5de2dd [formerly 1e16abcfcd [formerly 747f8fc91e2ff977724f634b6e610c96150cb4ad]]]]
Former-commit-id: 09cf5de2dd
Former-commit-id: 6140e0ac31 [formerly 38be3b94b7] [formerly 63c392ca022a0f6f7cd0160df10fa464a320d98c [formerly 0425092c20]]
Former-commit-id: bcbd1ce36eab868fcf0039397ea58b61fbb7e349 [formerly ef4883bda6]
Former-commit-id: 4ff50c4c86
2014-10-07 13:52:36 -05:00
Nathan Bowler
00485b4d8c Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9

Former-commit-id: bcc339a859 [formerly adecc6efa4] [formerly ab2e0edb82] [formerly bcc339a859 [formerly adecc6efa4] [formerly ab2e0edb82] [formerly b84fee6aed [formerly ab2e0edb82 [formerly e57506f274da8a2d917c6cf061e789e50993b5c3]]]]
Former-commit-id: b84fee6aed
Former-commit-id: bbefa2d070 [formerly ab157527b9] [formerly e72139d992b6a3a44db2b6d03c3f058b6211e9ff [formerly efbe205ba8]]
Former-commit-id: 1ef32fcadaac6b057d1ee75e09a6792d30a777c0 [formerly 36293c548f]
Former-commit-id: b4da44c655
2014-10-07 14:40:49 -04:00
Steve Harris
118c19a83d 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: c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c9e37bf440 [formerly ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]]
Former-commit-id: c9e37bf440
Former-commit-id: e80527ade2 [formerly fc424d7336] [formerly 669e99e1efdfc40962f1589446fe9efe4b3f8b52 [formerly fc35b7313d]]
Former-commit-id: 292297ad70be43ccc935b96eca7a8409d4033fc4 [formerly f370a2f54e]
Former-commit-id: 7c4bb336e1
2014-10-07 13:35:58 -05:00
Brian Clements
8edd2ad753 Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac

Former-commit-id: 0cd0db130c [formerly 48352e964d] [formerly 66705190b5] [formerly 0cd0db130c [formerly 48352e964d] [formerly 66705190b5] [formerly 42cefd3655 [formerly 66705190b5 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]]]]
Former-commit-id: 42cefd3655
Former-commit-id: 257c19ee5b [formerly 64a3e0898c] [formerly d78e7b959f63f20c32c2c42030847bd3d9091fdb [formerly 574005859a]]
Former-commit-id: 64ca55ce0cf89a3450ae37ad3fe38be7fd59dd0b [formerly 9b83a97637]
Former-commit-id: c56ea85517
2014-10-07 13:28:34 -05:00
Mark Peters
ba47bfd846 Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e

Former-commit-id: 41a0fa9bfe [formerly dc27d9252c] [formerly 3464751716] [formerly 41a0fa9bfe [formerly dc27d9252c] [formerly 3464751716] [formerly 5ed537572a [formerly 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]]
Former-commit-id: 5ed537572a
Former-commit-id: e66adcd8ff [formerly 82e2a2bbb5] [formerly e8adb61acc7a249cc87878a153cb4b17d34bf566 [formerly c50ae98b5f]]
Former-commit-id: eab6b7d95d209e071ff8f9cbfcee197abb9ff1a3 [formerly c2173b1925]
Former-commit-id: dffbaa684d
2014-10-07 11:42:44 -05:00
Brian Clements
1fc61f30c4 Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701

Former-commit-id: c0544fa109 [formerly 090a787f8d] [formerly f39ffcc63f] [formerly c0544fa109 [formerly 090a787f8d] [formerly f39ffcc63f] [formerly 81c73519c2 [formerly f39ffcc63f [formerly a69773742e571a334ef1fd000ff8311805f9c737]]]]
Former-commit-id: 81c73519c2
Former-commit-id: 6dab387f3c [formerly 260b3bab88] [formerly 3c9950192a8e0eb2869d1aeb1f303e772bec509d [formerly c3d7cd6e7f]]
Former-commit-id: d975eccba6c6070192220b506e523400d2d337d6 [formerly 639b2c2510]
Former-commit-id: 49bb8437f6
2014-10-07 08:37:47 -05:00
Ben Steffensmeier
c25ac7effd Omaha #3702 register database plugin to fxa database.
Former-commit-id: d5888d403c [formerly 3e0a99aed2] [formerly 6a2b2efb1a] [formerly d5888d403c [formerly 3e0a99aed2] [formerly 6a2b2efb1a] [formerly 997bfd689d [formerly 6a2b2efb1a [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]]]]
Former-commit-id: 997bfd689d
Former-commit-id: 8b52e21a2c [formerly 77c2dcd170] [formerly 0aa3c4d8ca84f5a162f80580a4b8d2c2c45b5ef1 [formerly 7e910088c9]]
Former-commit-id: 3d76f3b15915d70bb7dedac57825640ec68bad59 [formerly 1c6068ee84]
Former-commit-id: 8aac93aeed
2014-10-06 20:00:19 -05:00
Steve Harris
cf73096716 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 53dc9657e2 [formerly 06a27b2d3c] [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: ca63a8cfc3 [formerly bcf1265a16] [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e [formerly 3542caf090]]
Former-commit-id: 0522d4db8f9331e9bfd83cc7147290634159c673 [formerly cfd49c8ca0]
Former-commit-id: afd3d3fa2d
2014-10-06 13:57:59 -05:00
Nate Jensen
50d26f0da8 Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 054947764c [formerly 71efead2db] [formerly 87d80afd0b] [formerly 054947764c [formerly 71efead2db] [formerly 87d80afd0b] [formerly de8b9cf0b8 [formerly 87d80afd0b [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]]]]
Former-commit-id: de8b9cf0b8
Former-commit-id: 102a1f5c5b [formerly bfd4adcf63] [formerly eae87fcb1695bde68ef1e3bcb6269a6800c5953c [formerly e7c6cf60d5]]
Former-commit-id: b4e87d05085f2a52fa58791b6b3f2601d490818c [formerly 12ecb3b68a]
Former-commit-id: 47a9b16164
2014-10-06 11:37:54 -05:00
Nate Jensen
c91006a7a5 Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: 40d5da5e50 [formerly 24bf870977] [formerly 28545083c5] [formerly 40d5da5e50 [formerly 24bf870977] [formerly 28545083c5] [formerly 05ae6c5d9b [formerly 28545083c5 [formerly ded3f476047f92d48891613e4c0b78d20858f1ff]]]]
Former-commit-id: 05ae6c5d9b
Former-commit-id: 8011cb24d7 [formerly 7a5bc79ac1] [formerly 8ba0a6833e307d530471c42099dea3c755f8024f [formerly 8250390a62]]
Former-commit-id: cf88e69756e8dabb62bda12c20365e87bf5553be [formerly 53441b1866]
Former-commit-id: 763e75f35b
2014-10-06 09:08:03 -05:00
Nate Jensen
a7ed20921b Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly f35c95de02 [formerly b544abb498] [formerly baec32be20] [formerly 23c5ea21e4 [formerly baec32be20 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]]]
Former-commit-id: 23c5ea21e4
Former-commit-id: 015c694d2f [formerly 3941281bb0] [formerly 7e9e75b3708abb852b52c881df4127de3e856477 [formerly 88afde5dfa]]
Former-commit-id: 43e8eb44fa4a566ec838fb8744a8301569eb65d6 [formerly fe4e43d8d3]
Former-commit-id: f623152a9c
2014-10-06 09:07:38 -05:00
Richard Peter
4571a8ab14 Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9

Former-commit-id: 1958d9fe38 [formerly 2422c00fbd] [formerly 5a0dc20480] [formerly 1958d9fe38 [formerly 2422c00fbd] [formerly 5a0dc20480] [formerly b5f23b8b98 [formerly 5a0dc20480 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]]]]
Former-commit-id: b5f23b8b98
Former-commit-id: 8b763c729d [formerly 84a1b71e23] [formerly e2b2cef1529d8894999bfe919bd88ec5029df5c1 [formerly 4ada2c1c77]]
Former-commit-id: 0380f9430066e76c436aeea08918133a896d8893 [formerly c6171b84c8]
Former-commit-id: f07a0470ee
2014-10-03 14:14:16 -05:00
Brian.Dyke
d8ccd40588 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 5da2026d2b [formerly 85d83aefe0] [formerly f440da9c70] [formerly 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]]
Former-commit-id: 92762f46c7
Former-commit-id: beb7a3f448 [formerly 64aef1a783] [formerly 6e5ec5380fe3992e157472559b5e85f288b4b251 [formerly 4dbdf9de26]]
Former-commit-id: d771453098f05cdadd94113c1504ef71db5e8e6b [formerly 91f89ee1f6]
Former-commit-id: 918de34464
2014-10-03 14:04:46 -04:00
Steve Harris
e40f190f9a Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 1c1e618183 [formerly 306826aed9] [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779 [formerly 523cedbb56]]
Former-commit-id: 85a2c5f56cad1fa8121856b8cb5312cdf481051b [formerly 57f5294f08]
Former-commit-id: e05d31ae36
2014-10-03 10:18:34 -05:00
Mark Peters
71a0ceee2b Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348

Former-commit-id: da72adac03 [formerly ffe3444650] [formerly 955f21a85c] [formerly da72adac03 [formerly ffe3444650] [formerly 955f21a85c] [formerly fb62a1e35b [formerly 955f21a85c [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]]]
Former-commit-id: fb62a1e35b
Former-commit-id: bb728b015f [formerly 77da058a9f] [formerly 5748026158d68b3743065ea06e8b17228eeefe25 [formerly 6315da5482]]
Former-commit-id: ed0e605da1d6e67998241f168012ead136be8449 [formerly f9d5dca0e5]
Former-commit-id: eda9693e85
2014-10-02 15:36:22 -05:00
Brian.Dyke
9308ab8537 Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 7390f6c3a8 [formerly db665d3876] [formerly 2a911984f0] [formerly 20dd249d2c [formerly 2a911984f0 [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 8f0310e3be [formerly 46956a01c6] [formerly b67eecdaf5931ae1d938fb48bd33e3327dd7a473 [formerly 72ea2fbe48]]
Former-commit-id: 1353c554161d3298ae22ce357602c081830d7584 [formerly a3ccdd9704]
Former-commit-id: 572bbdd019
2014-10-02 10:44:50 -04:00
Brian.Dyke
2b3ced91f5 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly 06f6dfc38a [formerly 006bdb00ad] [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 65ad6056b6 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]]
Former-commit-id: f3f95aabb0
Former-commit-id: 452a3f046b [formerly d174db3b0c] [formerly c24910662181554debcd898acc9cf5ec28027cf0 [formerly e77f1e126e]]
Former-commit-id: 2c9750edd9ade43fd7db7e61b4503a53d6f26781 [formerly 1d2dfd264a]
Former-commit-id: e100894074
2014-10-02 10:38:51 -04:00
Brian.Dyke
18c69d87e2 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly d1c62c3542 [formerly d4888adc0f] [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly f47840e4d9 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 75ac4f1971 [formerly 277b6e4b36] [formerly 93329339083b58eea30cf9a2fd0c9efc1645f3bb [formerly 36d377e08d]]
Former-commit-id: 99779fb5c1561694dd3f154813fbc624081344ca [formerly 7e465baead]
Former-commit-id: c853463f73
2014-10-02 10:24:04 -04:00
Brian.Dyke
06b277ddad Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 65ff0876ac [formerly 31f073ee3a] [formerly 4bc465bfbd] [formerly 65ff0876ac [formerly 31f073ee3a] [formerly 4bc465bfbd] [formerly 97464ea153 [formerly 4bc465bfbd [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]]]
Former-commit-id: 97464ea153
Former-commit-id: 6fb0b9db12 [formerly 0915cb28b0] [formerly e6df31f2ffcf43d1eb4e7ab7f3e4535088a2930f [formerly e76ee74410]]
Former-commit-id: 565e90f88a51d32a3dc74eded19ae3d9afe627ab [formerly 1d5c3fb6d4]
Former-commit-id: 0fa5e7da1a
2014-10-02 10:15:34 -04:00
Nate Jensen
efd471e4a9 Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh

Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662

Former-commit-id: 0aebb15a38 [formerly 9f74ca65bc] [formerly e964375fcc] [formerly 0aebb15a38 [formerly 9f74ca65bc] [formerly e964375fcc] [formerly 33e3281d55 [formerly e964375fcc [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]]]]
Former-commit-id: 33e3281d55
Former-commit-id: 54d382fa7c [formerly 23ebf782f3] [formerly 021f3802d2585856e5af0f032cd3a2f6494ac93f [formerly 6670e31705]]
Former-commit-id: 8a5f64af32a17d5ab4c7881b654de0d811d9f419 [formerly b0e0632c7a]
Former-commit-id: e156cf3b33
2014-10-02 08:49:32 -05:00
Nate Jensen
8e57ca99b6 Omaha #3675 remove -clean option from installed caves
Change-Id: I2dc8f63d34e4247ebaa26f23c954d082d7bc4419

Former-commit-id: 8b4c2fd720 [formerly 694b39c979] [formerly fc60a83082] [formerly 8b4c2fd720 [formerly 694b39c979] [formerly fc60a83082] [formerly b5d8e0a423 [formerly fc60a83082 [formerly 9519a47ea459390148d07e97189df86e094c037b]]]]
Former-commit-id: b5d8e0a423
Former-commit-id: 2819f2b18f [formerly a77f2a5ff0] [formerly 0343ed95829458ea532eb0d9ea4f20aa2263d16e [formerly b6aa0ae3fc]]
Former-commit-id: 4517179069308046088b88a741a89e5c5502c0b4 [formerly a37e67946a]
Former-commit-id: 3f7391214f
2014-10-02 08:30:25 -05:00
Steve Harris
9af0816bb1 Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: 0a8b36918a [formerly 09d8955b31] [formerly e201e1a493] [formerly 0a8b36918a [formerly 09d8955b31] [formerly e201e1a493] [formerly cc34483b0b [formerly e201e1a493 [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]]
Former-commit-id: cc34483b0b
Former-commit-id: 1935bca883 [formerly 8a627b9bf6] [formerly 624efa7bb6f054750278a0da16282ffd685e50b6 [formerly d711c1b67b]]
Former-commit-id: d7fad664b2074d5ba2b2d769ee3502435babad47 [formerly 074e12da64]
Former-commit-id: 18d68410e5
2014-10-02 08:09:02 -05:00
Nate Jensen
4a0c4d8f57 Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: 1d0b39e615 [formerly 9e4bd6c1b7] [formerly cddda47923] [formerly 1d0b39e615 [formerly 9e4bd6c1b7] [formerly cddda47923] [formerly aa43004f85 [formerly cddda47923 [formerly c643d7c706ef39d1c17926b2a99bcfa2e52c3193]]]]
Former-commit-id: aa43004f85
Former-commit-id: d78f48f053 [formerly 00fb5931d1] [formerly 3d7280866175e6600c65078e6edc5ad140c14be4 [formerly 2bca618f67]]
Former-commit-id: 22473a0f17808adfa8489b383e0dcc75fa089788 [formerly e6aae5c0cd]
Former-commit-id: 9238cd370f
2014-10-02 07:57:30 -05:00
Nate Jensen
c6526b09d8 Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 63d524c431 [formerly dd72c8e139] [formerly 116f6840e2] [formerly 63d524c431 [formerly dd72c8e139] [formerly 116f6840e2] [formerly 53f2bf8395 [formerly 116f6840e2 [formerly 155fdc66bca15c242345858152fcf0b129e28a6d]]]]
Former-commit-id: 53f2bf8395
Former-commit-id: 0b9ac4f0b6 [formerly 026a2eaa11] [formerly d2b391bcede8d48901bb6d5c5dd7a23e1187ca17 [formerly 96790c0377]]
Former-commit-id: 7124fa90c17af1ac99e83dfa7ed053710a9b9dc2 [formerly 40b23efda4]
Former-commit-id: de77597192
2014-10-01 15:06:03 -05:00
Shawn.Hooper
31e8a0ce78 ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720

Former-commit-id: 5254c781ef [formerly 22c3fde0ef] [formerly f9428ace1f] [formerly 5254c781ef [formerly 22c3fde0ef] [formerly f9428ace1f] [formerly ae02cbc2da [formerly f9428ace1f [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]]]
Former-commit-id: ae02cbc2da
Former-commit-id: 822bf53765 [formerly 9ecf241616] [formerly 327e246075a5678f3f87a2f176ae5a099cda1f84 [formerly f2d7288970]]
Former-commit-id: b565ebbaf4b308868a0989d66bf53b79c61b72e6 [formerly e5b5160a51]
Former-commit-id: 5a228f5a5c
2014-10-01 15:58:48 -04:00
Brian.Dyke
64b52f6e95 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly 64529eea01 [formerly 0be927be2d] [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 5ed17c0e24 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: f180f63136 [formerly 4df4eb9c2b] [formerly a57615d594bf6386e1ca03920b1004483f28976a [formerly 914da168c8]]
Former-commit-id: af85c1c0498d395eb57281594d2bd53c3aeec77f [formerly 8184df119d]
Former-commit-id: ea401b327b
2014-10-01 15:36:06 -04:00
Andrew Benak
7f84fac2e6 Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909

Former-commit-id: 68f934e63c [formerly 8ae0af5c6f] [formerly 659f4869bc] [formerly 68f934e63c [formerly 8ae0af5c6f] [formerly 659f4869bc] [formerly 7c7510d471 [formerly 659f4869bc [formerly 8c3cb6032fe79f68f24eb5dee7f3a820aa475257]]]]
Former-commit-id: 7c7510d471
Former-commit-id: 0b750823dd [formerly c711fa910f] [formerly 046414031b27e91c03c30ed846bc0f672ece6786 [formerly f2cfa613fc]]
Former-commit-id: 32bcc7aec3bfec34b9c10f79ae07799fea8b23b6 [formerly 3e4656a60a]
Former-commit-id: 04c5093eee
2014-10-01 14:30:28 -05:00
Nate Jensen
b712c8253c Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f

Former-commit-id: 4dd895a3c5 [formerly 74883424ca] [formerly 319ea78480] [formerly 4dd895a3c5 [formerly 74883424ca] [formerly 319ea78480] [formerly 87d1286a0c [formerly 319ea78480 [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]]]]
Former-commit-id: 87d1286a0c
Former-commit-id: 11fda5a021 [formerly 3e9cb23496] [formerly f2d72c6cb377ab601a5112dcea06cb19760c30ae [formerly b658187cdb]]
Former-commit-id: fa9bc4bb70b11c8a6ad1dd3e97cdcb2ef26df4fc [formerly 14da412d3d]
Former-commit-id: 91e97ad173
2014-10-01 14:22:22 -05:00
Nathan Bowler
8e9c981ab5 Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d

Former-commit-id: 1e4b1e36b2 [formerly 2d5d90c055] [formerly 368b6341b0] [formerly 1e4b1e36b2 [formerly 2d5d90c055] [formerly 368b6341b0] [formerly e4779f2e66 [formerly 368b6341b0 [formerly d67d1e941b89357e7d86fa0f810a82f9e01f4c27]]]]
Former-commit-id: e4779f2e66
Former-commit-id: 79af766519 [formerly b52c1bcafd] [formerly b4a68483c3c014922902f65e575fb102c53dbab2 [formerly a72fec1b38]]
Former-commit-id: 6b8908ca678fa42ab5f5a2ce8f4008e2b1c32ca6 [formerly ae5bde3c3d]
Former-commit-id: 8f18ed535e
2014-10-01 14:57:16 -04:00
Nate Jensen
c180b9d833 Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 16907b03de [formerly f7eac5f1db] [formerly a5e4190b35] [formerly 16907b03de [formerly f7eac5f1db] [formerly a5e4190b35] [formerly 3146dd083c [formerly a5e4190b35 [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]]]]
Former-commit-id: 3146dd083c
Former-commit-id: 18945e612e [formerly e65065461c] [formerly a226aa671f6062c53c35774f2fc096ac613d3381 [formerly 728328f400]]
Former-commit-id: 88853bbd1a9a3555b9971c6c02d797461b1e27d8 [formerly d148780c7c]
Former-commit-id: 647dc473bf
2014-10-01 11:55:38 -05:00
Nate Jensen
56dd0566f7 Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly 1a4b7cc454 [formerly fce7d5899f] [formerly 482af416b3] [formerly f2633a56c0 [formerly 482af416b3 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]]
Former-commit-id: f2633a56c0
Former-commit-id: f0362a03d4 [formerly f7a075907c] [formerly 2a2d868056e74cb4e29f291cba399ffd3f99c3fc [formerly 18acca9ef8]]
Former-commit-id: bc2c3efd4b7820055c54a4ed22e533c68dff148b [formerly b5998c975b]
Former-commit-id: d4b7693f81
2014-10-01 11:53:40 -05:00
Nate Jensen
3e77a9588e Merge "Omaha #3596 Adding original, unaltered satellite scripts." into omaha_14.4.1
Former-commit-id: 8eb01b18bc [formerly 7a1508ac90] [formerly 7c5b340168] [formerly 8eb01b18bc [formerly 7a1508ac90] [formerly 7c5b340168] [formerly 629ab024dc [formerly 7c5b340168 [formerly e0f436a866f2a736b793c3fb2b4fbe770208c6c0]]]]
Former-commit-id: 629ab024dc
Former-commit-id: 298567b6cb [formerly d41f587a8d] [formerly 844c8e6d8d4a7e4559503416d825c98a3e63af7f [formerly 8b4bbbaea0]]
Former-commit-id: e99090224ba874a691b7ba5ebbab15c4224793f5 [formerly 0f7912967c]
Former-commit-id: e4fb2572c2
2014-10-01 11:46:51 -05:00
Lee Venable
a5349c7415 Merge "Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing." into omaha_14.4.1
Former-commit-id: 75a98f8e20 [formerly 3c26abe355] [formerly d12c4b998e] [formerly 75a98f8e20 [formerly 3c26abe355] [formerly d12c4b998e] [formerly aaf3198443 [formerly d12c4b998e [formerly 7807597daa7cbeb9d988eaadc3539eff876e867a]]]]
Former-commit-id: aaf3198443
Former-commit-id: 7ce44b2b6a [formerly 4390c9cb27] [formerly ef54512cbe0e05ec44029779598cd3a4bc873fef [formerly 5199641313]]
Former-commit-id: 492140876c70c308f8fc4a3f7f3f22d460fdd2aa [formerly 0502e5d2bf]
Former-commit-id: aabc441f2b
2014-10-01 11:45:05 -05:00
Nathan Bowler
689b635360 Omaha #3596 Adding original, unaltered satellite scripts.
Change-Id: I6441898e986df707376ee61d5952641dc7e9f266

Former-commit-id: 896e7fa52c [formerly 8f39df9850] [formerly ce2dac6af9] [formerly 896e7fa52c [formerly 8f39df9850] [formerly ce2dac6af9] [formerly 30a565a88b [formerly ce2dac6af9 [formerly f52d19b153d443fa643af1d6b763160f0937c603]]]]
Former-commit-id: 30a565a88b
Former-commit-id: 6dcb7011ce [formerly 89a119ad6f] [formerly 22989aa6eeeb58920a0c429c33fa94cbd2fbc0eb [formerly 92d069371c]]
Former-commit-id: a1b1ef13bd306e49d2721bb9ad669d903b53bc02 [formerly c2fd4fa310]
Former-commit-id: 91e5e487ee
2014-10-01 12:31:57 -04:00
Robert Blum
473b13d9d3 Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly 9e885cd270 [formerly 6a775aa2be] [formerly a1d23e4198] [formerly d5994a8a6b [formerly a1d23e4198 [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]]]]
Former-commit-id: d5994a8a6b
Former-commit-id: fb258e074b [formerly 4bb7ed8b2f] [formerly 2b50918a864a6561f6ca63465c557e0f0f669c60 [formerly 6c1676e743]]
Former-commit-id: afa8ac249a3defa7bcb35324e0be32ecf763713e [formerly 100e24245f]
Former-commit-id: 2d7c61f0a8
2014-10-01 10:22:25 -05:00
Nate Jensen
0e57a71184 Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7

Former-commit-id: 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 41427a57bb [formerly 799ba1babf [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]]
Former-commit-id: 41427a57bb
Former-commit-id: 0b0b9900fe [formerly e6100e8e7f] [formerly 8b3857e4c194aa2076e394aa0028ebf5c0ba2ab8 [formerly 78054658a3]]
Former-commit-id: eac63f07f79044de4bb76979473040b0e13d3b46 [formerly 86271d7dc9]
Former-commit-id: 18f7a6f1c0
2014-10-01 09:46:56 -05:00
Ron Anderson
df1ed325c5 Merge "Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm" into omaha_14.4.1
Former-commit-id: db992519c5 [formerly 83e7ceb415] [formerly 0750ccc067] [formerly db992519c5 [formerly 83e7ceb415] [formerly 0750ccc067] [formerly eb73f57321 [formerly 0750ccc067 [formerly 3e2a6efb67a9dda839bafe60bffc1d590ffe236c]]]]
Former-commit-id: eb73f57321
Former-commit-id: cf160047e3 [formerly 8df115bd06] [formerly 103c14a4b9eb0b04257367911c7209355a082a07 [formerly 149f4a4703]]
Former-commit-id: 85eff0892071ddb41a1d872cabfd68c5cb68d7b5 [formerly 68dfc93fe1]
Former-commit-id: 0b9028216f
2014-10-01 09:20:11 -05:00
Ron Anderson
92071a03c6 Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8

Former-commit-id: f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f44ac32b1e [formerly ec1530c5e8 [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]]]]
Former-commit-id: f44ac32b1e
Former-commit-id: 88aae9d195 [formerly 841e270b6f] [formerly 8544b7d76afb53dadb3f5d65587b33d13b6e8ede [formerly b59e41705c]]
Former-commit-id: a736762ec6fda2c02a849ad08fec20a2cb13b150 [formerly 50acd7dc68]
Former-commit-id: 2d64e79be9
2014-09-30 14:09:31 -05:00
Chris Cody
239db8b8c8 Omaha #3365 Realign AWIPS2_baseline tests
Change-Id: I648d8bb6a62bb48c368e975aa65f45f1bcc7641f

Former-commit-id: c1468c97fb [formerly 9397356128] [formerly 98b767f573] [formerly c1468c97fb [formerly 9397356128] [formerly 98b767f573] [formerly 1f9c825de5 [formerly 98b767f573 [formerly 947bc37728f62ff4375f23b9eb8bc7142e220a90]]]]
Former-commit-id: 1f9c825de5
Former-commit-id: 31fbd06912 [formerly c6b1ff4e90] [formerly 62a7ea8c47bc0ed51d1ffff50aaf9436e4370625 [formerly 0d677d1aca]]
Former-commit-id: dca085578a33d714dae7b307df993171ea3bf283 [formerly 503a27310c]
Former-commit-id: d480271aeb
2014-09-30 12:53:20 -05:00
dmsys
6b2eccce36 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
2014-09-30 13:45:54 -04:00
Nate Jensen
c542e399b8 Merge "Omaha #3629 Replacing matchElement()" into omaha_14.4.1
Former-commit-id: 20607f9d3f [formerly 5e97eb494e] [formerly 4569b23701] [formerly 20607f9d3f [formerly 5e97eb494e] [formerly 4569b23701] [formerly 3b0296cc99 [formerly 4569b23701 [formerly 5861d0f99dd2f89a37f72736e139233ea3337605]]]]
Former-commit-id: 3b0296cc99
Former-commit-id: 01a2917fa4 [formerly 8ceb856440] [formerly c91353142e7bf11c4897efe8382589a87814b257 [formerly fa29bf050e]]
Former-commit-id: 1bb587be0f9aa235fb55e6d5748a90dfd8945b3b [formerly 0eb6bd03d0]
Former-commit-id: a0cdaf33fe
2014-09-30 11:58:02 -05:00
Richard Peter
56992359cb Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
Former-commit-id: 8e6a3af18c [formerly b81e0f4549] [formerly 9c0692f861] [formerly 8e6a3af18c [formerly b81e0f4549] [formerly 9c0692f861] [formerly 02fb12501e [formerly 9c0692f861 [formerly cac5f4e1c1f25ea1c5b9083410c1eeaf6b4af0f4]]]]
Former-commit-id: 02fb12501e
Former-commit-id: 09f22628e7 [formerly a33c36417b] [formerly b506c340003f665c31bceb5d0d8635dc508891b0 [formerly 4e05ef95b6]]
Former-commit-id: 061db7299a8ad9ad52f5905f51fb665c135e05ef [formerly 0e13f93da4]
Former-commit-id: 27df0ccc12
2014-09-30 11:45:25 -05:00
Mark Peters
dace392b52 Omaha #3629 Replacing matchElement()
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e

Former-commit-id: 17f328433b [formerly 6a0703ad98] [formerly 6d59eb314d] [formerly 17f328433b [formerly 6a0703ad98] [formerly 6d59eb314d] [formerly 776420f2d9 [formerly 6d59eb314d [formerly 6f898cc3d7f30651846847c5645ec26ac448ec83]]]]
Former-commit-id: 776420f2d9
Former-commit-id: 2aca950d56 [formerly 406c3795ee] [formerly 481f92370c660fe23d20cbaa438c290c5ce59ec8 [formerly d3c3ee2a61]]
Former-commit-id: 933ace9809c28513ea230a66de34251731def17e [formerly 6c9aa42dba]
Former-commit-id: bc20d29233
2014-09-30 11:39:40 -05:00
Ron Anderson
22a9dee901 Omaha #3622 Fix null pointer in ServiceBackupLockManager
Change-Id: Idd29ac0b5330d9f2167c8fdc4acfd6e1ed961a99

Former-commit-id: edc1a9664a [formerly 83e46bb3d6] [formerly 437f2fdc47] [formerly edc1a9664a [formerly 83e46bb3d6] [formerly 437f2fdc47] [formerly 1c6fa09d4f [formerly 437f2fdc47 [formerly e6ae629d1667943ae7bf25598f32e2b479e748b1]]]]
Former-commit-id: 1c6fa09d4f
Former-commit-id: c7af0da2fb [formerly ed2caa33af] [formerly 7cbceaa2c98ab56f6535e4bc3681f01d67b2f983 [formerly 80ebbc73ef]]
Former-commit-id: 0e41edb3dd5c5453c6dcd203a98b061f9c836d08 [formerly b76b428114]
Former-commit-id: 0996164214
2014-09-30 11:32:30 -05:00