Commit graph

234 commits

Author SHA1 Message Date
Richard Peter
7a54b09c59 Issue #502: Update grib/gfe thread/memory usage for grib notification route
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36

Former-commit-id: 7a5aea8ee4 [formerly 7b14c9499a] [formerly e431671ff2] [formerly 150d16b24e [formerly e431671ff2 [formerly a4450314db26948d531ecf80ec1455895cdb81ac]]]
Former-commit-id: 150d16b24e
Former-commit-id: 3f705bea746413ee0cdfbbd18f2ab0a94a522dc8 [formerly 33c7d4cb87]
Former-commit-id: fe6dc2652c
2012-05-11 10:06:04 -05:00
Steve Harris
fe7ac96625 Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

All of these were 'self-resolved' when kdiff3 invoked


Former-commit-id: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]
Former-commit-id: 53d2822329
2012-05-09 13:19:47 -05:00
Max Schenkelberg
c5b45b0265 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6]
Former-commit-id: 338f80fa87
2012-05-01 18:36:09 -05:00
Steve Harris
3992b18e28 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: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]
Former-commit-id: 7c7fc97131
2012-05-01 18:31:09 -05:00
Steve Harris
40aa780b3d 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Dave Hladky
9ae2445f9f Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.

Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]
Former-commit-id: a1a3a361dd
2012-04-30 13:43:34 -05:00
David Gillingham
576e994c04 Merge "Issue #562: Rename QPFRecord getters and setters to match Java-naming conventions, correct bugs in other classes found during test." into 9-Wes2Bridge
Former-commit-id: ddd78ed32f [formerly 0ff2041959] [formerly 2c9c0b316aaf92bc0ffe380d32f526e9d027ef82 [formerly 4aadd41fde]] [formerly 9878793618 [formerly 4aadd41fde [formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]]
Former-commit-id: 9878793618
Former-commit-id: 2346b8754f4ea785e03af9338a964fe9ccdfe0d2 [formerly a1a62aa8f1]
Former-commit-id: 8c4eda7ae7
2012-04-27 13:26:37 -05:00
David Gillingham
eeb836f5eb Issue #562: Rename QPFRecord getters and setters to match Java-naming
conventions, correct bugs in other classes found during test.

Change-Id: I7f490793678741ffa41769a63371e06d27840bdb

Former-commit-id: 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]
Former-commit-id: 292374ce21
Former-commit-id: 4ffd35492e1f4e3a22ff89cb2e9d2d09bf68492e [formerly 6f40ba77f1]
Former-commit-id: 1107eac65d
2012-04-27 12:43:04 -05:00
Richard Peter
51e9a72371 Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: 231d98b79e [formerly c33a392a8c] [formerly 349adaeedd] [formerly b11df888d3 [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]]
Former-commit-id: b11df888d3
Former-commit-id: 8e9c6244c73799f26e260982a3f71ee5ca3d5c9a [formerly e3323febc5]
Former-commit-id: ae35c2f27c
2012-04-27 12:08:29 -05:00
David Gillingham
7bf4680605 Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().

Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f

Former-commit-id: be0570d2fe [formerly 8592a9a50d] [formerly 526abfd36e] [formerly 04ab5d619b [formerly 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]]
Former-commit-id: 04ab5d619b
Former-commit-id: e77f5dcec02d5b45fb66c367e20ce30bd24262be [formerly 36717c7a3e]
Former-commit-id: cf74c74cc2
2012-04-25 17:08:21 -05:00
David Gillingham
102d8422bd Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61

Former-commit-id: 715dce7557 [formerly 30d5e0d2dd] [formerly bdbc16d31c] [formerly 58e7a0f310 [formerly bdbc16d31c [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]]
Former-commit-id: 58e7a0f310
Former-commit-id: ff55759d39974cfeacc3f63affe868b26ce230a0 [formerly 5850d4cfb1]
Former-commit-id: e8fdf9d48f
2012-04-19 17:10:08 -05:00
Bryan Kowal
562a5377f0 Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
Former-commit-id: dbcc538fa8 [formerly 72068507a9] [formerly b1561d67a0] [formerly b90b6f101e [formerly b1561d67a0 [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]]]
Former-commit-id: b90b6f101e
Former-commit-id: 8c618e7da663f49943d266edd03a91c9b60e6eb4 [formerly a9b51192d2]
Former-commit-id: 0514785b3a
2012-04-19 13:09:58 -05:00
Max Schenkelberg
937f4b6aa3 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 2e1507a1308f6373329e72eb1d9ccc52bd416fb3 [formerly 65c864aff2]
Former-commit-id: 51a826384e
2012-04-19 11:11:34 -05:00
Steve Harris
6aa0898aae 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: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]
Former-commit-id: e86dc647be
2012-04-19 11:11:02 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Richard Peter
a8ab19c6f2 Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
Former-commit-id: 2f351f13f7 [formerly 5bb20ff4a3] [formerly 709be7733b] [formerly be060f1b1c [formerly 709be7733b [formerly 2a3492987c4cd9751aad2c6e20230f983e68f4b5]]]
Former-commit-id: be060f1b1c
Former-commit-id: 17dcac1fcd432101a572e81e1a87d3a53a7d0082 [formerly 4a93a365bd]
Former-commit-id: 9c49c39669
2012-04-17 13:16:22 -05:00
Steve Harris
a4eb467a34 Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
	edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java

Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]
Former-commit-id: fee53dea94
Former-commit-id: 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]
Former-commit-id: 51bb9ebb46
2012-04-10 12:50:03 -05:00
Slav Korolev
c158df01f8 Issue #449. Fixed problem with simulated time for trend plots in FSS
monitors.

