Nate Jensen
b638e6e0f6
Omaha #3549 remove unnecessary @Column annotations from TextRecord
...
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e
Former-commit-id: 4a5b66b00fbb53b4fcb4340366347ae4b08e6992
2014-10-10 09:01:29 -05:00
Nate Jensen
ee51fe1977
Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
...
Former-commit-id: 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc
2014-10-09 18:30:33 -05:00
Mark Peters
6bb4f5dbdf
Omaha #3644 Remove dataURI from ccfp plugin
...
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27
Former-commit-id: 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea
2014-10-09 15:30:23 -05:00
Mark Peters
63069f5adc
Omaha #3629 Fix null pointer exceptions from matchElement() replacements
...
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513
Former-commit-id: e0330ab61d027ee3b8512230b64000bb7f3d71f1
2014-10-09 11:17:53 -05:00
Ben Steffensmeier
b865762b4f
Omaha #3674 Fix a few viirs projection bugs.
...
Former-commit-id: e0ec387c62e64a19a4d598578f18ee17686f312a
2014-10-08 12:21:03 -05:00
Nate Jensen
5cf1821a6a
Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
...
Former-commit-id: 87f49d9bcc07d2178a535fc934d02cab36063894
2014-10-08 11:36:44 -05:00
Richard Peter
a9562d992c
Omaha #3300 Fix merge of OB_14.3.1-25m
...
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632
Former-commit-id: 110499cec453532545431a6fa05057f47af66ed2
2014-10-07 16:32:48 -05:00
Richard Peter
1bc24c3be2
Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
...
Former-commit-id: 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5
2014-10-07 15:13:11 -05:00
Nate Jensen
726eea342f
Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
...
Former-commit-id: cdeea610953d82fe2b380341b3059b15b6ecd1ff
2014-10-07 13:53:43 -05:00
Steve Harris
c9e37bf440
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: 6bb7a7312a22a9585d2f5981d873751879082cb1
2014-10-07 13:35:58 -05:00
Brian Clements
ec37971eff
Omaha #3398 moved user and userid to core
...
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407
Former-commit-id: a758b7aff6b30194a3180fddffcefa5d019f2ee5
2014-10-07 10:43:47 -05:00
Brian Clements
81c73519c2
Omaha #3690 added tool to remove empty localization dirs
...
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: a69773742e571a334ef1fd000ff8311805f9c737
2014-10-07 08:37:47 -05:00
Ben Steffensmeier
997bfd689d
Omaha #3702 register database plugin to fxa database.
...
Former-commit-id: 7fa6925c27330262dd0a70afcb77c589718cf1f7
2014-10-06 20:00:19 -05:00
Steve Harris
2db03d95b3
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
...
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
2014-10-06 13:57:59 -05:00
Nate Jensen
05ae6c5d9b
Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
...
Former-commit-id: ded3f476047f92d48891613e4c0b78d20858f1ff
2014-10-06 09:08:03 -05:00
Richard Peter
b5f23b8b98
Omaha #3300 Fix merge of 14.3.1-23
...
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 075f3f69cbf19d298398cb7c481668b97d4dad5d
2014-10-03 14:14:16 -05:00
Brian.Dyke
92762f46c7
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 23d16004c389f0ef708bee2a8bfb84d465b7b36b
2014-10-03 14:04:46 -04:00
Steve Harris
2616fe04b6
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: 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd
2014-10-03 10:18:34 -05:00
Mark Peters
fb62a1e35b
Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
...
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348
Former-commit-id: 475fa37d70d51e5e9538141730fbead4a6b5d88e
2014-10-02 15:36:22 -05:00
Brian.Dyke
20dd249d2c
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 441fc7561a8526422f9b73b9c47cd220f0babb54
2014-10-02 10:44:50 -04:00
Brian.Dyke
f3f95aabb0
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
2014-10-02 10:38:51 -04:00
Brian.Dyke
2ac30f6c22
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
2014-10-02 10:24:04 -04:00
Brian.Dyke
97464ea153
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: f26e54011d334972bb1e999304b1b2d13a1c408f
2014-10-02 10:15:34 -04:00
Steve Harris
cc34483b0b
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
...
Former-commit-id: ace8473f96c6151918ee8ecf61e3b8986d98a68a
2014-10-02 08:09:02 -05:00
Shawn.Hooper
ae02cbc2da
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
...
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: ea8e4c3a30bceb2f3b53159317382ae651aa5531
2014-10-01 15:58:48 -04:00
Brian.Dyke
a4bfbea3c2
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 622e63224b6d6bf1d6ced874658bbd9db381799b
2014-10-01 15:36:06 -04:00
Nathan Bowler
e4779f2e66
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
...
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: d67d1e941b89357e7d86fa0f810a82f9e01f4c27
2014-10-01 14:57:16 -04:00
dmsys
9f4560c480
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: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
2014-09-30 13:45:54 -04:00
Nate Jensen
3b0296cc99
Merge "Omaha #3629 Replacing matchElement()" into omaha_14.4.1
...
Former-commit-id: 5861d0f99dd2f89a37f72736e139233ea3337605
2014-09-30 11:58:02 -05:00
Richard Peter
02fb12501e
Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
...
Former-commit-id: cac5f4e1c1f25ea1c5b9083410c1eeaf6b4af0f4
2014-09-30 11:45:25 -05:00
Mark Peters
776420f2d9
Omaha #3629 Replacing matchElement()
...
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e
Former-commit-id: 6f898cc3d7f30651846847c5645ec26ac448ec83
2014-09-30 11:39:40 -05:00
Ron Anderson
1c6fa09d4f
Omaha #3622 Fix null pointer in ServiceBackupLockManager
...
Change-Id: Idd29ac0b5330d9f2167c8fdc4acfd6e1ed961a99
Former-commit-id: e6ae629d1667943ae7bf25598f32e2b479e748b1
2014-09-30 11:32:30 -05:00
Nate Jensen
6a1ee6a5d0
Omaha #3671 turn on LZF compression of satellite hdf5 data
...
Change-Id: I6709fa5a262a0119d81d2b22745c2d4f67d649aa
Former-commit-id: 2f79d47e4ed5aaf316d54a442123b9906fa8d2b9
2014-09-30 10:58:21 -05:00
Ron Anderson
3e3a2c2f70
Omaha #3300 Merge #3661 and #3670 changes into 14.4.1 from 14.3.1_backports
...
Change-Id: I2be578791e61964c3e2fd6b2d810ef492056b69c
Former-commit-id: 525cffa1ec2a999d97a5fc3ca2153c8241c534be
2014-09-30 08:44:01 -05:00
Steve Harris
3b6a8a1447
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
Steve Harris
c03bc273da
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
...
Former-commit-id: 49ad8e0e780443a0439227694a92ec8ab683b125
2014-09-29 11:14:32 -05:00
Ben Steffensmeier
5b10ac2f36
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
2014-09-29 10:49:14 -05:00
Brian.Dyke
46af1d0857
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
2014-09-29 11:20:57 -04:00
Mark Peters
0c657c2a49
Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins
...
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4
Former-commit-id: e196f02cf7533498280b252e9c345f9b3c4a3629
2014-09-26 14:50:03 -05:00
Brian.Dyke
814b9a2869
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 60756ddb841a0daa347493047b76d2fcb93f7f4a
2014-09-26 15:15:57 -04:00
Brian.Dyke
a4f68caac6
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
2014-09-26 13:02:49 -04:00
Richard Peter
1656522716
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications. Check in the rest of the changes I missed the first time." into omaha_14.4.1
...
Former-commit-id: 3daaa4e6b33bd284a088f290b40b7f63b4c27a43
2014-09-26 11:44:41 -05:00
Ron Anderson
43d3aca5ea
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Check in the rest of the changes I missed the first time.
Change-Id: I8640f8f09aeb6019374a857daf335b27c69e0880
Former-commit-id: 67d19df57e57a77a0a1a83e695631a7a9cb22368
2014-09-26 11:39:06 -05:00
Richard Peter
23747ad042
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
...
Former-commit-id: acbc667cfeab1ab6449a93967896e6e303bb238d
2014-09-26 11:27:53 -05:00
Brian.Dyke
bd983e1932
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7
2014-09-26 11:47:38 -04:00
Ron Anderson
dd4f22789a
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: 8f687189a5c71f3bd04b5e31f6a45606fe456386
2014-09-26 15:19:08 +00:00
Shawn.Hooper
831af82c23
ASM #600 - WarnGen: template optional watch inclusion
...
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 04bd69f437b897d63ac78d6cbd7c60451366cc6d
2014-09-25 16:25:43 -04:00
Ron Anderson
34df50963e
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
...
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: 8c177752b8e2baa2e739fc69320c4e4b31d972c7
2014-09-25 13:48:11 -05:00
Ana Rivera
c1b58f214f
VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
...
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f
Former-commit-id: cf3d9a81a52c19977371e3abee755d1c239b1f8a
2014-09-25 18:18:21 +00:00
Kevin.Johnson
4d8efeeb9a
ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
...
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7
Former-commit-id: c36b732cc8057cf7b830de647998f679725760da
2014-09-25 10:50:07 -04:00
