Commit graph

152 commits

Author SHA1 Message Date
Steve Harris
ca25d508ec 12.8.1-10 baseline
Former-commit-id: 7c799ab7b99993c77b6568529b46aaf13d01300b
2012-08-06 09:34:26 -05:00
Steve Harris
cd49ef3eda 12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00
Steve Harris
c42ae0fa39 12.7.1-8 baseline
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
2012-07-19 16:20:40 -05:00
Steve Harris
27afa60345 12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
2012-07-10 07:53:49 -05:00
Steve Harris
3904c4ccf5 12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
7b75b781ad Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
used git cherry-pick -m 1 879a2e0

Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Conflicts:

	ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java


Former-commit-id: 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9
2012-05-01 18:31:09 -05:00
Steve Harris
8485b90ff8 12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Steve Harris
625cd4262c Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: 5e1b9319941eed516a08a135a2049c14bad77863
2012-04-19 11:11:02 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Steve Harris
5cdda77afb Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline

Conflicts:
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java

Former-commit-id: 879a2e0a4a31999bf4d624ff59e77bbd68195458
2012-03-30 09:50:48 -05:00
Steve Harris
22bd792cd9 12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
Steve Harris
a0abcf8120 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: e68338cecbe85a62835633e9aba0925344fb80f1
2012-03-29 10:03:05 -05:00
Steve Harris
54a1d9cdbc Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 296cc5a5a6bcc45cd92198a045a88620d7d18653
2012-03-29 10:01:55 -05:00
Max Schenkelberg
50765e8a34 Issue #358 Cleaned up mesh extension and API to use geotools for
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 7e4abe637edacca71e1e1c98d99521cd33415fb0
2012-03-14 09:49:32 -05:00
David Gillingham
d433b7d4d6 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: 727e2b19688397ea4608a2b6ca3fda3222b6ad36
2012-03-13 12:31:38 -05:00
Bryan Kowal
66e05f4c96 Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
Former-commit-id: eaa45d7123c43590be3d58fdf845708ade2dbb51
2012-03-12 11:43:34 -05:00
David Gillingham
3cfa029f4b Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent
massive backups in access to GfeScript instance map.

Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.

Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e

Former-commit-id: 679996850315f699d47633da5baf593c72ba7927
2012-03-06 16:24:58 -06:00
David Gillingham
1d69867594 Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: 26161f9fd457f02b4df8780750064aeb27fc7ba1
2012-03-05 16:49:23 -06:00
Max Schenkelberg
76e7a02f76 Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: ba90282320443c6c41c3188db9f43ffb11399bdd
2012-03-02 13:26:44 -06:00
Max Schenkelberg
1f714b1a5b Issue #358 merged dataURI changes from thinclient in for plot
compatibility

Former-commit-id: 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de
2012-03-02 12:24:19 -06:00
Max Schenkelberg
48b6d45f00 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6
2012-03-01 16:59:40 -06:00
Steve Harris
787aed90f8 Merge branch 'ss_sync' into sync_test
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
2012-03-01 14:01:16 -06:00
Ben Steffensmeier
c61e40c426 Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: f94248823eed52b2d9f8c56af3dc7607b323fc1e
2012-02-29 15:49:47 -06:00
David Gillingham
85998bc654 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: 67aaf1c21e8372b4a84cb82cae62549502992651
2012-02-23 13:23:59 -06:00
Steve Harris
7a10ca9766 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
2012-02-23 10:06:18 -06:00
Steve Harris
54be9660f1 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
9995d22e25 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
2012-02-22 10:12:49 -06:00
Steve Harris
cc66c8be24 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
2012-02-20 12:43:38 -06:00
Bryan Kowal
682c10767d Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
2012-02-17 12:17:14 -06:00
Bryan Kowal
9f1b7a613a Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
Former-commit-id: 1ec51accade835c1133eac9222131f9186985053
2012-02-17 11:09:13 -06:00
Steve Harris
b137302802 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
2012-02-17 10:55:02 -06:00
Steve Harris
1707b98721 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: f3bac368dacad47036f9823243379fe6ed1d4869
2012-02-15 14:34:47 -06:00
Ben Steffensmeier
2995d2b29b Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Former-commit-id: 32b8f723ebf64d97636705911c0b7b22a9cd2148
2012-02-14 12:59:42 -06:00
Nate Jensen
e79aa3bfa1 Merge "Issue #176 fix PersistablePluginDataObject" into 4-Thin_Client
Former-commit-id: fd1087a87366dfd51789c50ee56c4b43e3404f11
2012-02-07 09:47:46 -06:00
Ben Steffensmeier
6d901d27ae Issue #176 fix PersistablePluginDataObject
Change-Id: I29f37b0fceb180eb0950ff1e00c44eb94b05f82e

