Commit graph

245 commits

Author SHA1 Message Date
Steve Harris
37793c86b1 Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
	cots/org.jboss.cache/.project
	edexOsgi/build.edex/esb/conf/spring/project.properties
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
	edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
	javaUtilities/com.raytheon.wes2bridge.utility.product/.project
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
	ncep/gov.noaa.nws.ncep.common.staticdata/.project

Former-commit-id: a435e6464a78345b5036e3060430375dc53e4faf
2012-06-11 15:24:03 -05:00
Steve Harris
b13cbb7e00 12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Bryan Kowal
b8622629e3 Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.
Former-commit-id: 478e494673d498121cab732717f3fc399a0b0c03
2012-06-05 16:55:52 -05:00
David Gillingham
09dcd35e4a Issue #647: Ensure insert time is updated when processing backdated
redbook data, address peer review comment.

Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e

Former-commit-id: 66acc08555383a5888864e58fd5fe2d7625ee87c
2012-05-24 14:54:17 -05:00
David Gillingham
95e1582a22 Issue #647: Ensure records with the same data URI get archived only
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.

Former-commit-id: 0692f9923e450c9b7e62b044b122aad7323991ba
2012-05-23 15:49:49 -05:00
David Gillingham
05a58dadf1 Issue #649: Make compression of archived Java objects optional.
Former-commit-id: 289955cec3396a6f7eae2b3d24dc91ec5beca46a
2012-05-21 16:48:02 -05:00
David Gillingham
94a4cbd107 Issue #646: Fix NullPointerException when decoding Level3 radar products
introduced by previous change.

Change-Id: I3689e003e367be2b69033f13f1744c381d597616

Former-commit-id: 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4
2012-05-21 13:10:10 -05:00
David Gillingham
4f9061fcea Issue #646: Ensure radar obs use TimeTools to set reftime.
Former-commit-id: c6c83792c753be9c248e951462830983d5a3ee2e
2012-05-18 16:31:16 -05:00
David Gillingham
3b1ab25b17 Issue #643: Fix regression to ProfilerObs.setPointDataView() from issue
538.

Former-commit-id: 353ea05b777d0a239101132abf4c869b75243b6e
2012-05-18 10:49:01 -05:00
Ron Anderson
902bde0f2d Issue #502 Fix staticTopo notifications
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1

Former-commit-id: 7c36219cded6a5cbbaebef2dbcfa6f2901a44373
2012-05-11 10:06:29 -05:00
Benjamin Phillippe
bd0e56daaf Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9

Former-commit-id: b50cd41ca70ab2e69de1d440991e0218f70395c8
2012-05-11 10:06:18 -05:00
Richard Peter
e431671ff2 Issue #502: Update grib/gfe thread/memory usage for grib notification route
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36

Former-commit-id: a4450314db26948d531ecf80ec1455895cdb81ac
2012-05-11 10:06:04 -05:00
Steve Harris
092efd6072 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: f98354aae305ad227eaf3b36e4393b8aefc80f02
2012-05-09 13:19:47 -05:00
Max Schenkelberg
3fe183277b Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e8846fa2b5aa1ef2972f134a683246bc275a8067
2012-05-01 18:36:09 -05:00
Steve Harris
2ed7249613 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
9f8cb727a5 12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Dave Hladky
1b7473572f Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.

Former-commit-id: 647b7ac154dbdaf945231b231f491bbca86d2a24
2012-04-30 13:43:34 -05:00
David Gillingham
4aadd41fde 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: ecf5dd0d62b834c4eba370857441cbda4ce21683
2012-04-27 13:26:37 -05:00
David Gillingham
c28bfaddee 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: fe6ec52b4cf64d410f3de609b06cf9666a5936bc
2012-04-27 12:43:04 -05:00
Richard Peter
349adaeedd Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0
2012-04-27 12:08:29 -05:00
David Gillingham
526abfd36e Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().

Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f

Former-commit-id: 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e
2012-04-25 17:08:21 -05:00
David Gillingham
bdbc16d31c Issue #473: Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61

