Nate Jensen
7a5bc79ac1
Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
...
Former-commit-id: 24bf87097728545083c505ae6c5d9b05ae6c5d9b8250390a62
2014-10-06 09:08:03 -05:00
Nate Jensen
3941281bb0
Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
...
Former-commit-id: b544abb498baec32be2023c5ea21e423c5ea21e488afde5dfa
2014-10-06 09:07:38 -05:00
Richard Peter
84a1b71e23
Omaha #3300 Fix merge of 14.3.1-23
...
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 2422c00fbd5a0dc20480b5f23b8b98b5f23b8b984ada2c1c77
2014-10-03 14:14:16 -05:00
Steve Harris
306826aed9
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: f4b771ea72da463c484e2616fe04b62616fe04b6523cedbb56
2014-10-03 10:18:34 -05:00
Mark Peters
77da058a9f
Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
...
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348
Former-commit-id: ffe3444650955f21a85cfb62a1e35bfb62a1e35b6315da5482
2014-10-02 15:36:22 -05:00
Nate Jensen
23ebf782f3
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
...
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 9f74ca65bce964375fcc33e3281d5533e3281d556670e31705
2014-10-02 08:49:32 -05:00
Nate Jensen
00fb5931d1
Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
...
Former-commit-id: 9e4bd6c1b7cddda47923aa43004f85aa43004f852bca618f67
2014-10-02 07:57:30 -05:00
Nate Jensen
026a2eaa11
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
...
Former-commit-id: dd72c8e139116f6840e253f2bf839553f2bf839596790c0377
2014-10-01 15:06:03 -05:00
Andrew Benak
c711fa910f
Omaha #3638 plugin xml for *export.point is now properly included
...
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 8ae0af5c6f659f4869bc7c7510d4717c7510d471f2cfa613fc
2014-10-01 14:30:28 -05:00
Nate Jensen
3e9cb23496
Omaha #2975 fix mkdirs() bug
...
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 74883424ca319ea7848087d1286a0c87d1286a0cb658187cdb
2014-10-01 14:22:22 -05:00
Nathan Bowler
b52c1bcafd
Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
...
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d
Former-commit-id: 2d5d90c055368b6341b0e4779f2e66e4779f2e66a72fec1b38
2014-10-01 14:57:16 -04:00
Nate Jensen
e65065461c
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
...
Former-commit-id: f7eac5f1dba5e4190b353146dd083c3146dd083c728328f400
2014-10-01 11:55:38 -05:00
Nate Jensen
d41f587a8d
Merge "Omaha #3596 Adding original, unaltered satellite scripts." into omaha_14.4.1
...
Former-commit-id: 7a1508ac907c5b340168629ab024dc629ab024dc8b4bbbaea0
2014-10-01 11:46:51 -05:00
Lee Venable
4390c9cb27
Merge "Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing." into omaha_14.4.1
...
Former-commit-id: 3c26abe355d12c4b998eaaf3198443aaf31984435199641313
2014-10-01 11:45:05 -05:00
Nathan Bowler
89a119ad6f
Omaha #3596 Adding original, unaltered satellite scripts.
...
Change-Id: I6441898e986df707376ee61d5952641dc7e9f266
Former-commit-id: 8f39df9850ce2dac6af930a565a88b30a565a88b92d069371c
2014-10-01 12:31:57 -04:00
Robert Blum
4bb7ed8b2f
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
...
Former-commit-id: 6a775aa2bea1d23e4198d5994a8a6bd5994a8a6b6c1676e743
2014-10-01 10:22:25 -05:00
Nate Jensen
e6100e8e7f
Omaha #3678 don't enable jmx at alertviz or cave startup
...
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 131f5ec9f7799ba1babf41427a57bb41427a57bb78054658a3
2014-10-01 09:46:56 -05:00
Ron Anderson
8df115bd06
Merge "Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm" into omaha_14.4.1
...
Former-commit-id: 83e7ceb4150750ccc067eb73f57321eb73f57321149f4a4703
2014-10-01 09:20:11 -05:00
Ron Anderson
841e270b6f
Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
...
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8
Former-commit-id: 35657166eaec1530c5e8f44ac32b1ef44ac32b1eb59e41705c
2014-09-30 14:09:31 -05:00
Chris Cody
c6b1ff4e90
Omaha #3365 Realign AWIPS2_baseline tests
...
Change-Id: I648d8bb6a62bb48c368e975aa65f45f1bcc7641f
Former-commit-id: 939735612898b767f5731f9c825de51f9c825de50d677d1aca
2014-09-30 12:53:20 -05:00
dmsys
07f84c6b26
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: f704781f4f8c3625cfec9f4560c4809f4560c480b884e5e32d
2014-09-30 13:45:54 -04:00
Nate Jensen
8ceb856440
Merge "Omaha #3629 Replacing matchElement()" into omaha_14.4.1
...
Former-commit-id: 5e97eb494e4569b237013b0296cc993b0296cc99fa29bf050e
2014-09-30 11:58:02 -05:00
Richard Peter
a33c36417b
Merge "Omaha #3622 Fix null pointer in ServiceBackupLockManager" into omaha_14.4.1
...
Former-commit-id: b81e0f45499c0692f86102fb12501e02fb12501e4e05ef95b6
2014-09-30 11:45:25 -05:00
Mark Peters
406c3795ee
Omaha #3629 Replacing matchElement()
...
Change-Id: Ie8ae1347a1aeb99532e42c7a3af7d200cf4c3a1e
Former-commit-id: 6a0703ad986d59eb314d776420f2d9776420f2d9d3c3ee2a61
2014-09-30 11:39:40 -05:00
Ron Anderson
ed2caa33af
Omaha #3622 Fix null pointer in ServiceBackupLockManager
...
Change-Id: Idd29ac0b5330d9f2167c8fdc4acfd6e1ed961a99
Former-commit-id: 83e46bb3d6437f2fdc471c6fa09d4f1c6fa09d4f80ebbc73ef
2014-09-30 11:32:30 -05:00
Nate Jensen
40b7f9b574
Omaha #3671 turn on LZF compression of satellite hdf5 data
...
Change-Id: I6709fa5a262a0119d81d2b22745c2d4f67d649aa
Former-commit-id: 9158ce06e27e3b5f973b6a1ee6a5d06a1ee6a5d0e288d38707
2014-09-30 10:58:21 -05:00
Ron Anderson
e9ba2ceb6b
Omaha #3300 Merge #3661 and #3670 changes into 14.4.1 from 14.3.1_backports
...
Change-Id: I2be578791e61964c3e2fd6b2d810ef492056b69c
Former-commit-id: b948adc7d3ec910127b63e3a2c2f703e3a2c2f70be738e8f4b
2014-09-30 08:44:01 -05:00
Nate Jensen
12ede9423a
Omaha #3663 move features that contain primarily ncep plugins to ncep
...
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: 867a0e09ae1b51c484688c0a087bf08c0a087bf0d4793b5521
2014-09-29 17:24:34 -05:00
Ron Anderson
d1ef4c7284
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
...
Former-commit-id: 8116a665a8a9827b0545245804a21a245804a21a4ebb5b59df
2014-09-29 16:10:37 -05:00
Steve Harris
842abaad49
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: 3598e9b5b690e08b96e13b6a8a14473b6a8a14476330a62e85
2014-09-29 12:58:56 -05:00
Nate Jensen
32bd82e744
Omaha #2975 optimize lookup of edit areas and gfe configs
...
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: c75ff5530d1b70e053a1c3648d1989c3648d19890b2e919eae
2014-09-29 12:29:25 -05:00
Brian.Dyke
3b3e81d4a2
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 9661a1d7b10c1b83b6440e0255ce5b0e0255ce5b77e8985bdd
2014-09-29 11:55:16 -04:00
Ben Steffensmeier
0724aa4e71
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 6090625040f92d021e965b10ac2f365b10ac2f36107ccbf332
2014-09-29 10:49:14 -05:00
Sean.Webb
8a2e8285c1
Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
...
Former-commit-id: c679d1cc46fbd892909b2d531d73fd2d531d73fd1a70eea0e0
2014-09-29 10:35:10 -05:00
Brian.Dyke
886c1b7e3d
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: fce029653d0a497fc01546af1d085746af1d085785676ff532
2014-09-29 11:20:57 -04:00
Sean.Webb
1538817a38
ASM #16720 - Added pushd and cd prior to patch extraction
...
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: 224cddfe9b02e187a609600b75bd9f600b75bd9f293f860e93
2014-09-29 10:24:04 -04:00
Sean.Webb
7eebdb1a1f
Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
...
Former-commit-id: 9b25583e3adc3ad9863d6e1f0363c86e1f0363c8323adcd30c
2014-09-29 08:31:44 -05:00
Sean.Webb
d70bc9fd9f
ASM #16720 - Removed extraneous popd which was changing dir when not needed
...
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 6840d553430738a41cbf78f83fa59478f83fa594197908686e
2014-09-29 08:21:00 -04:00
Brian.Dyke
5da730103f
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: 8e459ec500550ffba7b0142432ba5e142432ba5e63e3d61ff5
2014-09-26 16:14:06 -04:00
David Friedman
78f7f0fc88
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 86100b6ca86791e8d88505707d0f2005707d0f20b3bd3a9d7f
2014-09-26 20:05:46 +00:00
Mark Peters
34d60c7e4a
Omaha #3629 Move datatype specific code from edex.decodertools to the specific datatype edex plugins
...
Change-Id: I6b66103ef55107df78fdbb047dfb8c743deaf2d4
Former-commit-id: 5fb76a1532549cf2a2b10c657c2a490c657c2a498084133432
2014-09-26 14:50:03 -05:00
Brian.Dyke
ee0c04ae93
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 858cfa107841921f7db2814b9a2869814b9a2869a2b18e4bee
2014-09-26 15:15:57 -04:00
Brian.Dyke
fecebad9b6
Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 2495e16947989a9c5835f1755fb7aef1755fb7ae8c2c886675
2014-09-26 14:20:34 -04:00
Brian.Dyke
f6af0dd0df
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: 396f9755dc1ac61fb612f26fe97ec4f26fe97ec433525968e3
2014-09-26 14:19:03 -04:00
Richard Peter
6f8183557e
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: 5b023b628e941305b33d16565227161656522716844717fb57
2014-09-26 11:44:41 -05:00
Ron Anderson
9bdae769c6
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Check in the rest of the changes I missed the first time.
Change-Id: I8640f8f09aeb6019374a857daf335b27c69e0880
Former-commit-id: e2d5bfa0b6b032f7f24e43d3aca5ea43d3aca5eabc8a515870
2014-09-26 11:39:06 -05:00
Richard Peter
fffd7c6f48
Merge "Omaha #3622 Fix duplicate SiteActivationNotifications." into omaha_14.4.1
...
Former-commit-id: c9c4dda54ca4668b64a623747ad04223747ad042554f75dc16
2014-09-26 11:27:53 -05:00
Sean.Webb
b18f341781
Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
...
Former-commit-id: e8585c9d2996503843d957342f025657342f0256d43119b40f
2014-09-26 11:01:04 -05:00
Brian.Dyke
30f8b55a19
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: 0045c3100f586a504500bd983e1932bd983e193295d80abd56
2014-09-26 11:47:38 -04:00
Ron Anderson
c4b97646fc
Omaha #3622 Fix duplicate SiteActivationNotifications.
...
Change-Id: I647bf118f558721867722cfc13d889e637237911
Former-commit-id: 71aad3ecff92575e8db3dd4f22789add4f22789a891e864f00
2014-09-26 15:19:08 +00:00
