Commit graph

117 commits

Author SHA1 Message Date
Dustin Johnson
5731299558 Issue Break registry dependency on data delivery
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: bba092f51e [formerly bba092f51e [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]
Former-commit-id: 529238d010
Former-commit-id: 1b165c8e73
2012-12-03 12:06:32 -06:00
Max Schenkelberg
b8b98a78c3 Issue Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: b648c5828e [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]
Former-commit-id: ed77d56a84
Former-commit-id: b24440cc37
2012-11-29 10:29:36 -06:00
Nate Jensen
2385f6223a Issue fix build issue
Change-Id: I5918a05535bc7e928214075784f615cf454d2972

Former-commit-id: d76ab40583 [formerly d76ab40583 [formerly db083d70f18b771740f73ecb787c103b5264881d]]
Former-commit-id: f24fcc07cf
Former-commit-id: 10be056dcb
2012-11-27 09:07:07 -06:00
Dustin Johnson
f91817813d Issue Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: 13b1683458 [formerly 13b1683458 [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]
Former-commit-id: a9d01486ed
Former-commit-id: 1bb69653af
2012-11-19 13:21:03 -06:00
Dustin Johnson
2afb19d76b Issue Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 87148a8061 [formerly 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 1d5714b994
2012-11-16 14:43:45 -06:00
Max Schenkelberg
7ffce5cd45 Issue moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: 655f54b098 [formerly 655f54b098 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]
Former-commit-id: f540f65fd7
Former-commit-id: f1866b2e49
2012-11-15 16:21:42 -06:00
Max Schenkelberg
429ddc7312 Issue Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: dcde9e8951 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]
Former-commit-id: 28e61c8285
Former-commit-id: 2e20c3e799
2012-11-14 16:19:37 -06:00
Max Schenkelberg
9a13824af2 Issue removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: d1099addc6 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: 00822a4f39
Former-commit-id: c4e5092f94
2012-11-12 16:46:21 -06:00
Dustin Johnson
6613c51d3b Issue Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 064ef82d1e [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -06:00
Max Schenkelberg
50625b0453 Issue Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: 2f90120248 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
2012-11-07 10:44:42 -06:00
Dustin Johnson
4d9c945388 Issue Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 98d7beae50 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Steve Harris
ea34163a1c Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 34e7b3f4a3 [formerly 34e7b3f4a3 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]
Former-commit-id: 8703ff00c7
Former-commit-id: dc5eba737d
2012-10-17 08:21:19 -05:00
Steve Harris
ad78266035 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: 4610ecc513 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
2012-10-16 15:48:14 -05:00
Steve Harris
560f0d9cc3 12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
2012-10-16 13:27:07 -05:00
Nate Jensen
319c4cda2b Issue Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: f2cbf0c5c3 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 5bdf9d4d38
2012-10-12 15:16:27 -05:00
Roger Ferrel
8982e1baf9 Issue Changes to allow change listeners on Alter Bundles.
Changes from code review 2.

Change-Id: I8f8640a9c90c0191179c74570855a67370617a20

Former-commit-id: e7d27f4aab [formerly e7d27f4aab [formerly de530f99fcc7f68a1bd84ed399ff04eac63e7a58]]
Former-commit-id: 03070aded9
Former-commit-id: f4861554cd
2012-10-10 06:52:09 -05:00
Steve Harris
8c81601905 Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73

Former-commit-id: 8c97afe03b [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]
Former-commit-id: 0895f22690
Former-commit-id: 8dae024430
2012-10-08 13:29:34 -05:00
Steve Harris
e72b6d5da6 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: c12ee14e66 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
542aca681b Issue move alert parsing into the resource data so that it can clear the time cache for derived alerts.
Change-Id: Iba5b641fbd6e8fa3657a7dd2311ae18cf63456f8

Former-commit-id: 42ae490a50 [formerly 42ae490a50 [formerly 4f648f3ea23cd2d300bb92228e20d7f2678718fd]]
Former-commit-id: b6e124f830
Former-commit-id: 2cdb3553e9
2012-10-05 14:28:35 -05:00
Steven Harris
a544be6d83 12.11.1-1 baseline
Former-commit-id: 618aa3f316 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
2012-09-27 15:57:45 -05:00
Max Schenkelberg
e021aee0c8 Issue Made VizGlobalsManager check for null window before calling getPage() since getInstance() still returns succesfully when null window is passed in. Change TimeMatchingJob to be shutdown when core plugin stops and cancels existing jobs.
Amend: Removed println

Change-Id: I3559b13074eb025e9bf931685cda3e804037baff

Former-commit-id: 4b2467e639 [formerly 4b2467e639 [formerly fc617c1392d9585d2e91e371af74aad4b24acfbb]]
Former-commit-id: edfd7fd22f
Former-commit-id: 63c30eafc2
2012-09-24 15:39:18 -05:00
Steve Harris
f9166b9d83 Merge branch 'development' into Enhanced_points and Enhanced_points into development
Former-commit-id: 72ecefa9ee [formerly 72ecefa9ee [formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]
Former-commit-id: fe92909f53
Former-commit-id: b8d2ff47ca
2012-09-17 14:58:23 -05:00
Bryan Kowal
219c939169 Issue - replace EnhancedPatternLayout with PatternLayout
Former-commit-id: 77d12d0275 [formerly 77d12d0275 [formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]
Former-commit-id: 3a037ffd49
Former-commit-id: f516e61f20
2012-09-14 12:25:41 -05:00
Steve Harris
69b6272658 Merge branch 'development' into Enhanced_points
Former-commit-id: 321e2191b1 [formerly 321e2191b1 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]
Former-commit-id: 6146f56ce4
Former-commit-id: 9ca736f901
2012-09-13 15:25:12 -05:00
Brad Gonzales
b9937ef456 Issue added Appender EnvConfigurableRollingFileAppender.
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b

Former-commit-id: 4b383c3274 [formerly 4b383c3274 [formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]]
Former-commit-id: d10cabc917
Former-commit-id: 41dc92ba3a
2012-09-13 07:50:56 -05:00
Steve Harris
d20a1de861 Merge branch 'development' into Enhanced_points
Former-commit-id: 1dd1305a5d [formerly 1dd1305a5d [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]
Former-commit-id: ada1066831
Former-commit-id: d85659d9de
2012-09-12 14:14:56 -05:00
Steve Harris
2002a7cb8d 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: 077ced354e [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]
Former-commit-id: fd5e214e72
Former-commit-id: ba25027ea5
2012-09-12 13:10:36 -05:00
Max Schenkelberg
1badd11cdb Issue Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d

Former-commit-id: 7294025e26 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: c26d21d908
2012-09-11 16:27:41 -05:00
Steve Harris
faadb51529 12.10.1-3 baseline
Former-commit-id: 21f430062b [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
2012-09-11 16:00:38 -05:00
Max Schenkelberg
264bc403d6 Issue Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: 80439b309b [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]
Former-commit-id: 84658dd03a
Former-commit-id: 20f5d966db
2012-09-10 10:45:37 -05:00
Max Schenkelberg
4f86d1c819 Issue Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c

Former-commit-id: c183a0e614 [formerly c183a0e614 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]]
Former-commit-id: 28d6308444
Former-commit-id: 87bcbdb4cc
2012-09-05 11:51:38 -05:00
Steve Harris
e9582cb789 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: bba4eb12d0 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]
Former-commit-id: af106f1d29
Former-commit-id: 53e29f59e4
2012-09-04 12:11:03 -05:00
Steve Harris
d65f35ffe9 12.10.1-1 baseline
Former-commit-id: 195158c004 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
2012-09-04 12:07:27 -05:00
Steve Harris
66ac1051bc Merge branch 'development' into Enhanced_points
Former-commit-id: 5feac55dbd [formerly 5feac55dbd [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]
Former-commit-id: 32cf7fd764
Former-commit-id: 592ab923bb
2012-08-30 15:43:06 -05:00
Steve Harris
0b647c0c9d Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 91e39617cb [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: a71dac6cad
Former-commit-id: 87a602dfee
2012-08-27 09:53:55 -05:00
Max Schenkelberg
8e894dba11 Issue Changed ResourceList so it can be extended to allow duplicates. Removed deleted files from ISerializableObject files. Made TileSetRenderable properly issue refresh when images were still being requested. Made true color code work by only showing intersecting areas of all bands on screen. Made so shader files would be reread in if edited.
Change-Id: Ib2ce27522c59f25ce1cef65e6d7665e28963f081

Former-commit-id: 75b2cdff47 [formerly 75b2cdff47 [formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]
Former-commit-id: c4812b7745
Former-commit-id: 7f506ce81d
2012-08-23 17:37:12 -05:00
Steve Harris
9b5c2094ed 12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Max Schenkelberg
362d34bee0 Issue Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014

Former-commit-id: b69d2cad1c [formerly b69d2cad1c [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]
Former-commit-id: 1b406ecfca
Former-commit-id: aa9df46a1d
2012-08-20 14:47:14 -05:00
root
1792158ef8 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: cb46f57879 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
2012-08-15 22:15:20 +00:00
Steve Harris
63bcadf121 12.9.1-1 baseline
Former-commit-id: 31ae7ea218 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
2012-08-15 13:59:00 -05:00
Steve Harris
14923a89e9 Merge branch 'development' into Enhanced_points
Former-commit-id: 346d775f57 [formerly 346d775f57 [formerly 25026a4d9955b76039bf25861380cadebff19665]]
Former-commit-id: f7f97d9f54
Former-commit-id: 031b655ab5
2012-08-15 13:35:47 -05:00
Max Schenkelberg
79f15e475e Issue Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
Change-Id: I624edb115b02611470e2e434e27759c45600111c

Former-commit-id: 93e8619fa5 [formerly 93e8619fa5 [formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]
Former-commit-id: 09b0db0a13
Former-commit-id: 784c43ab7c
2012-08-13 12:20:05 -05:00
Roger Ferrel
4e356b8a13 Issue 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: 2e3fc4b400 [formerly 2e3fc4b400 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]
Former-commit-id: f4ae8eb150
Former-commit-id: ae41499ba2
2012-08-08 13:35:47 -05:00
Steve Harris
e892eb4628 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: 6d77b94217 [formerly 6d77b94217 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 51e38ca887
Former-commit-id: 3476fe755b
2012-08-01 12:43:12 -05:00
Steve Harris
e86949a8d3 12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
2012-08-01 10:45:37 -05:00
Nate Jensen
70d269fc34 Issue fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: 3d07fc8ebf [formerly 3d07fc8ebf [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]
Former-commit-id: dbe185f3a0
Former-commit-id: 67edb6917d
2012-07-26 17:43:29 -05:00
Ben Steffensmeier
a0b80d6e96 Issue switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998

Former-commit-id: 74a69d1fb9 [formerly 74a69d1fb9 [formerly 009e769a180898cb62e9df4a604b40e139cf2886]]
Former-commit-id: 79ab850efa
Former-commit-id: 4182352f8c
2012-07-10 16:04:56 -05:00
Steve Harris
d5fa61041b 12.6.1-9 baseline
Former-commit-id: 2c0ff851ca [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
2012-07-10 07:53:49 -05:00
Max Schenkelberg
d876190d68 Issue 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: 9bbb68a547 [formerly 9bbb68a547 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 7286b4e962
2012-07-06 16:01:47 -05:00
Ben Steffensmeier
bce842f480 Issue introduce canvas based rendering for making KML screen overlays
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def

Former-commit-id: 02e2c7b579 [formerly 02e2c7b579 [formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]
Former-commit-id: 881896c21b
Former-commit-id: b0f5013c7c
2012-06-28 13:58:29 -05:00