Former-commit-id: 273abf0ca5 [formerly bf5cf6a903] [formerly 8d29726365] [formerly f02da69ff5 [formerly 8d29726365 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]]]
Former-commit-id: f02da69ff5
Former-commit-id: 7c520a3f99ccdf1fa13ed92436ba78b85df449ea [formerly 47ba302180]
Former-commit-id: 45d4f9fb86
2012-04-09 14:50:19 -04:00
Bryan Kowal
b211dd30d2 Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort.
Former-commit-id: 1e2c3602c2 [formerly 898487c15c] [formerly 94b327d00f] [formerly 2386dd5890 [formerly 94b327d00f [formerly 1c18ec39ea8a1bf1867ee96d6a33a9c595951d1f]]]
Former-commit-id: 2386dd5890
Former-commit-id: 3b24d926ddb3ebbebc0f6748565aa093085dcc7c [formerly 5395b66d6e]
Former-commit-id: ee210d909f
2012-04-09 13:15:50 -05:00
Bryan Kowal
438e88cc58 Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.
Former-commit-id: 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]]
Former-commit-id: 839d7c886f
Former-commit-id: 52c4e4a8f476851151cdf69f82896ccf0b965430 [formerly 24148c19a9]
Former-commit-id: ab70749ea4
2012-04-09 09:32:45 -05:00
Bryan Kowal
0591ab00cc Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
Former-commit-id: 4d73e617c8 [formerly 21ff4bf657] [formerly f1e81b1a95] [formerly dcc3c7bb59 [formerly f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]]
Former-commit-id: dcc3c7bb59
Former-commit-id: d309520ea9fa039612c8a81873e58c06eedee69b [formerly 240c3a1806]
Former-commit-id: 774d05de1b
2012-04-09 09:19:02 -05:00
David Gillingham
c39ee5a3c0 Issue #435: Prevent NullPointerExceptions from being thrown when
serializing AirepRecords and NcAirepRecords.

Issue #435: Address peer review comments on previous change.

Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac

Former-commit-id: 3b47db9541 [formerly 5193184abf] [formerly 87142f9f4e] [formerly e0e57577ff [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]]
Former-commit-id: e0e57577ff
Former-commit-id: f9200a739ae6f82c440eea10738de05476856c19 [formerly 84f0765dba]
Former-commit-id: bef6e3d504
2012-04-05 15:49:23 -05:00
Bryan Kowal
f24e7a4d31 Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
Former-commit-id: 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]
Former-commit-id: 2ed20e107d
Former-commit-id: f64428b1eaf89e8c4b8fc84f44d88dfab230717f [formerly 5f4d6f600a]
Former-commit-id: edb7431d0a
2012-04-04 18:29:13 -05:00
David Gillingham
0fd14b8a0b Issue #435: Ensure associated HDF5 data is always captured when
archiving PDOs, alter binlightning so insert time is based on
system time like all other plugins.

Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2

Issue #435: Add comment to previous change as requested by peer review, fix binlightning insert time.

Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2

