Ron Anderson
72ee9f490d
Issue #502 Fix staticTopo notifications
...
Change-Id: Ib1003426ab9e0c17325da425fbf1602e93983ed1
Former-commit-id: 5461b92346
[formerly 902bde0f2d
] [formerly cd0fd140ad
[formerly 7c36219cded6a5cbbaebef2dbcfa6f2901a44373]]
Former-commit-id: cd0fd140ad
Former-commit-id: 3018275239
2012-05-11 10:06:29 -05:00
Benjamin Phillippe
953f50718c
Issue #502 Eliminated call to database to alleviate performance bottleneck in GfeIngestNotificationFilter
...
Change-Id: I8b2b250323c7caafcf357e3101b9ac4802b6b2c9
Former-commit-id: 272323baa6
[formerly bd0e56daaf
] [formerly 16f7fbe9cb
[formerly b50cd41ca70ab2e69de1d440991e0218f70395c8]]
Former-commit-id: 16f7fbe9cb
Former-commit-id: acf8c7290f
2012-05-11 10:06:18 -05:00
Richard Peter
fe6dc2652c
Issue #502 : Update grib/gfe thread/memory usage for grib notification route
...
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36
Former-commit-id: 7b14c9499a
[formerly e431671ff2
] [formerly 150d16b24e
[formerly a4450314db26948d531ecf80ec1455895cdb81ac]]
Former-commit-id: 150d16b24e
Former-commit-id: 33c7d4cb87
2012-05-11 10:06:04 -05:00
Steve Harris
53d2822329
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: d7f7c26582
[formerly 092efd6072
] [formerly 31b3e87ffa
[formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
2012-05-09 13:19:47 -05:00
Steve Harris
7c7fc97131
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: 4ec294b525
[formerly 2ed7249613
] [formerly 7b75b781ad
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 7b75b781ad
Former-commit-id: 6dd3ee8809
2012-05-01 18:31:09 -05:00
Steve Harris
33a67cdd82
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Dave Hladky
a1a3a361dd
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 42a12fa7a5
[formerly 1b7473572f
] [formerly 5b7ecea866
[formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]
Former-commit-id: 5b7ecea866
Former-commit-id: 61e31c62ff
2012-04-30 13:43:34 -05:00
David Gillingham
8c4eda7ae7
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: 0ff2041959
[formerly 4aadd41fde
] [formerly 9878793618
[formerly ecf5dd0d62b834c4eba370857441cbda4ce21683]]
Former-commit-id: 9878793618
Former-commit-id: a1a62aa8f1
2012-04-27 13:26:37 -05:00
David Gillingham
1107eac65d
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: 6497272c1d
[formerly c28bfaddee
] [formerly 292374ce21
[formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]
Former-commit-id: 292374ce21
Former-commit-id: 6f40ba77f1
2012-04-27 12:43:04 -05:00
Richard Peter
ae35c2f27c
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: c33a392a8c
[formerly 349adaeedd
] [formerly b11df888d3
[formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]
Former-commit-id: b11df888d3
Former-commit-id: e3323febc5
2012-04-27 12:08:29 -05:00
David Gillingham
cf74c74cc2
Issue #473 : Properly archive text plugin records,
...
fix bugs in DatabaseArchiver.determineStartTime().
Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f
Former-commit-id: 8592a9a50d
[formerly 526abfd36e
] [formerly 04ab5d619b
[formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]]
Former-commit-id: 04ab5d619b
Former-commit-id: 36717c7a3e
2012-04-25 17:08:21 -05:00
David Gillingham
e8fdf9d48f
Issue #473 : Fix CWA and TCS plugin's decoders to use ingest file name for datatime.
...
Change-Id: I54bbf7f1562ff48617721f6d88ef536c0afd7b61
Former-commit-id: 30d5e0d2dd
[formerly bdbc16d31c
] [formerly 58e7a0f310
[formerly d3681dc1ed59d0f85b7de44277c52907d242aa29]]
Former-commit-id: 58e7a0f310
Former-commit-id: 5850d4cfb1
2012-04-19 17:10:08 -05:00
Bryan Kowal
0514785b3a
Issue #501 - eliminated (duplicate statements) unreachable code to fix the Wes2Bridge build.
...
Former-commit-id: 72068507a9
[formerly b1561d67a0
] [formerly b90b6f101e
[formerly 28f2145d82ce3030cebfb0a14aa8457fee992e13]]
Former-commit-id: b90b6f101e
Former-commit-id: a9b51192d2
2012-04-19 13:09:58 -05:00
Steve Harris
e86dc647be
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: 63f11892e8
[formerly 4d7572a632
] [formerly 625cd4262c
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 625cd4262c
Former-commit-id: def458753d
2012-04-19 11:11:02 -05:00
Steve Harris
a2a6a18fae
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Steve Harris
51bb9ebb46
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: c90ce9d54e
[formerly ed26e06df2
] [formerly fee53dea94
[formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]
Former-commit-id: fee53dea94
Former-commit-id: dcdd7f0648
2012-04-10 12:50:03 -05:00
Bryan Kowal
ab70749ea4
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: f49aadd9c8
[formerly 1afa927c33
] [formerly 839d7c886f
[formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]
Former-commit-id: 839d7c886f
Former-commit-id: 24148c19a9
2012-04-09 09:32:45 -05:00
Bryan Kowal
774d05de1b
Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge
...
Former-commit-id: 21ff4bf657
[formerly f1e81b1a95
] [formerly dcc3c7bb59
[formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]
Former-commit-id: dcc3c7bb59
Former-commit-id: 240c3a1806
2012-04-09 09:19:02 -05:00
David Gillingham
bef6e3d504
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: 5193184abf
[formerly 87142f9f4e
] [formerly e0e57577ff
[formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]
Former-commit-id: e0e57577ff
Former-commit-id: 84f0765dba
2012-04-05 15:49:23 -05:00
Bryan Kowal
edb7431d0a
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: 3e039dc79f
[formerly e792b2a16f
] [formerly 2ed20e107d
[formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]
Former-commit-id: 2ed20e107d
Former-commit-id: 5f4d6f600a
2012-04-04 18:29:13 -05:00
David Gillingham
4ff79099ac
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: c9d5823d2c
[formerly a9398fe4cd
] [formerly e0e8e6d00a
[formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]
Former-commit-id: e0e8e6d00a
Former-commit-id: b4439bc5e8
2012-04-03 14:16:33 -05:00
Steve Harris
9845ef53f9
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: a4e4792bb5
[formerly d3ad6095b7
] [formerly 5cdda77afb
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: 5cdda77afb
Former-commit-id: 6aa18f74f6
2012-03-30 09:50:48 -05:00
Steve Harris
8bc60b1e32
12.3.1-10 baseline
...
Former-commit-id: 0e4128712b
[formerly 4068f5295f
] [formerly 22bd792cd9
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
65aa72fee7
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 0665862abe
[formerly 70357d90bc
] [formerly a0abcf8120
[formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: a0abcf8120
Former-commit-id: 6884520750
2012-03-29 10:03:05 -05:00
Steve Harris
2c3f9271bf
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 94e6323c0a
[formerly 132d68acc6
] [formerly 54a1d9cdbc
[formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]
Former-commit-id: 54a1d9cdbc
Former-commit-id: 4b853c56c6
2012-03-29 10:01:55 -05:00
David Gillingham
558c69401d
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: e33083c11a
[formerly 13af9170b1
] [formerly ed74b90589
[formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]
Former-commit-id: ed74b90589
Former-commit-id: 5dac19bde9
2012-03-14 15:07:59 -05:00
Max Schenkelberg
8f08fab0a7
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: 8fb7eccb73
[formerly 6e5964df9d
] [formerly 50765e8a34
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]
Former-commit-id: 50765e8a34
Former-commit-id: cf440b3884
2012-03-14 09:49:32 -05:00
David Gillingham
3c4e90e0bf
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: 7e5ec12276
[formerly e13850a2b6
] [formerly d433b7d4d6
[formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]
Former-commit-id: d433b7d4d6
Former-commit-id: 2b5588bd1e
2012-03-13 12:31:38 -05:00
Steve Harris
7fc8cf3d94
Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
...
Former-commit-id: 6d2af585b1
[formerly 5bbf80a384
] [formerly 10dc140747
[formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]
Former-commit-id: 10dc140747
Former-commit-id: 7bdde9f690
2012-03-12 13:10:34 -05:00
Bryan Kowal
64a7f1db84
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: eab9c845bb
[formerly 58bfa62981
] [formerly 66e05f4c96
[formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]
Former-commit-id: 66e05f4c96
Former-commit-id: 3b97383354
2012-03-12 11:43:34 -05:00
David Gillingham
882544b165
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: efc9e9000b
[formerly 9a75c87829
] [formerly 3cfa029f4b
[formerly 679996850315f699d47633da5baf593c72ba7927]]
Former-commit-id: 3cfa029f4b
Former-commit-id: 1818e488c5
2012-03-06 16:24:58 -06:00
David Gillingham
000ca27db9
Issue #361 : Refactor IscDataRecRequest handler to execute iscDataRec
...
asynchronously.
Former-commit-id: 8d2ea4cfba
[formerly ff231f33f4
] [formerly 1d69867594
[formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]
Former-commit-id: 1d69867594
Former-commit-id: 8c0b121cbc
2012-03-05 16:49:23 -06:00
Bryan Kowal
0b690e438c
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: ed81095573
[formerly bea56356fd
] [formerly 00759729a4
[formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]
Former-commit-id: 00759729a4
Former-commit-id: 1fda54a89b
2012-03-05 14:36:56 -06:00
Max Schenkelberg
b23dc95d40
Issue #358 merged esb.camel project for plot update compatibility
...
Former-commit-id: 225dfd15be
[formerly 0cf00cb7f4
] [formerly 76e7a02f76
[formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]
Former-commit-id: 76e7a02f76
Former-commit-id: e27d36432a
2012-03-02 13:26:44 -06:00
Max Schenkelberg
79365f1f62
Issue #358 merged dataURI changes from thinclient in for plot
...
compatibility
Former-commit-id: 4d91a4fd74
[formerly f96ff96259
] [formerly 1f714b1a5b
[formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]
Former-commit-id: 1f714b1a5b
Former-commit-id: e4914cbe89
2012-03-02 12:24:19 -06:00
Max Schenkelberg
0554abdde0
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: e2cd95d3f4
[formerly ae47d9683e
] [formerly 48b6d45f00
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]
Former-commit-id: 48b6d45f00
Former-commit-id: 3212cc6ebb
2012-03-01 16:59:40 -06:00
Steve Harris
b3f831a7b4
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 3b9c3e3474
[formerly 951ecfe3dd
] [formerly 787aed90f8
[formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]
Former-commit-id: 787aed90f8
Former-commit-id: db45babec8
2012-03-01 14:01:16 -06:00
David Gillingham
234801c998
Issue #20 : Fix breakage to alertViz caused by changes to
...
FileUtil.join().
Former-commit-id: 6a2b7e12d6
[formerly c6803ba434
] [formerly 8a45f1f4c3
[formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]
Former-commit-id: 8a45f1f4c3
Former-commit-id: 953f8a6535
2012-03-01 11:19:22 -06:00
Ben Steffensmeier
390700efb0
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 56d97c95d5
[formerly 5c303ed189
] [formerly c61e40c426
[formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]
Former-commit-id: c61e40c426
Former-commit-id: 84e6c9beb8
2012-02-29 15:49:47 -06:00
Steve Harris
73a337bc31
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: 24059a5b4e
[formerly 9b67525e95
] [formerly e5b56c99ab
[formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: e5b56c99ab
Former-commit-id: 40d7357165
2012-02-27 15:58:49 -06:00
David Gillingham
9ff631305a
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 5a8ba0f0fb
[formerly 32b2c06988
] [formerly 85998bc654
[formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]
Former-commit-id: 85998bc654
Former-commit-id: 88dcd4d09d
2012-02-23 13:23:59 -06:00
Steve Harris
92b7072b82
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: 92084b3f20
[formerly d0bbbfefcc
] [formerly 7a10ca9766
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: 7a10ca9766
Former-commit-id: 3d511fe719
2012-02-23 10:06:18 -06:00
Steve Harris
b55a488ed8
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 8da36046de
[formerly c8aae98741
] [formerly 54be9660f1
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
610fdf3f4e
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 85075e6107
[formerly 94c2ea985b
] [formerly 9995d22e25
[formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
dd3a5a8d88
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: ec0f1aebfc
[formerly b89ebc5e01
] [formerly 496cc6a06b
[formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: 496cc6a06b
Former-commit-id: 4a93298877
2012-02-20 16:38:06 -06:00
Steve Harris
dd911bed4d
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: c268da57bc
[formerly 4b76d22f77
] [formerly cc66c8be24
[formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: cc66c8be24
Former-commit-id: 54b5b6baef
2012-02-20 12:43:38 -06:00
Bryan Kowal
cc8c6597a2
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 5754f9dfd8
[formerly 10a0ca252d
] [formerly 682c10767d
[formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
2012-02-17 12:17:14 -06:00
Bryan Kowal
8a71854fe1
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: d4b76c1057
[formerly 4276fc2fe8
] [formerly 9f1b7a613a
[formerly 1ec51accade835c1133eac9222131f9186985053]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 38ccaf882b
2012-02-17 11:09:13 -06:00
Steve Harris
1ac6b36d1f
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: c209d6de36
[formerly 93f6535bd8
] [formerly b137302802
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
2012-02-17 10:55:02 -06:00
Steve Harris
de85613a99
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 6aed9311a8
[formerly 7356d655da
] [formerly 1707b98721
[formerly f3bac368dacad47036f9823243379fe6ed1d4869]]
Former-commit-id: 1707b98721
Former-commit-id: db1e3b1215
2012-02-15 14:34:47 -06:00