xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4819 commits 31 branches 40 tags 3.8 GiB
Commit graph

2667 commits

Author SHA1 Message Date
David Friedman
8f8f55dd3c Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: 32a7adbe4b [formerly fd900e38c2] [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1168a3eae5 [formerly 533d15c863]
Former-commit-id: dde12b4fc3
 2014-03-27 19:17:03 +00:00
Brian.Dyke
e7aea77979 Fixed comment merge conflicts added .gitignore 
Former-commit-id: 027cca8673 [formerly 7cc471a9c9] [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 412a7eb2c2 [formerly d8256c4226]
Former-commit-id: c19fc33493
 2014-03-25 15:41:58 -04:00
Brian.Dyke
2ba9b8825b OB_14.1.1-25 baseline 
Former-commit-id: c085bc6879 [formerly c67833407c] [formerly c085bc6879 [formerly c67833407c] [formerly 074abeb0fa [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 95ada25b65 [formerly 36fdf6bfe4]
Former-commit-id: 05ab17425c
 2014-03-25 13:55:54 -04:00
Brian.Dyke
aea0544eec Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 50e5f4f78d [formerly 06ee9a6384] [formerly 50e5f4f78d [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: d97b88f433 [formerly 14567f20a7]
Former-commit-id: f540c6fb2d
 2014-03-24 07:01:29 -04:00
Brian.Dyke
7aeb9af309 OB_14.1.1-24 baseline 
Former-commit-id: 37e9d48d45 [formerly 37b6368268] [formerly 37e9d48d45 [formerly 37b6368268] [formerly face1ebeeb [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: cfa058a345 [formerly 6b2175da93]
Former-commit-id: 2fda566cfb
 2014-03-21 12:43:50 -04:00
steve.naples
f0b105bbdf ASM #428 Updated SATPRE file header to correct reftime. 
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204

Former-commit-id: 64b19f2e41 [formerly d0f4df4ad9] [formerly 64b19f2e41 [formerly d0f4df4ad9] [formerly 1aa970164f [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]
Former-commit-id: 1aa970164f
Former-commit-id: 885ceb834b [formerly 9c9ddaba6a]
Former-commit-id: 47e1a3627f
 2014-03-19 18:16:41 +00:00
Juliya Dynina
de68dcfeb4 Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2 
Former-commit-id: d6e2b7f741 [formerly c735051e00] [formerly d6e2b7f741 [formerly c735051e00] [formerly 867f00b438 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]]
Former-commit-id: 867f00b438
Former-commit-id: ed07060240 [formerly c54631024a]
Former-commit-id: d34b5c1a2c
 2014-03-18 08:13:51 -05:00
Qinglu.Lin
119fc9840e ASM #335 - Watch wording not being inserted for SMW and SMW followup 
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05

Former-commit-id: 09e90dfe43 [formerly 4b3c821ce0] [formerly 09e90dfe43 [formerly 4b3c821ce0] [formerly af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]
Former-commit-id: af82143e84
Former-commit-id: 1b352b8600 [formerly bd7d68bd16]
Former-commit-id: 72b8b32e25
 2014-03-17 18:17:49 -04:00
Matthew Howard
ab71d9e4d4 Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2 
Former-commit-id: 30e8d76f50 [formerly c1433db0fb] [formerly 30e8d76f50 [formerly c1433db0fb] [formerly 1d15cda9fd [formerly 1b46d5c169709a9498a5eb9963286a6223089af4]]]
Former-commit-id: 1d15cda9fd
Former-commit-id: 4ec6bd0a21 [formerly 6b5bbb1270]
Former-commit-id: 930eb52d95
 2014-03-14 19:47:32 -05:00
Rici.Yu
f32491f913 ASM #84 - fix default time range for smart tools 
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99

Former-commit-id: c559ade333 [formerly 74b1c827ee] [formerly c559ade333 [formerly 74b1c827ee] [formerly 58f9857344 [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]
Former-commit-id: 58f9857344
Former-commit-id: e877c81c88 [formerly 0ee8baf0c3]
Former-commit-id: 1684740d02
 2014-03-14 14:39:56 -04:00
Brian.Dyke
92ed2895fb Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 24a63fb05a [formerly 030a18f804] [formerly 24a63fb05a [formerly 030a18f804] [formerly 30084d7f84 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]
Former-commit-id: 30084d7f84
Former-commit-id: 916fec5a4f [formerly 2109409b24]
Former-commit-id: f20020876a
 2014-03-14 10:15:53 -04:00
Brian.Dyke
516ba8e81a Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 4e3096631d [formerly d4b6d22ae2] [formerly 4e3096631d [formerly d4b6d22ae2] [formerly f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]
Former-commit-id: f999e48df0
Former-commit-id: 82756e3855 [formerly 3ab2df3507]
Former-commit-id: 76271269c5
 2014-03-14 08:44:39 -04:00
Kevin P. Johnson
90a9e642e3 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call 
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: e3a951da78 [formerly b2797a0788] [formerly e3a951da78 [formerly b2797a0788] [formerly 4c833d3389 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]
Former-commit-id: 4c833d3389
Former-commit-id: 32b372db4b [formerly 17a4229072]
Former-commit-id: eb12ec9c14
 2014-03-13 20:42:12 +00:00
Juliya Dynina
a732e97bba Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2 
Former-commit-id: 2a9de9706e [formerly 6ac6f6f1fc] [formerly 2a9de9706e [formerly 6ac6f6f1fc] [formerly b296595184 [formerly f28ab35657154bb028f3ca710ccc0b42d7c04b70]]]
Former-commit-id: b296595184
Former-commit-id: ced1197a83 [formerly ee8e55431b]
Former-commit-id: c2929b2bf3
 2014-03-12 11:36:38 -05:00
Loubna.Bousaidi
1eb79ede56 ASM #380 - Hydro--TimeSeries:error thrown when click Table button 
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09

Former-commit-id: 27447d7b76 [formerly 123007b18d] [formerly 27447d7b76 [formerly 123007b18d] [formerly ce2bea0a04 [formerly d2161a0fdd0bad7f8266a8b30659021edecaa549]]]
Former-commit-id: ce2bea0a04
Former-commit-id: b5cb73fd5a [formerly 6f7b1b6ca8]
Former-commit-id: 7eb94c4651
 2014-03-11 18:58:26 +00:00
Nate Jensen
39d73f1569 Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1 
Former-commit-id: cef0438c35 [formerly 85f5821a6f] [formerly cef0438c35 [formerly 85f5821a6f] [formerly afbdf6962c [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]
Former-commit-id: afbdf6962c
Former-commit-id: 3411167042 [formerly 09f4bd9883]
Former-commit-id: be9744c6f9
 2014-03-11 12:35:44 -05:00
Ben Steffensmeier
470ac4a1b9 Issue #2896 Fix sat best res on weird projections 
Former-commit-id: c7fa392f3f [formerly 8bb517836a] [formerly c7fa392f3f [formerly 8bb517836a] [formerly 560fc688bc [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]
Former-commit-id: 560fc688bc
Former-commit-id: 7a06fdd71a [formerly b474e92189]
Former-commit-id: 30683880ee
 2014-03-11 11:07:43 -05:00
Nate Jensen
391deee18c Issue #2779 update memory settings for renamed NC perspective 
Former-commit-id: 17aa39ce0a [formerly ccb06db199] [formerly 17aa39ce0a [formerly ccb06db199] [formerly 5eb892f4cf [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 42c545804c [formerly 22ff235bcf]
Former-commit-id: 15a2fb216e
 2014-03-11 10:28:01 -05:00
brian.dyke
fba0188c90 Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1 
Former-commit-id: 1a482f91bc [formerly 654778bb0d] [formerly 1a482f91bc [formerly 654778bb0d] [formerly b1b216f196 [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: d1b389ae05 [formerly d57a3dd24c]
Former-commit-id: f3df3e3690
 2014-03-10 15:36:56 -04:00
steve.naples
9fc779bbfb ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch. 
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97

Former-commit-id: 0d44e46f88 [formerly 212677f94b] [formerly 0d44e46f88 [formerly 212677f94b] [formerly 20582ab173 [formerly cd7d6876338b98c320a8d7559c518e32e90e3000]]]
Former-commit-id: 20582ab173
Former-commit-id: 38fca1641f [formerly 488d87dbe4]
Former-commit-id: dc08fb750b
 2014-03-10 17:47:25 +00:00
steve.naples
74ea78b1a5 ASM #336 MPEFieldResource updated to add case for PRISM data unit conversion. 
Change-Id: I8f129902079c051ca4fb508e43b8bf892cb19e0e

Former-commit-id: c877c8b61b [formerly 915e3c2c66] [formerly c877c8b61b [formerly 915e3c2c66] [formerly 7432b146ed [formerly 482547a4f4eaff0fc24b6d3f1103a38a9f3aa314]]]
Former-commit-id: 7432b146ed
Former-commit-id: 36e3819aad [formerly 796ba75949]
Former-commit-id: f390c8ce3c
 2014-03-10 17:40:35 +00:00
Nate Jensen
6bafc51abe Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: 5a88f31a2b [formerly 6a75fe686a] [formerly 5a88f31a2b [formerly 6a75fe686a] [formerly d599db4af2 [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]
Former-commit-id: d599db4af2
Former-commit-id: 39aa26c2b6 [formerly 5094008bea]
Former-commit-id: 19a0cfb972
 2014-03-10 10:03:02 -05:00
Steve Harris
e29b96b6bd Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 068297b90a [formerly 92232fa063] [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: 4d1fbf8743 [formerly f992a6b046]
Former-commit-id: ea01373320
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
db1c090463 ASM #378 - MPE gages are not listed/available in gage table 
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: b46b87cb5e [formerly 8c9f9b3ae0] [formerly b46b87cb5e [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]
Former-commit-id: dc3aadd149
Former-commit-id: 68d8f9be14 [formerly 05bb380e77]
Former-commit-id: 26a112b34b
 2014-03-07 12:57:36 -05:00
Brian.Dyke
ac07a4fc49 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: a0e3f08fce [formerly 394076196b] [formerly a0e3f08fce [formerly 394076196b] [formerly 7b798ab5d2 [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: fa189c0ef6 [formerly 6ced1bedc2]
Former-commit-id: c8b3730fef
 2014-03-07 09:01:09 -05:00
Brian.Dyke
da36dde938 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: 0bbf137b05 [formerly 312cd8a3e8] [formerly 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 2eec413d72 [formerly 2f94480121]
Former-commit-id: 8f2271403d
 2014-03-07 08:57:07 -05:00
Brian.Dyke
c1dab50ce0 14.1.1-22 baseline 
Former-commit-id: fe30e1d545 [formerly 21f17d4f9b] [formerly fe30e1d545 [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 9406a1d6c0 [formerly a4c136fd60]
Former-commit-id: 067802b104
 2014-03-07 08:49:00 -05:00
Steve Harris
71c8e15b78 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 3358e8d6ef [formerly 7f1ad89df9] [formerly 3358e8d6ef [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 2371a74a29 [formerly 8ec20fc5e9]
Former-commit-id: 104b3d369a
 2014-03-06 18:19:55 -06:00
Juliya Dynina
46753de399 Merge "ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen)" into asm_14.2.2 
Former-commit-id: 13de22927f [formerly 1d2b7f8f94] [formerly 13de22927f [formerly 1d2b7f8f94] [formerly a5514689cd [formerly 165999c4d3048b27d97cf530ec21051721c9747c]]]
Former-commit-id: a5514689cd
Former-commit-id: 208844154c [formerly 122fb73f6e]
Former-commit-id: 858b51c311
 2014-03-06 15:53:31 -05:00
Brian.Dyke
8de6b2d57b ASM #124 - Display GLD360 lightning data 
Former-commit-id: bd81ebd8c2 [formerly db274c890f] [formerly bd81ebd8c2 [formerly db274c890f] [formerly eefe8c45fe [formerly 1edba9216beac913f9bd867da9988e213394a396]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 26140187b1 [formerly b657767cb1]
Former-commit-id: b9e9126e11
 2014-03-06 10:54:15 -05:00
Steve Harris
2db5dcf6eb Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 3ba28aabea [formerly 069093884f] [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 587f15a95d [formerly 96658d8ce0]
Former-commit-id: 36a0533f19
 2014-03-06 08:39:43 -06:00
Qinglu.Lin
b4a87b4a34 ASM #329 - 'County/Zone names missing' error for counties with a - (hyphen) 
Change-Id: I438fe078be9161e58faebc25b03f8416e9f00319

Former-commit-id: 8ad36bdda1 [formerly b31998815d] [formerly 8ad36bdda1 [formerly b31998815d] [formerly e9d6eae852 [formerly 5ffc345efdc6d1d9fabf522f3247a1f1c4f62d6b]]]
Former-commit-id: e9d6eae852
Former-commit-id: 8385758126 [formerly 74b0e337df]
Former-commit-id: 6fa4ed6e74
 2014-03-05 16:51:03 -05:00
Lee Venable
4b81954f16 Issue #2833 - fixed a widget disposed error. 
Former-commit-id: f38afb0976 [formerly e71dad9c80] [formerly f38afb0976 [formerly e71dad9c80] [formerly 980e21ca5a [formerly eb3cf0ade9203766a437512b85e55f32108db1e3]]]
Former-commit-id: 980e21ca5a
Former-commit-id: 3966bc355c [formerly 98daa663b4]
Former-commit-id: 7e45b908af
 2014-03-05 08:37:13 -06:00
Brian.Dyke
ea56516bf5 OB_14.1.1-21 baseline 
Former-commit-id: 271ec85c0c [formerly 1d92e5bab6] [formerly 271ec85c0c [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]
Former-commit-id: 29681c7ca4
Former-commit-id: c68649b4f9 [formerly 7cad374af5]
Former-commit-id: 079cc93f89
 2014-03-04 11:47:42 -05:00
Lee Venable
7299c53ba5 Issue #2795 - removed test code. 
Former-commit-id: e34e636dc7 [formerly 28fe1e99e2] [formerly e34e636dc7 [formerly 28fe1e99e2] [formerly f94bcc4d3f [formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]]]
Former-commit-id: f94bcc4d3f
Former-commit-id: 267fa56e32 [formerly 708de93fc4]
Former-commit-id: d026da3632
 2014-02-27 15:46:30 -06:00
Richard Peter
68eade49a2 Issue #2509: Fix Merge of 13.5.2-4 ncep resources 
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: c267c5a08f [formerly 86d42ed603] [formerly c267c5a08f [formerly 86d42ed603] [formerly 862069dfd3 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 237ada7b8b [formerly c0d495d9c3]
Former-commit-id: 9489565efb
 2014-02-27 13:46:47 -06:00
Richard Peter
8d35f1ce5f Issue #2509: Fix merge of SS #124 
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: a23c8f2c27 [formerly 729d608a15] [formerly a23c8f2c27 [formerly 729d608a15] [formerly d54fee5dae [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]
Former-commit-id: d54fee5dae
Former-commit-id: 67093287a0 [formerly 229437773b]
Former-commit-id: 9ca22fce7f
 2014-02-27 13:20:49 -06:00
Juliya Dynina
8a468b1bb2 Merge "ASM #236" into asm_14.2.2 
Former-commit-id: a0af710ac3 [formerly 7d2a404f66] [formerly a0af710ac3 [formerly 7d2a404f66] [formerly 09708ce0ba [formerly 8ddc79c66a4131f9671b605057abf916200a276a]]]
Former-commit-id: 09708ce0ba
Former-commit-id: 33bfcfd251 [formerly c8ab0aa33a]
Former-commit-id: 804ed170c7
 2014-02-27 09:48:01 -05:00
Brian.Dyke
f9587d39d1 OB_14.1.1-20 baseline 
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: c873f20d04 [formerly 16117255f3]
Former-commit-id: 5feadbe4d9
 2014-02-26 17:39:15 -05:00
Lee Venable
54fa6c12b3 Issue #2795 - added code to check for null images. 
Former-commit-id: 5546b537cf [formerly 0c7395d423] [formerly 5546b537cf [formerly 0c7395d423] [formerly 49530206f4 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 35f6f35186 [formerly facc67e6b5]
Former-commit-id: 3932c3f02f
 2014-02-26 15:50:46 -06:00
Lee Venable
8d49130542 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked. 
Former-commit-id: bb4b034375 [formerly 94cede8153] [formerly bb4b034375 [formerly 94cede8153] [formerly e0ee93bab3 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 91d419662c [formerly e0fbc02307]
Former-commit-id: 316ba53e74
 2014-02-26 13:21:58 -06:00
steve.naples
2e088612ec ASM #236 
Change-Id: I849aa9c15622973e49f385ada9df84ba3b1417dd

Former-commit-id: 06f619b3ff [formerly 6be82c41fc] [formerly 06f619b3ff [formerly 6be82c41fc] [formerly cc9e62c806 [formerly 8d0e82a46186f3457c5d4e3001548d067ebbaae2]]]
Former-commit-id: cc9e62c806
Former-commit-id: 1c6f6be15e [formerly 9b850d81df]
Former-commit-id: 73e5bc8949
 2014-02-26 18:54:36 +00:00
Daniel.Huffman
67087f1207 ASM #76 
Added lpi resources.  File latLonOcean.xml is an example.

Change-Id: I533aa7616d837a70d2b14a4bbe00397ef2a7ddff

Former-commit-id: f675fab121 [formerly 9c29bddee0] [formerly f675fab121 [formerly 9c29bddee0] [formerly a34124c355 [formerly 733a80d0019ccf7f5529abbd6054cb485412e962]]]
Former-commit-id: a34124c355
Former-commit-id: cd2ecab86d [formerly 68eab08f8e]
Former-commit-id: 45b78af3dd
 2014-02-24 22:59:41 +00:00
Nate Jensen
caaffabda3 Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1 
Former-commit-id: 8ef957d2f0 [formerly 279f05a1d5] [formerly 8ef957d2f0 [formerly 279f05a1d5] [formerly 060eafc272 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 2f58408036 [formerly a5477ea272]
Former-commit-id: d9411eb382
 2014-02-24 16:17:20 -06:00
Nate Jensen
78c8f1a62c Issue #2830 sort TAF dataTimes so latest are retrieved 
Former-commit-id: 230b8bf117 [formerly 8a00a419a1] [formerly 230b8bf117 [formerly 8a00a419a1] [formerly f353c44cc0 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: a97f5b5ff7 [formerly 74329bcb89]
Former-commit-id: 02d2f0c713
 2014-02-24 15:35:13 -06:00
Brian.Dyke
0bcf7c89b8 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7 
Former-commit-id: 363403fb34 [formerly 2faab606e5] [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 73a1c238f4 [formerly 227131e5f1]
Former-commit-id: 38829b9014
 2014-02-24 14:51:00 -05:00
Ron Anderson
3c673caec2 Merge branch 'master_14.2.1' into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 45ccac0859 [formerly 4364e7497c] [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8 [formerly 3b2ea2d6ac]
Former-commit-id: f2b0cc20e8
 2014-02-24 13:46:48 -06:00
Brian.Dyke
f86f9f8918 OB_14.1.1-19 baseline 
Former-commit-id: 779553142c [formerly cfa4997978] [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: c41dd22ff2 [formerly 64044e7ce5]
Former-commit-id: 1b359c2564
 2014-02-21 06:50:59 -05:00
Nate Jensen
3955f66213 Issue #2704 fix startup issues where settings are valid but dialog 
doens't realize it


Former-commit-id: 6ef26a636c [formerly 32bd9fd635] [formerly 6ef26a636c [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: 6e2150ccd7 [formerly 9f33e97c1b]
Former-commit-id: 1f5f895dcf
 2014-02-20 10:53:21 -06:00
Brad Gonzales
b0421675ff Issue #2771 For Data Delivery CAVE now request current id from 
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 379c0fb46c [formerly 19460ed0d7] [formerly 379c0fb46c [formerly 19460ed0d7] [formerly ba4e308328 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: 1b76488111 [formerly 3be3380944]
Former-commit-id: 9aa1cb299e
 2014-02-18 11:10:44 -06:00