Former-commit-id: ae703513d7 [formerly c9d5823d2c] [formerly a9398fe4cd] [formerly e0e8e6d00a [formerly a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]]
Former-commit-id: e0e8e6d00a
Former-commit-id: 0f166301c2c892f4b1314f13084e1d03103fbf79 [formerly b4439bc5e8]
Former-commit-id: 4ff79099ac
2012-04-03 14:16:33 -05:00
Max Schenkelberg
ea7fcde242 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]
Former-commit-id: 07cf5069ba
Former-commit-id: bf3b4f5b4265812c5767225a4547be327787f7dd [formerly 993cac891e]
Former-commit-id: 4234b91d5b
2012-03-30 10:51:31 -05:00
Steve Harris
c6071e24c5 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: b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]
Former-commit-id: 9845ef53f9
2012-03-30 09:50:48 -05:00
Steve Harris
11e448aa39 12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]
Former-commit-id: 8bc60b1e32
2012-03-30 08:38:33 -05:00
Steve Harris
239813406d Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]
Former-commit-id: a0abcf8120
Former-commit-id: 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]
Former-commit-id: 65aa72fee7
2012-03-29 10:03:05 -05:00
Steve Harris
1bc33e26e6 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 770ccb1520 [formerly 94e6323c0a] [formerly 132d68acc6] [formerly 54a1d9cdbc [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]]
Former-commit-id: 54a1d9cdbc
Former-commit-id: 304f45749b88cc183853e0c60cef2ea2e8139d31 [formerly 4b853c56c6]
Former-commit-id: 2c3f9271bf
2012-03-29 10:01:55 -05:00
Max Schenkelberg
5fc757226e Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
descriptor than the actual descriptor as the descriptor is used purely
for convenience 

