Commit graph

72 commits

Author SHA1 Message Date
Ben Steffensmeier
8f40c154fb Issue #189 changes from code review comments for gridcoverage.
Former-commit-id: 94e4f2adb6 [formerly 94e4f2adb6 [formerly cfac5882643a0bde47c6f81623dd80ec41604a82]]
Former-commit-id: 7f99750ba5
Former-commit-id: 57d35bb700
2012-10-01 12:49:28 -05:00
Ben Steffensmeier
769e28c28d Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 9632663c0a [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]
Former-commit-id: f918b6636f
Former-commit-id: 6c38e6abb2
2012-09-24 14:05:22 -05:00
Ben Steffensmeier
90dc005f25 Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 4be2aa88c7 [formerly 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]
Former-commit-id: 0132d35871
Former-commit-id: 174d8ad029
2012-09-20 12:24:35 -05:00
Ben Steffensmeier
464547754e Issue #189 checkin of grid dataplugin
Change-Id: I49b57915d90e6f5b347960046fa4c97a27a93375

Former-commit-id: ccc2ae2108 [formerly ccc2ae2108 [formerly 0b026f5d9d5d86d464cb0ec2b411a59666939276]]
Former-commit-id: 9512cca8ea
Former-commit-id: 30d970eb95
2012-09-18 15:19:07 -05:00
Ben Steffensmeier
a28984c40c Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: bd8eb7fc15 [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: 05849f634d
Former-commit-id: b547d9dd8f
2012-09-18 15:19:05 -05:00
Steve Harris
cbae0bdbba Merge branch 'ss_builds' into Unified_Grid
Former-commit-id: 206e25cbd4 [formerly 206e25cbd4 [formerly 192e3b583fade6ba3d17be6a3f6248cb11a6a673]]
Former-commit-id: a821755cf3
Former-commit-id: 3a923433e6
2012-09-13 15:26:38 -05:00
Steve Harris
26b7d083ec 12.10.1-4 baseline
Former-commit-id: fd19ca5624 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
2012-09-13 12:08:11 -05:00
Richard Peter
08866f0426 Merge "Issue #189 initial checkin of parameter plugin Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a" into Unified_Grid
Former-commit-id: 2c39f2e584 [formerly 2c39f2e584 [formerly a0ec82d660d95f6d8e0866d03ccc6fa97b361a71]]
Former-commit-id: 54b7b9ed09
Former-commit-id: 7f93237af0
2012-09-12 11:45:08 -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
Steve Harris
cc3c3dadee 12.10.1-2 baseline
Former-commit-id: 250f0ccac9 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]
Former-commit-id: a66f3f4b60
Former-commit-id: 34d2ddee9d
2012-09-11 15:50:57 -05:00
Ben Steffensmeier
0b29bd7562 Issue #189 initial checkin of parameter plugin
Change-Id: I6c99e88751c0b7913145801e0f0fb4efed8a281a