Former-commit-id: 34eb69e6ead3aa811c018e364517998d356e4feb
2012-02-07 09:42:07 -06:00
Ben Steffensmeier
851046ccf3 Issue #237 revert Silver Spring changes to nsharp activator which break windows. Fix grib decoder to handle grib files with lo1 on the dateline.
Change-Id: I4991e7f02c8cdcfd608c3c6d987f4d0ea8593f40

Former-commit-id: 2b0f9f149c4dc2031cb9178538899eb3f9f5de23
2012-02-06 16:55:48 -06:00
Ben Steffensmeier
73f6e9e322 Issue #176 pull changes to insert and persist time from the WES2Bridge branch.
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4

Former-commit-id: 500f3f03f5260cff3417021776204ccf6c035415
2012-02-03 17:33:32 -06:00
Ben Steffensmeier
83fbf80c98 Issue #211 change point requests to correctly return null responses when there are no matching pdos.
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a

Former-commit-id: 2cd24c7e679b4f7002664d2588dd8bc54c7cebd0
2012-02-01 17:39:14 -06:00
Nate Jensen
f3ba2258df Issue #181 disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9
2012-01-31 09:45:27 -06:00
Ben Steffensmeier
0d75fbf942 Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a

Former-commit-id: 1b2496a6db33fc65efecfdffb380d8b4e07ec590
2012-01-30 16:39:57 -06:00
Nate Jensen
50c6816fa9 Issue #181 fix ncep edex rpms
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf

Former-commit-id: 17f8151b148ad8d645c81760bfa4820dc421490a
2012-01-30 15:56:50 -06:00
Ben Steffensmeier
dfd869c1c1 Issue #183 change grib data catalog to use bulk requests to retrieve all coverages at once.
Change-Id: I99f3dfc7900b57b074062155a4e7a65851f70170

Former-commit-id: 3cdfc8f73cce96c00b7ac37a1e34e9d051b628b6
2012-01-27 14:48:40 -06:00
Bryan Kowal
71d08b6916 Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: b309c8b3d2726da589a057d31d2ae7592b82eb19
2012-01-26 17:38:17 -06:00
Bryan Kowal
bdf268a621 Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: 23e05be1b40d5bd0cc969bd2c01ba4420fa7c644
2012-01-26 17:26:07 -06:00
Ben Steffensmeier
2d0ba75b3e Issue #23 fix the LRUCacheFS so it does not create a cache directory if
it is not using it, it creates different cache directories for different
users and it has better error checking.
Change-Id: I486a98583a0d952fe7753d28ae6a2026e943bfb4
Former-commit-id: a29e7c8028c4d3099627da4a5586b7c6d13b51fb
2012-01-26 15:13:40 -06:00
Nate Jensen
1dabb12dce Issue #181 fixing edex feature and component deploys
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d

Former-commit-id: 0c82def5c753aab240848aac8dc906a161461ac3
2012-01-24 12:15:01 -06:00
Nate Jensen
33756de9c8 Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: 3aa13bd49e23ef963127f7efbc91054c06808f1c
2012-01-24 09:59:50 -06:00
Nate Jensen
a015cc136b Issue #181 integrating ncep edex code
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf

Former-commit-id: 71d87e07ef1d5ce2509fddce9170870a5950ba7b
2012-01-24 09:49:27 -06:00
Bryan Kowal
2b5ee4b940 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 296d2915b17f0086d93e200d4780663bff34edbb
2012-01-20 11:37:38 -06:00
Matt Nash
88fc441c0f remove files that were removed at some point
Former-commit-id: 952fab8cf1d3b86eba055cef96954a2807d6ecf6
2012-01-19 14:31:53 -06:00