Former-commit-id: 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly f10f1a5319 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]
Former-commit-id: f10f1a5319
Former-commit-id: 6d1ea66ba9a1390c296443e20785aa9ef4a890fa [formerly ac11dd0c18]
Former-commit-id: bbab188fb9
2012-03-28 13:32:04 -05:00
Bryan Kowal
5009de761a Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 69e6f68295 [formerly 5ba68624c5] [formerly 8a4c883e0b] [formerly 31f989ecb4 [formerly 8a4c883e0b [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]]
Former-commit-id: 31f989ecb4
Former-commit-id: a23c215ea5b5c94cb670f657e0aafe5ca63f7dde [formerly 81a360d139]
Former-commit-id: e27502effd
2012-03-21 16:49:38 -05:00
Greg Armendariz
5a0a8b242e Merge "Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case." into 9-Wes2Bridge
Former-commit-id: f49e1f5e03 [formerly 9a0f313c23] [formerly 65b8521ccb] [formerly d45249fb2f [formerly 65b8521ccb [formerly 866c197c927445c1572fd19da1ebd3c8dee46d97]]]
Former-commit-id: d45249fb2f
Former-commit-id: 0ce00cf1a62830ded14e3abd22f133c7ff516662 [formerly f5c96c4af2]
Former-commit-id: bf867f91d3
2012-03-17 10:35:17 -05:00
Bryan Kowal
5eaec7c5eb Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case.
Former-commit-id: dd9c964943 [formerly 97cb8ab51c] [formerly 55a759fb8a] [formerly 64cdd27f62 [formerly 55a759fb8a [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]]
Former-commit-id: 64cdd27f62
Former-commit-id: 4d0abefebcd64ca578719d844b51d428715ea13d [formerly 117306c734]
Former-commit-id: 3914878a65
2012-03-16 12:16:48 -05:00
Max Schenkelberg
13f08a98a9 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
case of "NO DATA"

Former-commit-id: a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly b9085db25d [formerly cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]
Former-commit-id: b9085db25d
Former-commit-id: 46b9ad1c87f0e0eaf7fe167226e5b9dfa00844ed [formerly 954073b38c]
Former-commit-id: 81bc45f071
2012-03-16 10:13:31 -05:00
Max Schenkelberg
712815ee18 Issue #358 Fixed sampling issue with mosaic resource with best
res resources

Former-commit-id: 1b8beb3f8d [formerly 97edff9f7c] [formerly cc111ab9ac] [formerly 258d57e825 [formerly cc111ab9ac [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 258d57e825
Former-commit-id: 6ca4a7d453c44b2e3a855ba1e88fd28485927549 [formerly 1e5c074e3b]
Former-commit-id: 4e81d2432c
2012-03-16 09:03:50 -05:00
Max Schenkelberg
f51a9e5571 Issue #358 Fixed painting and sampling regression in radar mosaic due to
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: 732c2ddb5c [formerly 10b720381b] [formerly 719f87c261] [formerly 556a270a09 [formerly 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: c943e46db5cb54b3fb026d1fe63057721df3c99d [formerly ba8af4dcc1]
Former-commit-id: a4b859ae54
2012-03-14 18:03:44 -05:00
David Gillingham
d1bf70a7be Issue #20: Don't throw an exception if overriding a lower-localization
level's configuration (like overriding BASE's default plugin
configuration).

Former-commit-id: a1ac93704b [formerly e33083c11a] [formerly 13af9170b1] [formerly ed74b90589 [formerly 13af9170b1 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]]
Former-commit-id: ed74b90589
Former-commit-id: 0292153c8495403a4ef38c31d54a54c78f7b0db8 [formerly 5dac19bde9]
Former-commit-id: 558c69401d
2012-03-14 15:07:59 -05:00
Max Schenkelberg
458f5970aa 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: 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]
Former-commit-id: 8f08fab0a7
2012-03-14 09:49:32 -05:00
David Gillingham
9cc2c09ae5 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 0328fbf92c7293da9871a341342665168164a9a2 [formerly 2b5588bd1e]
Former-commit-id: 3c4e90e0bf
2012-03-13 12:31:38 -05:00
Steve Harris
4d58cdca1b Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]
Former-commit-id: 10dc140747
Former-commit-id: 80cb0b251d26c0d96f2c7ee6601e3e0f30708bf4 [formerly 7bdde9f690]
Former-commit-id: 7fc8cf3d94
2012-03-12 13:10:34 -05:00
Bryan Kowal
474e2fae6d 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: 08451e8a63 [formerly eab9c845bb] [formerly 58bfa62981] [formerly 66e05f4c96 [formerly 58bfa62981 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]]
Former-commit-id: 66e05f4c96
Former-commit-id: 94a80f914d91af133eceacc5f6694a2db505051c [formerly 3b97383354]
Former-commit-id: 64a7f1db84
2012-03-12 11:43:34 -05:00
Max Schenkelberg
8b6aa63464 Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060]
Former-commit-id: f78b932abb
2012-03-09 12:31:50 -06:00
Bryan Kowal
3e1e672233 Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: 6322415535 [formerly 5838ff71f1] [formerly fc1ca4efcc] [formerly b871752e3a [formerly fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]
Former-commit-id: b871752e3a
Former-commit-id: 3df9a673b587901bb723b61fae9fe68a607983cf [formerly 638d2c964b]
Former-commit-id: d04bc82c9a
2012-03-08 09:00:55 -06:00
David Gillingham
038b850981 Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: d3fcc3bc54 [formerly 15a9e7cdae] [formerly 90a745a037] [formerly 78c7f29096 [formerly 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]
Former-commit-id: 78c7f29096
Former-commit-id: f703d811132f818c9f224c92beac74aea6d8f0ec [formerly 8a86e910aa]
Former-commit-id: 5e2b3c3955
2012-03-07 16:05:54 -06:00
Bryan Kowal
6a3ecc4a79 Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git.
Former-commit-id: bdb4777017 [formerly d4142689c9] [formerly 4d8d3d4d00] [formerly c803afd454 [formerly 4d8d3d4d00 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]]
Former-commit-id: c803afd454
Former-commit-id: c9f4c7e859d1fac6dc6d9e694a3d0b274cf87b59 [formerly 033a4e237b]
Former-commit-id: f046b941ba
2012-03-07 10:22:40 -06:00
David Gillingham
ad170c7b51 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: d3d2046df0 [formerly efc9e9000b] [formerly 9a75c87829] [formerly 3cfa029f4b [formerly 9a75c87829 [formerly 679996850315f699d47633da5baf593c72ba7927]]]
Former-commit-id: 3cfa029f4b
Former-commit-id: 40b8cde016ba8c02a3df6cf49704fcd4f543df58 [formerly 1818e488c5]
Former-commit-id: 882544b165
2012-03-06 16:24:58 -06:00
David Gillingham
8bf167bc15 Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: b8acb1912c [formerly 8d2ea4cfba] [formerly ff231f33f4] [formerly 1d69867594 [formerly ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]]
Former-commit-id: 1d69867594
Former-commit-id: 2c7dd92ec610e80343c37fb794682b682556ef19 [formerly 8c0b121cbc]
Former-commit-id: 000ca27db9
2012-03-05 16:49:23 -06:00
Bryan Kowal
b0fc22d8ca Issue #20 - additional new svn changes that have not been merged yet:
http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1

Former-commit-id: 3bd189df23 [formerly ed81095573] [formerly bea56356fd] [formerly 00759729a4 [formerly bea56356fd [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]]
Former-commit-id: 00759729a4
Former-commit-id: 418be3166347d739bc1c5f3e7660655a0b29b88f [formerly 1fda54a89b]
Former-commit-id: 0b690e438c
2012-03-05 14:36:56 -06:00
Bryan Kowal
5385cfa2bf Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 3341371f4b [formerly 6e8b4a188f] [formerly 5228de77e2] [formerly 793dad5711 [formerly 5228de77e2 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]]
Former-commit-id: 793dad5711
Former-commit-id: f6188b475a4ee0356d290aacf6a0bbdd5148fa7d [formerly 81f778e43a]
Former-commit-id: 1585b4b827
2012-03-05 13:46:10 -06:00
David Gillingham
e0987cc993 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43]
Former-commit-id: 29f03b0d2a
2012-03-05 11:23:11 -06:00