Former-commit-id: b3ead4e169 [formerly b3ead4e169 [formerly 65d5edae30817a65dd46374c18907894d92f2972]]
Former-commit-id: a563707ad5
Former-commit-id: e3b5a5effc
2012-09-10 14:24:32 -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
f401755cde 12.9.1-11 baseline
Former-commit-id: 6eb6b0909b [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: fc405efab7
Former-commit-id: a14374fcd4
2012-08-30 14:36:12 -05:00
Steve Harris
5bb474d33c 12.9.1-10 baseline
Former-commit-id: 3adc50a783 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
2012-08-30 14:28:27 -05:00
Steve Harris
8f1120f6d8 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: b8ab6066f6 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b77a4d40d7
Former-commit-id: b2c0dd1abb
2012-08-22 16:00:33 -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
Steve Harris
de9b64b501 12.9.1-4 baseline
Former-commit-id: dcda3a2290 [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
2012-08-15 15:19:10 -05:00
Steve Harris
8c5c5ad6eb 12.9.1-3 baseline
Former-commit-id: 36d80b1f60 [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
2012-08-15 14:26:10 -05:00
Steve Harris
ed416f241e 12.9.1-2 baseline
Former-commit-id: d1d877d319 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: a198b3a807
Former-commit-id: 448ed038c2
2012-08-15 14:12:24 -05: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
46daa48f1c 12.8.1-10 baseline
Former-commit-id: b5e8fee24d [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: ca25d508ec
Former-commit-id: d5563fc340
2012-08-06 09:34:26 -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
Steve Harris
9aabe438b9 12.7.1-8 baseline
Former-commit-id: 16bf591a33 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
2012-07-19 16:20:40 -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
Steve Harris
9054c5ab6c 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Steve Harris
fd9e226b35 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: 2ed7249613 [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 7b75b781ad
Former-commit-id: 6dd3ee8809
2012-05-01 18:31:09 -05:00
Steve Harris
e5543a0e86 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
19657ae52d 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: 4d7572a632 [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 625cd4262c
Former-commit-id: def458753d
2012-04-19 11:11:02 -05:00
Steve Harris
8cd5974f4c 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Steve Harris
9fee09c9e4 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: d3ad6095b7 [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: 5cdda77afb
Former-commit-id: 6aa18f74f6
2012-03-30 09:50:48 -05:00
Steve Harris
2e0f4b241b 12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
5a310acb18 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: 70357d90bc [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: a0abcf8120
Former-commit-id: 6884520750
2012-03-29 10:03:05 -05:00
Steve Harris
2f6a9ef2ac Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 132d68acc6 [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]
Former-commit-id: 54a1d9cdbc
Former-commit-id: 4b853c56c6
2012-03-29 10:01:55 -05:00
Max Schenkelberg
6378e8c4ee 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: 6e5964df9d [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]
Former-commit-id: 50765e8a34
Former-commit-id: cf440b3884
2012-03-14 09:49:32 -05:00
David Gillingham
2d82185a1d Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: e13850a2b6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]
Former-commit-id: d433b7d4d6
Former-commit-id: 2b5588bd1e
2012-03-13 12:31:38 -05:00
Bryan Kowal
6851775548 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: 58bfa62981 [formerly 58bfa62981 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]
Former-commit-id: 66e05f4c96
Former-commit-id: 3b97383354
2012-03-12 11:43:34 -05:00
David Gillingham
2f723abcb7 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: 9a75c87829 [formerly 9a75c87829 [formerly 679996850315f699d47633da5baf593c72ba7927]]
Former-commit-id: 3cfa029f4b
Former-commit-id: 1818e488c5
2012-03-06 16:24:58 -06:00
David Gillingham
773b6c7af6 Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: ff231f33f4 [formerly ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]
Former-commit-id: 1d69867594
Former-commit-id: 8c0b121cbc
2012-03-05 16:49:23 -06:00
Max Schenkelberg
b1a521b17e Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 0cf00cb7f4 [formerly 0cf00cb7f4 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]
Former-commit-id: 76e7a02f76
Former-commit-id: e27d36432a
2012-03-02 13:26:44 -06:00
Max Schenkelberg
28052629c8 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

Former-commit-id: f96ff96259 [formerly f96ff96259 [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]
Former-commit-id: 1f714b1a5b
Former-commit-id: e4914cbe89
2012-03-02 12:24:19 -06:00
Max Schenkelberg
585e979c76 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: ae47d9683e [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]
Former-commit-id: 48b6d45f00
Former-commit-id: 3212cc6ebb
2012-03-01 16:59:40 -06:00
Steve Harris
376edad3c9 Merge branch 'ss_sync' into sync_test
Former-commit-id: 951ecfe3dd [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]
Former-commit-id: 787aed90f8
Former-commit-id: db45babec8
2012-03-01 14:01:16 -06:00
Ben Steffensmeier
588432f980 Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 5c303ed189 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]
Former-commit-id: c61e40c426
Former-commit-id: 84e6c9beb8
2012-02-29 15:49:47 -06:00
David Gillingham
8e123e3ae0 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: 32b2c06988 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]
Former-commit-id: 85998bc654
Former-commit-id: 88dcd4d09d
2012-02-23 13:23:59 -06:00
Steve Harris
ae9c52b012 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: d0bbbfefcc [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: 7a10ca9766
Former-commit-id: 3d511fe719
2012-02-23 10:06:18 -06:00
Steve Harris
15c56d11bc Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
156ad8471d Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
09b81c6e00 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: 4b76d22f77 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: cc66c8be24
Former-commit-id: 54b5b6baef
2012-02-20 12:43:38 -06:00
Bryan Kowal
8403801a2b Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 10a0ca252d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
2012-02-17 12:17:14 -06:00
Bryan Kowal
2fefca4860 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: 4276fc2fe8 [formerly 4276fc2fe8 [formerly 1ec51accade835c1133eac9222131f9186985053]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 38ccaf882b
2012-02-17 11:09:13 -06:00