Commit graph

91 commits

Author SHA1 Message Date
Steve Harris
cf3c768213 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: 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]
Former-commit-id: d325d496f5
2012-06-11 15:24:03 -05:00
Steve Harris
676ea3192f 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: 3904c4ccf5
2012-06-08 13:39:48 -05:00
David Gillingham
6efe780ad6 Issue #647: Ensure insert time is updated when processing backdated
redbook data, address peer review comment.

Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e

Former-commit-id: 09dcd35e4a [formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]
Former-commit-id: db75f1860b
2012-05-24 14:54:17 -05:00
David Gillingham
9dabcca4f8 Issue #647: Ensure records with the same data URI get archived only
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.

Former-commit-id: 95e1582a22 [formerly 0692f9923e450c9b7e62b044b122aad7323991ba]
Former-commit-id: 34303477ac
2012-05-23 15:49:49 -05:00
David Gillingham
f5fe7e6be7 Issue #649: Make compression of archived Java objects optional.
Former-commit-id: 05a58dadf1 [formerly 289955cec3396a6f7eae2b3d24dc91ec5beca46a]
Former-commit-id: 28bdf26f2e
2012-05-21 16:48:02 -05:00
David Gillingham
8d877d7784 Issue #646: Fix NullPointerException when decoding Level3 radar products
introduced by previous change.

Change-Id: I3689e003e367be2b69033f13f1744c381d597616

Former-commit-id: 94a4cbd107 [formerly 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4]
Former-commit-id: 7c84c67c67
2012-05-21 13:10:10 -05:00
David Gillingham
ea06b163b9 Issue #646: Ensure radar obs use TimeTools to set reftime.
Former-commit-id: 4f9061fcea [formerly c6c83792c753be9c248e951462830983d5a3ee2e]
Former-commit-id: 091e0325ea
2012-05-18 16:31:16 -05:00
David Gillingham
2a3b400c3c Issue #643: Fix regression to ProfilerObs.setPointDataView() from issue
538.

Former-commit-id: 3b1ab25b17 [formerly 353ea05b777d0a239101132abf4c869b75243b6e]
Former-commit-id: 49fe4c42a6
2012-05-18 10:49:01 -05:00
Ron Anderson
3018275239 Issue #502 Fix staticTopo notifications
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1

Former-commit-id: 902bde0f2d [formerly 7c36219cded6a5cbbaebef2dbcfa6f2901a44373]
Former-commit-id: cd0fd140ad
2012-05-11 10:06:29 -05:00
Benjamin Phillippe
acf8c7290f Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9

Former-commit-id: bd0e56daaf [formerly b50cd41ca70ab2e69de1d440991e0218f70395c8]
Former-commit-id: 16f7fbe9cb
2012-05-11 10:06:18 -05:00
Richard Peter
33c7d4cb87 Issue #502: Update grib/gfe thread/memory usage for grib notification route
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36

Former-commit-id: e431671ff2 [formerly a4450314db26948d531ecf80ec1455895cdb81ac]
Former-commit-id: 150d16b24e
2012-05-11 10:06:04 -05:00
Steve Harris
98447412f8 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: 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]
Former-commit-id: 31b3e87ffa
2012-05-09 13:19:47 -05:00
Steve Harris
6dd3ee8809 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 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]
Former-commit-id: 7b75b781ad
2012-05-01 18:31:09 -05:00
Steve Harris
a28d70b5c5 12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 8485b90ff8
2012-05-01 18:06:13 -05:00
Dave Hladky
61e31c62ff Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.

Former-commit-id: 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]
Former-commit-id: 5b7ecea866
2012-04-30 13:43:34 -05:00
David Gillingham
a1a62aa8f1 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: 4aadd41fde [formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]
Former-commit-id: 9878793618
2012-04-27 13:26:37 -05:00
David Gillingham
6f40ba77f1 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: c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]
Former-commit-id: 292374ce21
2012-04-27 12:43:04 -05:00
Richard Peter
e3323febc5 Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]
Former-commit-id: b11df888d3
2012-04-27 12:08:29 -05:00
David Gillingham
36717c7a3e Issue #473: Properly archive text plugin records,
fix bugs in DatabaseArchiver.determineStartTime().

Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f

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

