Commit graph

719 commits

Author SHA1 Message Date
Jonathan Sanchez
46b7a35134 Issue #883 Sorted warning records and prevented altered entries to be in
the same frame as new entries.


Former-commit-id: 457cbcdf95 [formerly 4f2d6630c1] [formerly 6507a97665] [formerly fa7795d17f [formerly 6507a97665 [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]]
Former-commit-id: fa7795d17f
Former-commit-id: faff7eb8279d6805bdc05f6ec705924a3bd4c05e [formerly 7ad6329fe0]
Former-commit-id: 3952dfc7ac
2012-08-09 08:26:21 -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
c66c9d6930 Merge branch 'development_on_ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development_on_ss_builds
Former-commit-id: 0cf8ae644e [formerly 24515a43b6] [formerly 1feb52683a] [formerly a9b587019a [formerly 1feb52683a [formerly e49333c9cddc47d2b8f3f835e19657043d51a7af]]]
Former-commit-id: a9b587019a
Former-commit-id: 9429fd93f90ed639adc4a84b646db125f946be24 [formerly 805972e2fd]
Former-commit-id: 2b43860c67
2012-08-08 13:59:52 -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
Nate Jensen
15618c6a64 Merge "Issue #1004 make dispose/shutdown of plot jobs more permenant by joining." into development_on_ss_builds
Former-commit-id: 2c3d03a4e5 [formerly a241db9e69] [formerly b704e8d3f4] [formerly 6c758b7c84 [formerly b704e8d3f4 [formerly 65ea6e46e059a058d5a46b0cf28f1b50c3057744]]]
Former-commit-id: 6c758b7c84
Former-commit-id: 3f4279a4583cd4336a4762bdbb700a49c0a5d892 [formerly 81bba55a1e]
Former-commit-id: 197fbde870
2012-08-08 09:43:40 -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
Ben Steffensmeier
b7d35b54b4 Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
Former-commit-id: d84fd21e2a [formerly 0a974b26c2] [formerly c9774a4f03] [formerly 83d6cde368 [formerly c9774a4f03 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]]
Former-commit-id: 83d6cde368
Former-commit-id: 810e689fbbbecab708e7169a87c326f4c9cccecf [formerly ea70488664]
Former-commit-id: f47d533ac3
2012-08-07 12:03:13 -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
9d2e3f8206 Merge branch 'development' into development_on_ss_builds
Former-commit-id: 1cd1cb250f [formerly f540dbfb87] [formerly 32ee17d124] [formerly 515c8ec596 [formerly 32ee17d124 [formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]]]
Former-commit-id: 515c8ec596
Former-commit-id: 7b3e219c5ce6a9f1027f1d5b1db732473c6535de [formerly 533d58b312]
Former-commit-id: 5e30a4282c
2012-08-06 12:57:56 -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
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
Ben Steffensmeier
3e8465c717 Issue #988 set statem bits on underlieing image for GLDelegate Image
Former-commit-id: e242274f06 [formerly 6e3cd8976b] [formerly 0f7dd0f4cd] [formerly 5fe65c6538 [formerly 0f7dd0f4cd [formerly 39444045f7cc4f4e4fac86b15ca7b98cf2cb9ded]]]
Former-commit-id: 5fe65c6538
Former-commit-id: 2373780f335104e728351ffbb13d250cc6c48845 [formerly 6ccc09e0b4]
Former-commit-id: 83effa4f85
2012-08-03 16:39:33 -05:00
Ben Steffensmeier
eef338e55c Issue #978 GChange GridResource to use its own times rather than descriptor times.
Former-commit-id: d841924588 [formerly c5c9e8b05c] [formerly 8346805ed2] [formerly 090b9f5ccb [formerly 8346805ed2 [formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]]
Former-commit-id: 090b9f5ccb
Former-commit-id: 48422de135df5bd5bb5a29c2544903c467f744af [formerly 942b0e5315]
Former-commit-id: 5954717c26
2012-08-03 15:52:47 -05:00
Richard Peter
2bdb58cd5d Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
Former-commit-id: 1d953096d4 [formerly 2154c4e286] [formerly fd051c19d4] [formerly 131ba842e9 [formerly fd051c19d4 [formerly 622e8119ab53ed34e5249c67186343203a56b821]]]
Former-commit-id: 131ba842e9
Former-commit-id: d65748890b1ca30b09edcf12695bce09fb06a43f [formerly c61f4f8245]
Former-commit-id: 3984511a6e
2012-08-03 14:32:35 -05:00
James Korman
eaae0fb042 Issue #798 - Force interpolationLevels in derived satellite
Former-commit-id: 2ebcf052dc [formerly dfd18c7a85] [formerly 1bc1784478] [formerly 317acc38fe [formerly 1bc1784478 [formerly ffcc7cfa6e7c2ce0f406becff390781ceee7faa3]]]
Former-commit-id: 317acc38fe
Former-commit-id: aac25737a50f3eb1e8e9d907d3cd6302b91ceefc [formerly b27f4fb5e5]
Former-commit-id: 93a1311cf9
2012-08-03 14:14:53 -05:00
Ben Steffensmeier
459a0ace5a Issue #1001 synchronize paint with add.
Former-commit-id: c57d546746 [formerly 3e601b2baf] [formerly 2c9737ca5c] [formerly 798d26e954 [formerly 2c9737ca5c [formerly 825c08e6ce89b0c4b042c9e85f7abbc7b9a675ef]]]
Former-commit-id: 798d26e954
Former-commit-id: b3c3aaee59020f6f8374104ecaafafa0ca424d80 [formerly e9cde98072]
Former-commit-id: ceaf86128c
2012-08-03 14:10:04 -05:00
Nate Jensen
2c8f6d8003 Merge "Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu" into development
Former-commit-id: ce6c112f84 [formerly 689dcd5d4d] [formerly c74a54b9ed] [formerly 47920c3168 [formerly c74a54b9ed [formerly 9207aa6af20bd76369a5952bd836526ce6d7197f]]]
Former-commit-id: 47920c3168
Former-commit-id: a8c6bce5aee38ac8dac9b05e15b94c8629861511 [formerly 528f6045e9]
Former-commit-id: ca6dbc6be6
2012-08-03 10:43:39 -05:00
Bryan Kowal
d887a8b33f Issue #997 - the scripted CAVE pde build will now only default to /opt/uframe-eclipse if the user has not specified an alternate eclipse location.
Change-Id: Ib9b5bbd3f89b0a241c7eb1865895e232ac8d85f7

Former-commit-id: 4b329f54fe [formerly 40e69fad53] [formerly e371bd14dd] [formerly 08651d2c21 [formerly e371bd14dd [formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]]]
Former-commit-id: 08651d2c21
Former-commit-id: 23db5d4b07ffb7bf2bf1a3fb565f40d500f73de9 [formerly a70bbf3e4d]
Former-commit-id: 185daa58d9
2012-08-02 16:13:58 -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
Bryan Kowal
17a9da0402 Issue #970 - ensure that g2int has the same definition throughout grib2 and all dependencies; updated variable types based on function signatures.
Change-Id: If25d724c18ff5a9d09f94d77304ec729866158e6

Former-commit-id: dd451f392f [formerly 6126e4316a] [formerly 485334331a] [formerly d07281ac51 [formerly 485334331a [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]]
Former-commit-id: d07281ac51
Former-commit-id: f8fef4627ebba88a297740ab1ae189fd855e752d [formerly 024a23e7a3]
Former-commit-id: 5b7330ca01
2012-08-01 11:50:24 -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
Nate Jensen
ed7692a863 Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu
Change-Id: I103017fef97b6f7992f753eb17737201bf0a4f64

Former-commit-id: 3db2a3fe6a [formerly 8539a075bb] [formerly 43e5a5d331fafc88613302773d9633128974a5cb [formerly ae7c427b4b]] [formerly 69f51e6e87 [formerly ae7c427b4b [formerly e3b8f1e0c5d1e5d9fa7446124bc7c3c0b98a967c]]]
Former-commit-id: 69f51e6e87
Former-commit-id: 76be324e1c5161d8977d3d5548eb7c51a3c3a8af [formerly 00bbb6c8a3]
Former-commit-id: 9ca861b827
2012-07-31 10:02:39 -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
Ron Anderson
5a58fc89bf Issue #851 removed obsolete GFE code.
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02

Former-commit-id: b1a633e121 [formerly 74478728de] [formerly 35d140f0fb] [formerly d87c0b6c4b [formerly 35d140f0fb [formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]]]
Former-commit-id: d87c0b6c4b
Former-commit-id: 6f790834b05690824c16344926fd96fe4133d97f [formerly 6b7f1b3611]
Former-commit-id: 4459afa40c
2012-07-30 15:34:16 -05:00
Bryan Kowal
c78d1ed289 Issue #969 - the top-level directory structure of i386-pc-linux-gnu.tar has slightly changed?
Change-Id: I29cae68e2d87ea8ff078d6ac56211da548e7074f

Former-commit-id: 1110193ec1 [formerly 69bea08034] [formerly c74e48e4a4] [formerly aa5b16537f [formerly c74e48e4a4 [formerly 1b7f01a2e8afdf900dae4b124c7b17b91ac68f3d]]]
Former-commit-id: aa5b16537f
Former-commit-id: c7e6de11e0697cf7922d60a37d913b5b11aa14c2 [formerly 9fe0b6a424]
Former-commit-id: d27bdae074
2012-07-29 09:40:01 -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
Bryan Kowal
65b390e1f1 Issue #964 - the awips2-edex-shapfiles rpm version can now be set dynamically.
Change-Id: I318c62ae1cae26600b5d024bca6c72ae8baed269

Former-commit-id: 2ac7e01cc5 [formerly 991ac89f21] [formerly 7b44eaafe7] [formerly b30c43883d [formerly 7b44eaafe7 [formerly e47b171ad3863d4066dc2f00e509a8114f9f33f5]]]
Former-commit-id: b30c43883d
Former-commit-id: 6a54d049de45015a52c6e297e53d81e2dc84da1c [formerly 74e2382060]
Former-commit-id: d52c9b0c6a
2012-07-26 13:47:25 -05:00
Ben Steffensmeier
e0a0950811 Issue #924 fix some concurrency issues for GridResource
Former-commit-id: bbc96afc4b [formerly 78491d6318] [formerly e18782687c] [formerly de742a4b8c [formerly e18782687c [formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]]]
Former-commit-id: de742a4b8c
Former-commit-id: fcbbf8b59a1d5b75a1801f8960d54e1283c0c6f7 [formerly 3e9abe8682]
Former-commit-id: bcea00c92b
2012-07-25 17:33:24 -05:00
Bryan Kowal
135071b128 Issue #959 - fix for manual command-line executions of the full rpm build.
Change-Id: Ic2ae5a0aea4983b6ed22ddeb4fd774f9b537214d

Former-commit-id: e9a437e219 [formerly 6b068353e9] [formerly e31fd00613] [formerly 2011493fda [formerly e31fd00613 [formerly b66b6fd7498e441290772be4b6906e58ac385511]]]
Former-commit-id: 2011493fda
Former-commit-id: 6bbcfa1f0027d814121bc9f30c98913b75002786 [formerly 8b44fbfb4f]
Former-commit-id: a307242aea
2012-07-25 14:13:35 -05:00
Ben Steffensmeier
3b989242c3 Issue #921 register GFEColorbarResource as a listener when recycling.
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0

Former-commit-id: 23fa86c332 [formerly 7514bfd6cd] [formerly e3cfa52237] [formerly 044836cd2c [formerly e3cfa52237 [formerly 90ce1b3643af750a19bc29156137f18848e7dc77]]]
Former-commit-id: 044836cd2c
Former-commit-id: 861eca1c82baae5dd8124c5f8fb397c9bd50877e [formerly 6f9ec1af50]
Former-commit-id: 97776790cb
2012-07-24 11:29:51 -05:00
Bryan Kowal
76798b8673 Issue #768 - scripts no longer need to be executable.
Change-Id: I92c1d419c8ed73b954c1c96693d11b2f27313b83

Former-commit-id: 5188c4644b [formerly 4071fa2e74] [formerly fe4a515422] [formerly 88fdb461ea [formerly fe4a515422 [formerly 535dfb1c7242763e67baa3130fc3a98477ccbc8b]]]
Former-commit-id: 88fdb461ea
Former-commit-id: c5c148b5d7e485573e9b7e024aa6dd8301823b71 [formerly efefe956d2]
Former-commit-id: 94180bacc8
2012-07-24 10:12:33 -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
Ben Steffensmeier
91e9532d0d Issue #924 fix concurrency issues for Grid products
Former-commit-id: 7a1573aab5 [formerly 286274aed0] [formerly 0b951d425d] [formerly 9abd645758 [formerly 0b951d425d [formerly 767173dc95dc811bc94081415a214803403985f5]]]
Former-commit-id: 9abd645758
Former-commit-id: 3a4bcf89b3760087f1a171aafd08bbb15551323d [formerly cb08c202ef]
Former-commit-id: af3102991e
2012-07-19 17:37:15 -05:00