Commit graph

2656 commits

Author SHA1 Message Date
Steve Harris
d3023f15ac 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]
Former-commit-id: aed7a644df
2012-08-15 13:59:00 -05:00
Steve Harris
25585ca8d7 Merge branch 'development' into Enhanced_points
Former-commit-id: 9a5ad2fdae [formerly e372481f81] [formerly 346d775f57] [formerly f7f97d9f54 [formerly 346d775f57 [formerly 25026a4d9955b76039bf25861380cadebff19665]]]
Former-commit-id: f7f97d9f54
Former-commit-id: f736245d042a572679a95e4b5cdd7ce4dcb5ef0f [formerly 031b655ab5]
Former-commit-id: 73e357c39d
2012-08-15 13:35:47 -05:00
Ron Anderson
daab9b6cfc Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 9b35518fe5 [formerly bac68cc1de] [formerly 17f636c2a2] [formerly 81abb2c60b [formerly 17f636c2a2 [formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]]
Former-commit-id: 81abb2c60b
Former-commit-id: f95802be5b445fb5325a67b2aad6ff7c3512608e [formerly 7cde30681b]
Former-commit-id: c8b0719d48
2012-08-14 16:27:11 -05:00
Ben Steffensmeier
3d83dd0e1f Issue #947 revert changes to dataTime format
Former-commit-id: 4c45df4e3f [formerly 54b538bb07] [formerly 50cb7383a6] [formerly 70ba8d82db [formerly 50cb7383a6 [formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]]
Former-commit-id: 70ba8d82db
Former-commit-id: dcd339cd56dee05048a4cc65e0aad47a394b2aa1 [formerly 77b7c4c517]
Former-commit-id: 36455cfbed
2012-08-14 16:20:36 -05:00
Ron Anderson
77bfb8a2dd Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2

Former-commit-id: 0328f2f50a [formerly 5c80f582b3] [formerly 71d74b1dcf] [formerly 985167892d [formerly 71d74b1dcf [formerly 564b72997c59a665398c8687d6bafdb54c469881]]]
Former-commit-id: 985167892d
Former-commit-id: 4241981581eb1d69e70fae848a376e84169e96cf [formerly 9bf0166f13]
Former-commit-id: c90619a3bc
2012-08-14 16:20:23 -05:00
Ben Steffensmeier
037ecbd293 Issue #947 revert changes to dataTime format
Former-commit-id: 85bba2f435 [formerly fd2bf26119] [formerly ce689ad5fa] [formerly 434193b34b [formerly ce689ad5fa [formerly 5c560da8d485f2ca2b6ca24925480aa61fb994de]]]
Former-commit-id: 434193b34b
Former-commit-id: 804eb32ad6a8cd0f132940c420498966a58cd373 [formerly 15977fdba2]
Former-commit-id: c14674c64f
2012-08-14 16:12:02 -05:00
Ben Steffensmeier
400324692e Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 4ac95d6f30 [formerly 573cc270e8] [formerly c6a121962f] [formerly 1e527f83f0 [formerly c6a121962f [formerly 06c2c85159598ca803c663de97caed4b6841c135]]]
Former-commit-id: 1e527f83f0
Former-commit-id: d4bea7465963586a2e6cb6e3b67004eb860aeafa [formerly c9ff69014b]
Former-commit-id: 0af9fd4fe2
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
cf4e07b55c Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: 702f11b85d [formerly 8d118c392a] [formerly 525c0b21a9] [formerly b53fe917bc [formerly 525c0b21a9 [formerly 045952304218c867d8fe89df9828f70632df2d00]]]
Former-commit-id: b53fe917bc
Former-commit-id: 8ba260212ec345bbb5385de011be3084fda82b42 [formerly 4ed3d04e64]
Former-commit-id: 54b3078ad1
2012-08-09 17:50:23 -05:00
Nate Jensen
47e3a26d29 Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds
Former-commit-id: 80b312f764 [formerly 32cc46ec4e] [formerly eeaa2c798f] [formerly 4211a8deac [formerly eeaa2c798f [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]]
Former-commit-id: 4211a8deac
Former-commit-id: c6c095ba54831e57f26b23a2fa36bd907bb06747 [formerly 2cc3c63ba7]
Former-commit-id: c0fa1e8cf2
2012-08-09 17:18:38 -05:00
Ben Steffensmeier
66f4ccc09b Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
Former-commit-id: 16187575d7 [formerly 64caa963b1] [formerly cb095d2154178fc8f2e94be7903a6ed873d67119 [formerly 066a5af2a6]] [formerly ad1415948f [formerly 066a5af2a6 [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]]
Former-commit-id: ad1415948f
Former-commit-id: b76d791052722d8c2dddfa92d72e7c08b447c653 [formerly 65c33256d9]
Former-commit-id: e03eb5f5c9
2012-08-09 17:16:38 -05:00
Nate Jensen
4235ad69c1 Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds
Former-commit-id: 3aeaced4dc [formerly 8cd83e1571] [formerly a88d7bcedc] [formerly fbbf74eb50 [formerly a88d7bcedc [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]]
Former-commit-id: fbbf74eb50
Former-commit-id: c2a90fec0f6904b81f0f00d073e9861b9dc1c1ef [formerly 1214c05b72]
Former-commit-id: e2462c0cc3
2012-08-08 16:10:13 -05:00
Ben Steffensmeier
a35bdcb526 Issue #947 fix parsing of DataTime.
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: ee8a4896bd [formerly cac790ac5a] [formerly 97ba96759c] [formerly 5da238c8b9 [formerly 97ba96759c [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]]
Former-commit-id: 5da238c8b9
Former-commit-id: 664f9aa2a161dd26a76c59a3bc493a05cfa127d3 [formerly b6cc71bf75]
Former-commit-id: 8cdf1f8d1c
2012-08-08 14:41:33 -05:00
Steve Harris
6a3c6e8bb0 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: 655b5932d9 [formerly fc39ef78e4] [formerly bbf4b18204] [formerly d538fd8913 [formerly bbf4b18204 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]]
Former-commit-id: d538fd8913
Former-commit-id: 022edb28baadf65af52f9e87c035ad735e9f6cfd [formerly 0ef9f1c86e]
Former-commit-id: 352f391700
2012-08-08 13:57:46 -05:00
Roger Ferrel
f8e0bfb797 Issue #875 Markers and group added to Cave.
Amend: Removed python file

Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.

Amend: deleted unwanted .project file

Amend: Removed comment out code and fix class descriptions

Amend: Changes based on reviewer comments.

Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8

Former-commit-id: f8d0512703 [formerly b3c357c964] [formerly 2e3fc4b400] [formerly f4ae8eb150 [formerly 2e3fc4b400 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]
Former-commit-id: f4ae8eb150
Former-commit-id: f9ea3b03486c9aff9f813d9e892a99cac8ea4ff8 [formerly ae41499ba2]
Former-commit-id: 69f22fe6bb
2012-08-08 13:35:47 -05:00
Steve Harris
9688e06a3a Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: c72218985b [formerly e2267aa186] [formerly ec49de07f355cd62fd2ab0d6f8058daf153fbd01 [formerly 926ff5dc5a]] [formerly 9e2e0fa166 [formerly 926ff5dc5a [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]]
Former-commit-id: 9e2e0fa166
Former-commit-id: 447b1173369877f42f724fff7bac204016c3883e [formerly 15753699bd]
Former-commit-id: d42beafc73
2012-08-07 15:29:25 -05:00
Steve Harris
bbed4fde42 Fixed merge of development / 12.8.1-5 versions of HttpClient.java
Former-commit-id: f19c9fa55d [formerly 6615c96f33] [formerly 6dae0398d3] [formerly 3f88fa9078 [formerly 6dae0398d3 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]]
Former-commit-id: 3f88fa9078
Former-commit-id: bc692ca83d4420ec117ce5220cfdb080125d6865 [formerly 9387e8b2d0]
Former-commit-id: a810a273a2
2012-08-07 10:04:39 -05:00
Steve Harris
eb49637382 Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 9bec162043 [formerly 60c0cfc3b3] [formerly d90c5f989d] [formerly f3babcf1a1 [formerly d90c5f989d [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]]
Former-commit-id: f3babcf1a1
Former-commit-id: e438829b2a367a69a3e71e2949d85e4fe52cf613 [formerly 62e9207ba7]
Former-commit-id: 2f3ef9f4da
2012-08-06 11:13:47 -05:00
Max Schenkelberg
5a6d71bfad Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b

Former-commit-id: 2e7d66b85a [formerly ae3b62ca12] [formerly 36bf80d13e] [formerly 0031d21292 [formerly 36bf80d13e [formerly b0466e68bea4102f397db214bb58b66c10a338ed]]]
Former-commit-id: 0031d21292
Former-commit-id: 63c52f1712b393caff67e56a42c1fd6c48359b1b [formerly 482dfb4711]
Former-commit-id: 1aa6d193b4
2012-08-06 09:44:44 -05:00
Steve Harris
4f1a7eb689 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 7b6c223552 [formerly 9e2d161f8d] [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f0b7d5e4c5 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]]
Former-commit-id: 85f82b18b3
Former-commit-id: ee22b108589d0c82dcd1216d6f772ca807503da2 [formerly b2432e096f]
Former-commit-id: 52e0da2293
2012-08-06 09:38:26 -05:00
Steve Harris
330df3323f 12.8.1-10 baseline
Former-commit-id: 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340]
Former-commit-id: 78d34d65d2
2012-08-06 09:34:26 -05:00
Jonathan Sanchez
eaf9b20392 Issue #1006 Implemented urban areas.
Former-commit-id: 62106ee967 [formerly 06ce1c6dd5] [formerly dbd30e3b67] [formerly 62db15b6f4 [formerly dbd30e3b67 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]]
Former-commit-id: 62db15b6f4
Former-commit-id: 5f6b0bcbbe4c81300aa41b9e4ca28ecfb7b04c3d [formerly f26cce33a9]
Former-commit-id: 1af2520b91
2012-08-06 08:41:52 -05:00
Steve Harris
9cce94e63a Merge branch 'development' into development_on_ss_builds
Former-commit-id: 7e89b04a10 [formerly 54c505dd8e] [formerly 24799cd93d] [formerly a1071e3204 [formerly 24799cd93d [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]]
Former-commit-id: a1071e3204
Former-commit-id: c8ede12f88d71b1fa54dc220cc2b1866cb44d9e8 [formerly 8f4ddad22c]
Former-commit-id: dbe07ca70c
2012-08-06 08:23:04 -05:00
Bryan Kowal
8359361a2f Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36

Former-commit-id: 642d57b71d [formerly dd1acbe70a] [formerly c6b2d65308] [formerly 5ca4a66fdc [formerly c6b2d65308 [formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]]
Former-commit-id: 5ca4a66fdc
Former-commit-id: f0e488e17505a4686cc6a6a7196566ed2a0f1fee [formerly f295ee11ea]
Former-commit-id: 14c20083b0
2012-08-02 10:33:55 -05:00
James Korman
4f225f7cd5 Issue #798 - Updates to satellite
Former-commit-id: 6f631b4aca [formerly fd1156d67d] [formerly 7928d912e1] [formerly 2ddb2f6df0 [formerly 7928d912e1 [formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]]]
Former-commit-id: 2ddb2f6df0
Former-commit-id: f845b9502eac9ffac52fe2265fd485df150217aa [formerly 241303f9a0]
Former-commit-id: 4226007a10
2012-08-01 16:31:59 -05:00
Steve Harris
330c7a877c Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 0557c9a0c6 [formerly fb47934159] [formerly 6d77b94217] [formerly 51e38ca887 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: 01cf1f328ecb5a3b2a058b016779fc32e6f68081 [formerly 3476fe755b]
Former-commit-id: d2291ba23f
2012-08-01 12:43:12 -05:00
Max Schenkelberg
7b302e984f Issue #626 Fixed changes to GridDownscaler in SatelliteDao
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90

Former-commit-id: 2761a47a37 [formerly c3daf20fdf] [formerly 2d36eb040d] [formerly d89b58f7fd [formerly 2d36eb040d [formerly 1370a27f85173509b66a7ea861ed0b04225709e0]]]
Former-commit-id: d89b58f7fd
Former-commit-id: f4bbe941ab0e47fcdf44d82e219aea600c351ffa [formerly 9f34d7a5f3]
Former-commit-id: 81ce682e0b
2012-08-01 11:36:44 -05:00
Max Schenkelberg
d198245bb1 Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac

Former-commit-id: 01b0313c03 [formerly 079a11565a] [formerly f635e9c332] [formerly cc0a1fbca3 [formerly f635e9c332 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]]
Former-commit-id: cc0a1fbca3
Former-commit-id: 703689be64513c64e5c5c59d86ee46848a3c571b [formerly 74f0179b92]
Former-commit-id: 7ee188d90a
2012-08-01 10:51:32 -05:00
Steve Harris
4f47148ced 12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]
Former-commit-id: dab00b12e6
2012-08-01 10:45:37 -05:00
James Korman
c0b7f2b931 Issue #798 - Code review changes
Former-commit-id: e24766ac3d [formerly f7a864a2c0] [formerly 14e68406b4] [formerly 39a32d7c91 [formerly 14e68406b4 [formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]]]
Former-commit-id: 39a32d7c91
Former-commit-id: ac8372d09275ed82e7ef9eeb772835cdfe0834e7 [formerly 15af4ada93]
Former-commit-id: 540435baa6
2012-07-31 14:34:27 -05:00
James Korman
9d1df24a3d Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 226ff6ea65 [formerly 1166a7cbb1] [formerly 38a2e426d9] [formerly 4cbbc59278 [formerly 38a2e426d9 [formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 6dc3f6ecbe7383c692d6eefe822b05fbf5ec6557 [formerly 5df52e38f9]
Former-commit-id: 16643cb1bc
2012-07-31 13:38:23 -05:00
Richard Peter
e76f7f576a Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
Former-commit-id: 0ee07efae3 [formerly 4f64038c78] [formerly 97a1d083cd] [formerly 8631b64e75 [formerly 97a1d083cd [formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]]
Former-commit-id: 8631b64e75
Former-commit-id: 503c7d83973ae804ded15031b58be41631d56fed [formerly c379c2f884]
Former-commit-id: 96e3782774
2012-07-31 09:16:23 -05:00
Nate Jensen
6d8ac0455e Issue #882 improved use of SimulatedTime
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: baff86f951 [formerly 6f90bfa61c] [formerly a65e9608fd] [formerly 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]
Former-commit-id: 4a2841b287
Former-commit-id: 3ab4b622030a864dcf04c61605009347c3550e9a [formerly 8fa0eb70db]
Former-commit-id: 7d478ac74c
2012-07-31 08:57:54 -05:00
Ron Anderson
701d77f90a Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62

Former-commit-id: c2937d7303 [formerly e9f24e8660] [formerly 7c6686f2f4] [formerly b1650b6143 [formerly 7c6686f2f4 [formerly 181fba1a75357aa39a54267c6df907075f4601dc]]]
Former-commit-id: b1650b6143
Former-commit-id: 7e61eb27b9b666aa966565378d537d64b5825d69 [formerly 6a3e6f599f]
Former-commit-id: 4efd9149f7
2012-07-31 08:36:27 -05:00
Bryan Kowal
eafdfd70e7 Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6

Former-commit-id: 1208c5cd40 [formerly 67035fa0b8] [formerly 327ffa9439] [formerly cd40d9accf [formerly 327ffa9439 [formerly dca54e56436ace397c6163b03ac4edb480336404]]]
Former-commit-id: cd40d9accf
Former-commit-id: d17306f65f051e6041f44ee338f920b2f02bce6e [formerly 107831f23d]
Former-commit-id: 6ac43a3c0c
2012-07-28 08:52:36 -05:00
Richard Peter
bd7c9ee30b Merge "Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R" into development
Former-commit-id: 2fd4762fea [formerly 1de59b48cf] [formerly 9e3cd2546a] [formerly 77c2ab2c05 [formerly 9e3cd2546a [formerly 39e74c7e2aa9f78938c85d0433decb89f4ef1325]]]
Former-commit-id: 77c2ab2c05
Former-commit-id: 6f83bcad8d41f452f50d78f2b489e47dc975b25d [formerly d131cd42cf]
Former-commit-id: b6a1b5011f
2012-07-27 14:50:00 -05:00
Steve Harris
e9f4d5b474 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: e6f4b3f257 [formerly 302aa05586] [formerly de9034c96c] [formerly 4688ac304f [formerly de9034c96c [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]]
Former-commit-id: 4688ac304f
Former-commit-id: 1e9f1a509a3a3df6aa114b32afd9c50a0af22853 [formerly b82d6772c3]
Former-commit-id: f2ab9cfe1a
2012-07-27 14:50:45 -05:00
Steve Harris
c18e221e26 Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 7efcfa7d8d [formerly 07c40a9c0c] [formerly 56249c2611] [formerly 587bb6a274 [formerly 56249c2611 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: a41bc7cf63c74a535c86b4b885ed28af3223407b [formerly 2aa4114e4d]
Former-commit-id: 9e4df42326
2012-07-27 14:44:44 -05:00
Max Schenkelberg
acfd34f2e5 Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R
Amend: Added WMO header finder since the header property will have additional information in it when file comes from LDM.  Also changed MessageGenerator to use new class for finding the wmo header

Amend: Added try-finally for input stream in DataUnzipper

Change-Id: I4ece2f5f24a429aa41969f51040a58e67e79e1c1

Former-commit-id: e5543b33b9 [formerly 7ace2035c5] [formerly 756988cb8b] [formerly b669f57ee4 [formerly 756988cb8b [formerly 2f17b2f49f65da4b7b7fd531377873cb9eb941dd]]]
Former-commit-id: b669f57ee4
Former-commit-id: 3a13c948f4746162ac644546a3239f5f29f3e9c0 [formerly 51f9666fcb]
Former-commit-id: 864d6335a6
2012-07-27 14:42:36 -05:00
Nate Jensen
f66f383270 Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: 903803754a [formerly ac8d12ce13] [formerly 3d07fc8ebf] [formerly dbe185f3a0 [formerly 3d07fc8ebf [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]]
Former-commit-id: dbe185f3a0
Former-commit-id: ab836393cd25791396a8a3346ebf7c847d8cf286 [formerly 67edb6917d]
Former-commit-id: 4e0a0f10dc
2012-07-26 17:43:29 -05:00
Ron Anderson
2c8ea61c9e Issue #851 Fixed issues with DatabaseID.dateFormat
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: 8b897c2bb0 [formerly 21431b2693] [formerly 1f2e581534] [formerly b52f1400ef [formerly 1f2e581534 [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]]]
Former-commit-id: b52f1400ef
Former-commit-id: 5d6702b36fde41c8818de2db46efd10773b829e1 [formerly bc034e1863]
Former-commit-id: e184dceb91
2012-07-23 16:49:21 -05:00
Steve Harris
e1eb7f5972 12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]
Former-commit-id: f2102bfb24
2012-07-19 16:20:40 -05:00
Max Schenkelberg
0377be83d9 Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: 9ac745e1f4 [formerly 0cfd8834c2] [formerly c8909c0fbc] [formerly d8971a72fd [formerly c8909c0fbc [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]]]
Former-commit-id: d8971a72fd
Former-commit-id: 461ad2e9ad311ab17437a1a0d2f7cb3a066dc5ba [formerly bc0ec0455d]
Former-commit-id: 5d8515fb58
2012-07-19 11:45:01 -05:00
Max Schenkelberg
095d1a14de Issue #626 Changed GridDownscaler to include full resolution grid in levels so level 0 is full grid to make more standard with how downscaling is done now
Change-Id: I8f87118b3e283acc5c19dc97497730b9cabec0f1

Former-commit-id: 7b5c3c72a7 [formerly 39e199147e] [formerly a9360b7078] [formerly dcdffe345d [formerly a9360b7078 [formerly 91148d4bfe159c346baaf33a4fb5bac0c174bd37]]]
Former-commit-id: dcdffe345d
Former-commit-id: 8495f2c89b95bb788e3a573337b29053fd8b16f1 [formerly cd9e7563de]
Former-commit-id: 04e75db5af
2012-07-16 10:00:28 -05:00
Richard Peter
cfd6a02da0 Merge "Issue #798 - Modified Satellite component to persist GOESR data" into development
Former-commit-id: 452df5af56 [formerly a06dde8a30] [formerly 19203d87f3] [formerly ee6738152d [formerly 19203d87f3 [formerly d3144d913bda351fba681b6fe5e4dd5148cfc49c]]]
Former-commit-id: ee6738152d
Former-commit-id: 4ce4ff84ef96c8d6251421e417b7e5991d3fce7c [formerly 3c1f3d3d0a]
Former-commit-id: 5a038a3d6d
2012-07-13 09:18:46 -05:00
Bryan Kowal
302e87f975 Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: 81dd57d347 [formerly b446253674] [formerly db6b535eb6] [formerly 1e5b71ee7b [formerly db6b535eb6 [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]]]
Former-commit-id: 1e5b71ee7b
Former-commit-id: b71427b1b065dcf68000893375f8b019e4a32137 [formerly 46198b0c92]
Former-commit-id: 34a4f58074
2012-07-12 12:58:40 -05:00
Bryan Kowal
c3e4e47c08 Issue #880 - no longer remove the gfesuite files before deployment; just override any existing files.
Former-commit-id: 85bcee527d [formerly 7f6015eba5] [formerly e00da679e583e063dc81e0603ad2d318d8b5b9f3 [formerly 0f31fadffa]] [formerly bde6be6e2b [formerly 0f31fadffa [formerly ea1b0920d908481e28477329497204dda324bd3e]]]
Former-commit-id: bde6be6e2b
Former-commit-id: bc57b24caca1c0e9ce531e9ab741fafb2aa3ba46 [formerly 00c9a0f708]
Former-commit-id: 6d961d22fb
2012-07-11 17:31:55 -05:00
Bryan Kowal
bce385a4cb Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
Former-commit-id: 81dcc5dcc7 [formerly 6fe6e64f38] [formerly 5058c32c34] [formerly 31f2db8719 [formerly 5058c32c34 [formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]]]
Former-commit-id: 31f2db8719
Former-commit-id: 236fceea7dfc2f90dc34eb5ec0b4ebb1cb7fd6d1 [formerly 5619099acd]
Former-commit-id: 43f3d40a8e
2012-07-11 16:28:28 -05:00
Bryan Kowal
e07c3c20b5 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: ec9551d614 [formerly 8fef600e84] [formerly ab2c53ae0a] [formerly 3b7c761f99 [formerly ab2c53ae0a [formerly cd948be11933b849836e3c774e668fa3bf6943ad]]]
Former-commit-id: 3b7c761f99
Former-commit-id: 8b3050dc6fe2578f4967cf9e34c2930cb40f50bc [formerly 424bbaf0f7]
Former-commit-id: 470511d9a3
2012-07-11 12:44:32 -05:00
Bryan Kowal
c8dd1f50e9 Merge branch 'merge_development' into development
Former-commit-id: 291a674e41 [formerly 226818bda5] [formerly 051a51b79c] [formerly b27994c9b1 [formerly 051a51b79c [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]]]
Former-commit-id: b27994c9b1
Former-commit-id: c0a190ac0c964f309e33d6b6b28bdaa7c7fa56be [formerly fa5eb7a16a]
Former-commit-id: 541b59d060
2012-07-10 17:03:21 -05:00
Bryan Kowal
76ee9afb3f Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]
Former-commit-id: f92eb59a73
Former-commit-id: 52cad006ad06844a2b34006f7defa2ec2dc2d67f [formerly 580172b47c]
Former-commit-id: 8d64fdba2c
2012-07-10 16:57:16 -05:00