Former-commit-id: bdbc16d31c [formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]
Former-commit-id: 58e7a0f310
2012-04-19 17:10:08 -05:00
Bryan Kowal
a9b51192d2 Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
Former-commit-id: b1561d67a0 [formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]
Former-commit-id: b90b6f101e
2012-04-19 13:09:58 -05:00
Steve Harris
def458753d 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 5e1b9319941eed516a08a135a2049c14bad77863]
Former-commit-id: 625cd4262c
2012-04-19 11:11:02 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
2012-04-18 15:18:16 -05:00
Steve Harris
dcdd7f0648 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: ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]
Former-commit-id: fee53dea94
2012-04-10 12:50:03 -05:00
Bryan Kowal
24148c19a9 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: 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]
Former-commit-id: 839d7c886f
2012-04-09 09:32:45 -05:00
Bryan Kowal
240c3a1806 Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
Former-commit-id: f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]
Former-commit-id: dcc3c7bb59
2012-04-09 09:19:02 -05:00
David Gillingham
84f0765dba 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: 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]
Former-commit-id: e0e57577ff
2012-04-05 15:49:23 -05:00
Bryan Kowal
5f4d6f600a 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: e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]
Former-commit-id: 2ed20e107d
2012-04-04 18:29:13 -05:00
David Gillingham
b4439bc5e8 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: a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]
Former-commit-id: e0e8e6d00a
2012-04-03 14:16:33 -05:00
Steve Harris
6aa18f74f6 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 879a2e0a4a31999bf4d624ff59e77bbd68195458]
Former-commit-id: 5cdda77afb
2012-03-30 09:50:48 -05:00
Steve Harris
ce3b74c605 12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 22bd792cd9
2012-03-30 08:38:33 -05:00
Steve Harris
6884520750 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]
Former-commit-id: a0abcf8120
2012-03-29 10:03:05 -05:00
Steve Harris
4b853c56c6 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]
Former-commit-id: 54a1d9cdbc
2012-03-29 10:01:55 -05:00
David Gillingham
5dac19bde9 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: 13af9170b1 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]
Former-commit-id: ed74b90589
2012-03-14 15:07:59 -05:00
Max Schenkelberg
cf440b3884 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 7e4abe637edacca71e1e1c98d99521cd33415fb0]
Former-commit-id: 50765e8a34
2012-03-14 09:49:32 -05:00
David Gillingham
2b5588bd1e Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]
Former-commit-id: d433b7d4d6
2012-03-13 12:31:38 -05:00
Steve Harris
7bdde9f690 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]
Former-commit-id: 10dc140747
2012-03-12 13:10:34 -05:00
Bryan Kowal
3b97383354 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 eaa45d7123c43590be3d58fdf845708ade2dbb51]
Former-commit-id: 66e05f4c96
2012-03-12 11:43:34 -05:00
David Gillingham
1818e488c5 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 679996850315f699d47633da5baf593c72ba7927]
Former-commit-id: 3cfa029f4b
2012-03-06 16:24:58 -06:00
David Gillingham
8c0b121cbc Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: ff231f33f4 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]
Former-commit-id: 1d69867594
2012-03-05 16:49:23 -06:00
Bryan Kowal
1fda54a89b 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: bea56356fd [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]
Former-commit-id: 00759729a4
2012-03-05 14:36:56 -06:00
Max Schenkelberg
e27d36432a Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 0cf00cb7f4 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]
Former-commit-id: 76e7a02f76
2012-03-02 13:26:44 -06:00
Max Schenkelberg
e4914cbe89 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

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

Former-commit-id: ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]
Former-commit-id: 48b6d45f00
2012-03-01 16:59:40 -06:00
Steve Harris
db45babec8 Merge branch 'ss_sync' into sync_test
Former-commit-id: 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]
Former-commit-id: 787aed90f8
2012-03-01 14:01:16 -06:00
David Gillingham
953f8a6535 Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().

Former-commit-id: c6803ba434 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]
Former-commit-id: 8a45f1f4c3
2012-03-01 11:19:22 -06:00
Ben Steffensmeier
84e6c9beb8 Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]
Former-commit-id: c61e40c426
2012-02-29 15:49:47 -06:00
Steve Harris
40d7357165 Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]
Former-commit-id: e5b56c99ab
2012-02-27 15:58:49 -06:00
David Gillingham
88dcd4d09d 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 67aaf1c21e8372b4a84cb82cae62549502992651]
Former-commit-id: 85998bc654
2012-02-23 13:23:59 -06:00
Steve Harris
3d511fe719 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 5528a1374781f3a4d55702ae1f0c34efcf1e3865]
Former-commit-id: 7a10ca9766
2012-02-23 10:06:18 -06:00