Former-commit-id: d3681dc1ed59d0f85b7de44277c52907d242aa29
2012-04-19 17:10:08 -05:00
Bryan Kowal
b1561d67a0 Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
Former-commit-id: 28f2145d82ce3030cebfb0a14aa8457fee992e13
2012-04-19 13:09:58 -05:00
Max Schenkelberg
1294fa0ca1 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: bd93246cccd1b123598006d7343eac265392695d
2012-04-19 11:11:34 -05:00
Steve Harris
4d7572a632 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
67a5a68300 12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Richard Peter
709be7733b Merge "Issue #449. Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
Former-commit-id: 2a3492987c4cd9751aad2c6e20230f983e68f4b5
2012-04-17 13:16:22 -05:00
Steve Harris
ed26e06df2 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: 3bd9b3a16b0105822983302efa5dd2834aaf5a5f
2012-04-10 12:50:03 -05:00
Slav Korolev
8d29726365 Issue #449. Fixed problem with simulated time for trend plots in FSS
monitors.

Former-commit-id: 79b81f2a734142d212d7bc0ad3686c7b64f433c5
2012-04-09 14:50:19 -04:00
Bryan Kowal
94b327d00f Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort.
Former-commit-id: 1c18ec39ea8a1bf1867ee96d6a33a9c595951d1f
2012-04-09 13:15:50 -05:00
Bryan Kowal
1afa927c33 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: f11953c494fac20b2ad53b41069cfcb24281eb4a
2012-04-09 09:32:45 -05:00
Bryan Kowal
f1e81b1a95 Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
Former-commit-id: f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6
2012-04-09 09:19:02 -05:00
David Gillingham
87142f9f4e 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: d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43
2012-04-05 15:49:23 -05:00
Bryan Kowal
e792b2a16f 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: 6b206773eff05abf20ecc87b27e96c47b67ba600
2012-04-04 18:29:13 -05:00
David Gillingham
a9398fe4cd 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: cefe2475f239ccd73b72f74f8571c8eee13267f0
2012-04-03 14:16:33 -05:00
Max Schenkelberg
9b0d01f8b5 Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885
2012-03-30 10:51:31 -05:00
Steve Harris
d3ad6095b7 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
4068f5295f 12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
Steve Harris
70357d90bc Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: e68338cecbe85a62835633e9aba0925344fb80f1
2012-03-29 10:03:05 -05:00
Steve Harris
132d68acc6 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
15a9245592 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: 265ccb3e22aa0122dbd74e83d0af202596c1941c
2012-03-28 13:32:04 -05:00
Bryan Kowal
8a4c883e0b Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: efc134f920b0cc0e493d74f1bb14b22fdc8013ca
2012-03-21 16:49:38 -05:00
Greg Armendariz
65b8521ccb 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: 866c197c927445c1572fd19da1ebd3c8dee46d97
2012-03-17 10:35:17 -05:00
Bryan Kowal
55a759fb8a 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: 47807beb71c03e26cbe4fa78bf9cdb0811a51042
2012-03-16 12:16:48 -05:00
Max Schenkelberg
cd6ebd80d4 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
case of "NO DATA"

Former-commit-id: 89521a4df36d18ecb64b4cce248f150f0a0e4957
2012-03-16 10:13:31 -05:00
Max Schenkelberg
cc111ab9ac Issue #358 Fixed sampling issue with mosaic resource with best
res resources

Former-commit-id: 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0
2012-03-16 09:03:50 -05:00
Max Schenkelberg
719f87c261 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: f739d79bfd547adc295c716a1804f55f09b1bde1
2012-03-14 18:03:44 -05:00
David Gillingham
13af9170b1 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: b585768a8c7e3f42742efe5128ec6cb05c6424bf
2012-03-14 15:07:59 -05:00
Max Schenkelberg
6e5964df9d 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
e13850a2b6 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: 727e2b19688397ea4608a2b6ca3fda3222b6ad36
2012-03-13 12:31:38 -05:00