Commit graph

60 commits

Author SHA1 Message Date
Nate Jensen
3aba42df34 Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 7197e75c15 [formerly 7b4938a999] [formerly 7197e75c15 [formerly 7b4938a999] [formerly 8898a6d2ba [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: 7c438bd944 [formerly 375ad89ac8]
Former-commit-id: fa24302a76
2013-07-23 12:28:07 -05:00
Nate Jensen
3e7f3c66a8 Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: bcdaae1922 [formerly 22438766b4] [formerly bcdaae1922 [formerly 22438766b4] [formerly 4c9cc211ec [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: a51d424851 [formerly 797760bb71]
Former-commit-id: c28a52bee8
2013-07-22 12:20:43 -05:00
Richard Peter
2a9cfe51af Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 401ed88e44 [formerly 15d1a6eab0] [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e7ec068c7e [formerly 12993d9539]
Former-commit-id: 85fc9c773b
2013-07-22 09:40:18 -05:00
Steve Harris
513c089375 13.5.1-7 baseline
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: cb50a0028d [formerly f9c9aecba5]
Former-commit-id: eff4fb29dd
2013-07-18 12:07:22 -04:00
Max Schenkelberg
738d6bcae8 Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code.
Amend: Fixed comment

Change-Id: I384a3fac3ad6e3ee8b4efd17246a26a1c4476c63

Former-commit-id: bc91a9f6de [formerly 9709b0500a] [formerly bc91a9f6de [formerly 9709b0500a] [formerly fef6056519 [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]]
Former-commit-id: fef6056519
Former-commit-id: 63d69a5435 [formerly dc78010e74]
Former-commit-id: 1e7b73c44e
2013-07-02 15:22:31 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Max Schenkelberg
539bbe2cb5 Issue #2122 Refactored satellite to use tile set renderable. Deleted old code
Amend: Added fix for issue 2103
Amend: Added software history

Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b

Former-commit-id: b4c0d1f715 [formerly 47b55981c8] [formerly b4c0d1f715 [formerly 47b55981c8] [formerly 2f03c38ca0 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]]
Former-commit-id: 2f03c38ca0
Former-commit-id: c912e8e6c5 [formerly bc4ebb4f08]
Former-commit-id: 20caab72f9
2013-06-24 15:48:37 -05:00
Steve Harris
859965fc9d 13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00
Max Schenkelberg
3f67097105 Issue #1638 Made gl extensions more usable by other gl projects and topo resource more extendable.
Change-Id: Ia0fe27113f7d3e1ce86bcce231812b2e0bbe0f75

Former-commit-id: b28f451d17 [formerly 3379b100cb] [formerly b28f451d17 [formerly 3379b100cb] [formerly 7f76bd3d98 [formerly 483247738be16ae76bc2f9891f557960e7ade60e]]]
Former-commit-id: 7f76bd3d98
Former-commit-id: e4d27d5d99 [formerly 86d8f1b294]
Former-commit-id: a6d84e24b7
2013-06-03 17:19:18 -05:00
Max Schenkelberg
062c4e90cd Issue #1638 Fixed text box drawn to be correct size with padding around text
Amend: Fixed format string issues with topo resource and colorbar labels

Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114

Former-commit-id: a88ca5e983 [formerly 13ff44fdee] [formerly a88ca5e983 [formerly 13ff44fdee] [formerly 3175563336 [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]
Former-commit-id: 3175563336
Former-commit-id: 4e8d25b317 [formerly 9932114218]
Former-commit-id: b3bae339be
2013-05-28 15:00:59 -05:00
Max Schenkelberg
9921ea5cb1 Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: 4d435d3dd5 [formerly c421240835] [formerly 4d435d3dd5 [formerly c421240835] [formerly d07de0870f [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]
Former-commit-id: d07de0870f
Former-commit-id: 7ce0b7ef13 [formerly a94469df82]
Former-commit-id: 6adbb139ab
2013-05-16 18:04:26 -05:00
Max Schenkelberg
8dbf1c6ca0 Issue #1638 Refactored topo resource to load different topo files. Added GMT TimeZone to TimeUtil.
Change-Id: I4d94a9a2a6dc7ad1261e2ed52c97bab67256b4c8

Former-commit-id: 473b90d885 [formerly b141397516] [formerly 473b90d885 [formerly b141397516] [formerly 532211dc69 [formerly 06107e34a04a2ef0df707a7643daad9e1ec11a0b]]]
Former-commit-id: 532211dc69
Former-commit-id: edd5c507bb [formerly 88211a0f5c]
Former-commit-id: 245b3a2fb0
2013-04-24 18:11:30 -05:00
Steve Harris
7b7efd0bd1 13.3.1-19 baseline
Former-commit-id: dc9fef33a9 [formerly 9be238bcc4] [formerly dc9fef33a9 [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]
Former-commit-id: abaf9f12f9
Former-commit-id: ed4150db5f [formerly 340a2cfb23]
Former-commit-id: 7d76371536
2013-04-09 08:37:12 -05:00
Steve Harris
a7b174bfaf Merge branch 'omaha_13.3.1' into development
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0f53c46d7a [formerly ed8c0487fe]
Former-commit-id: 7eda24c3b0
2013-04-04 11:58:50 -05:00
Nate Jensen
0e25d15232 Issue #1562 max's fix for topo with custom colormaps
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: d64e0a2a39 [formerly 057a929903] [formerly d64e0a2a39 [formerly 057a929903] [formerly 6c711f037c [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]
Former-commit-id: 6c711f037c
Former-commit-id: 6ca17c5a2a [formerly 616612e550]
Former-commit-id: fb5bce6afe
2013-04-03 14:10:53 -05:00
Steve Harris
120fc26670 13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: f80f98cee2 [formerly bc439aee4f]
Former-commit-id: f1d156779a
2013-03-25 13:27:13 -05:00
Max Schenkelberg
a25ccc8c5c Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e

Former-commit-id: 43341e7ad3 [formerly c6db3ce43b] [formerly 43341e7ad3 [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]]]
Former-commit-id: 26cfcd2af5
Former-commit-id: ec27a16858 [formerly 2e10fd83f6]
Former-commit-id: 924e27f51f
2013-03-20 14:10:52 -05:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
2013-02-28 17:00:56 -06:00
Max Schenkelberg
1073393fbb Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: 2611980ca4 [formerly 4ed4ef8d71] [formerly 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: 5617dfaa67 [formerly 6b1426dd34]
Former-commit-id: 453ac44050
2013-02-27 11:50:38 -06:00
Max Schenkelberg
5f2bc20ff7 Issue #1562 Made topo create colormap parameters off existing ones and moved to new tileset API
Change-Id: Iba534200e893a0e4febc2b14ec0161e2d8b0e6d3

Former-commit-id: 817bfcdb4b [formerly 44b3876738] [formerly 817bfcdb4b [formerly 44b3876738] [formerly a3efce7917 [formerly 51ad0f0a990f1238ba0ba01491e155eb5efb6012]]]
Former-commit-id: a3efce7917
Former-commit-id: 1ef69cd6e6 [formerly 0f4fbf614e]
Former-commit-id: 08015d63e0
2013-01-31 14:26:06 -06:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Bryan Kowal
89cc2bdf57 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: fba28ea69b [formerly e2a12845d3] [formerly fba28ea69b [formerly e2a12845d3] [formerly 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 38480e46b1 [formerly c1330e8121]
Former-commit-id: 290167ac16
2013-01-15 14:56:01 -06:00
Steve Harris
f52ec0b0a0 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Max Schenkelberg
2030832669 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: be99f6c7ca [formerly 3e128b266a] [formerly be99f6c7ca [formerly 3e128b266a] [formerly 5db71ca943 [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: d43e0c1c25 [formerly b74d788909]
Former-commit-id: 206116ab66
2012-12-12 11:39:32 -06:00
Steve Harris
af59663a99 12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
2012-11-07 12:41:20 -06:00
Ben Steffensmeier
1931b503a2 merge branch Unifeid_Grid into developement
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 1d94435220 [formerly 92fd247ccc]
Former-commit-id: 38b0dafe0b
2012-10-30 12:24:54 -05:00
Ben Steffensmeier
94f0378fab Issue #189 changes from code review
Former-commit-id: 3c222ab437 [formerly 984d128d33] [formerly 3c222ab437 [formerly 984d128d33] [formerly 7139c80557 [formerly 449762acbbe74173121e19f5c325104221c083a2]]]
Former-commit-id: 7139c80557
Former-commit-id: fcc23a917e [formerly b0bf62ce6f]
Former-commit-id: c1e4873727
2012-10-25 16:33:59 -05:00
Ben Steffensmeier
3ccf7b0736 Issue #189 fix several errors with grid resources when there is no valid data.
Former-commit-id: 601dcf7b31 [formerly 392e64f33e] [formerly 601dcf7b31 [formerly 392e64f33e] [formerly efb19ceb6f [formerly 98d52a1d86b5b5325c678a3aedbc4d20c009413d]]]
Former-commit-id: efb19ceb6f
Former-commit-id: 1fe73f9c8f [formerly a9c7c3297c]
Former-commit-id: c140338859
2012-10-23 18:32:55 -05:00
Ben Steffensmeier
063fe78b61 Issue #1152 synchronize preload for MemoryBasedTileSet.
Former-commit-id: 8da5cc0bc1 [formerly 2d0615067b] [formerly 8da5cc0bc1 [formerly 2d0615067b] [formerly 5fe4533e87 [formerly 4f679955b848f5c6de3e61207c152eca9959d2d7]]]
Former-commit-id: 5fe4533e87
Former-commit-id: eb283d6c42 [formerly 6d5394dc71]
Former-commit-id: b498ca1a65
2012-10-03 15:02:16 -05:00
Steven Harris
2f855322f6 12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
2012-09-27 15:57:45 -05:00
Steve Harris
288d4afff5 12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: a903893a09 [formerly deed84c1a2]
Former-commit-id: 430a11f72b
2012-09-17 15:42:31 -05:00
Max Schenkelberg
8c6a79a89f Issue #1143 Fixed GriddedImageDisplay2 which is what the CWAT resource uses so stops incorrectly doubling the size of the short array used for display.
Change-Id: I7fd59086fc75b7b72ebece857273c8d0c58d2abd

Former-commit-id: dc613b2ba7 [formerly 2b20299319] [formerly dc613b2ba7 [formerly 2b20299319] [formerly 0b361078b3 [formerly 5698f8158b32789bab532e8820521f609e23a8c8]]]
Former-commit-id: 0b361078b3
Former-commit-id: 18094f00ed [formerly 0fc001113f]
Former-commit-id: d4b083d289
2012-09-13 16:40:00 -05:00
Mike Duff
195e71243f Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
Former-commit-id: 269d2831d9 [formerly bcafd807c5] [formerly 269d2831d9 [formerly bcafd807c5] [formerly 7825863940 [formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]]]
Former-commit-id: 7825863940
Former-commit-id: e443d5b5da [formerly db6ac1594e]
Former-commit-id: 45e84531a6
2012-09-11 08:50:55 -05:00
Ben Steffensmeier
d608483d9f Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
Former-commit-id: 596b48c490 [formerly e1c07b5803] [formerly 596b48c490 [formerly e1c07b5803] [formerly a988fdf5de [formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]]
Former-commit-id: a988fdf5de
Former-commit-id: da05d2dd24 [formerly 4f16803030]
Former-commit-id: 6ab6152235
2012-08-22 13:02:56 -05:00
Steve Harris
2d928d328e 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Max Schenkelberg
da993aeada 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: 079a11565a [formerly f635e9c332] [formerly 079a11565a [formerly f635e9c332] [formerly cc0a1fbca3 [formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]]
Former-commit-id: cc0a1fbca3
Former-commit-id: 7ee188d90a [formerly 74f0179b92]
Former-commit-id: 40e6cd390e
2012-08-01 10:51:32 -05:00
James Korman
c901590446 Issue #798 - Code review changes
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb

Former-commit-id: 1166a7cbb1 [formerly 38a2e426d9] [formerly 1166a7cbb1 [formerly 38a2e426d9] [formerly 4cbbc59278 [formerly cb05a9f95384806537106dc804833331d6c7db48]]]
Former-commit-id: 4cbbc59278
Former-commit-id: 16643cb1bc [formerly 5df52e38f9]
Former-commit-id: 41a80adfb1
2012-07-31 13:38:23 -05:00
Ben Steffensmeier
45411d9824 Issue #924 fix concurrency issues for Grid products
Former-commit-id: 286274aed0 [formerly 0b951d425d] [formerly 286274aed0 [formerly 0b951d425d] [formerly 9abd645758 [formerly 767173dc95dc811bc94081415a214803403985f5]]]
Former-commit-id: 9abd645758
Former-commit-id: af3102991e [formerly cb08c202ef]
Former-commit-id: bd6bb5fd43
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
317c75a71e Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998

Former-commit-id: 5bf019e1bb [formerly 74a69d1fb9] [formerly 5bf019e1bb [formerly 74a69d1fb9] [formerly 79ab850efa [formerly 009e769a180898cb62e9df4a604b40e139cf2886]]]
Former-commit-id: 79ab850efa
Former-commit-id: 612e586a6c [formerly 4182352f8c]
Former-commit-id: a0b80d6e96
2012-07-10 16:04:56 -05:00
Steve Harris
37f2b6e138 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
2012-07-10 07:53:49 -05:00
Max Schenkelberg
3325ed5deb Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 7d13c7d339 [formerly 9bbb68a547] [formerly 7d13c7d339 [formerly 9bbb68a547] [formerly 98c2ec7dc5 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: c6d324aaeb [formerly 7286b4e962]
Former-commit-id: d876190d68
2012-07-06 16:01:47 -05:00
Max Schenkelberg
e1d946912c Issue #763 Removed references to OBE cots org.apahce.tomcat.nativ to reduce size of collaboration standalone product. This project could now be removed from the baseline
Change-Id: I9d8d0155afa5c01f3cc027a5f5adb0e2a9893e47

Former-commit-id: e1d23a56a9 [formerly 62bd4a667a] [formerly e1d23a56a9 [formerly 62bd4a667a] [formerly a3014f6ec3 [formerly 24423c6b03bffd01313a93b6c641b3d8fef35902]]]
Former-commit-id: a3014f6ec3
Former-commit-id: 544ffdc4ca [formerly 9328717a1a]
Former-commit-id: 57cc1a4830
2012-06-28 15:29:05 -05:00
Bryan Kowal
2e5a850d28 Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	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.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: b1b294c401 [formerly a33740e915] [formerly b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: b4917e6708 [formerly 9a7d0492fe]
Former-commit-id: 611925412d
2012-06-27 17:21:48 -05:00
Steve Harris
56f8cf00a8 12.6.1-10 baseline
Former-commit-id: edac4d827c [formerly 8dc4a774e2] [formerly edac4d827c [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]
Former-commit-id: 3cd0902b49
Former-commit-id: efe25edfad [formerly eacd5aeb7f]
Former-commit-id: df59dc7c44
2012-06-21 08:58:00 -05:00
Steve Harris
e77a15c047 Revert "12.6.1-10 baseline"
This reverts commit 95e7f4fc0c [formerly aecc6a8474] [formerly f8497470fc [formerly b33c5bdfcf]] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].


Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 333fd9c64e [formerly 8367fb50f5]
Former-commit-id: 75f77df418
2012-06-21 08:51:08 -05:00
Steve Harris
95e7f4fc0c 12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: f8497470fc [formerly b33c5bdfcf]
Former-commit-id: aecc6a8474
2012-06-21 08:38:48 -05:00
Ben Steffensmeier
1a3e1ba291 Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97

Former-commit-id: 2da8a0df2f [formerly aad1eb18b0] [formerly 2da8a0df2f [formerly aad1eb18b0] [formerly 9068e049cb [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]
Former-commit-id: 9068e049cb
Former-commit-id: bded5dde2b [formerly dd496b3d90]
Former-commit-id: 541f1b74f3
2012-06-14 16:44:19 -05:00
Steve Harris
3b468d9f50 12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: b69fa75919 [formerly a945ed8e6d]
Former-commit-id: 91e65230ad
2012-06-11 16:23:47 -05:00
Steve Harris
39ff9954f8 12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
2012-06-08 13:39:48 -05:00
Steve Harris
ef49f63d8d 12.5.1-2 baseline
Former-commit-id: ac708c050d [formerly 84d191e7b6] [formerly ac708c050d [formerly 84d191e7b6] [formerly b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: f6300cd995 [formerly a821111fbf]
Former-commit-id: 377ae76413
2012-05-03 19:17:13 -05:00