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: 092efd607231b3e87ffa
2012-05-09 13:19:47 -05:00
Max Schenkelberg
878de45ee6
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 3fe183277be3d6962fe6
2012-05-01 18:36:09 -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: 2ed72496137b75b781ad
2012-05-01 18:31:09 -05:00
Steve Harris
a28d70b5c5
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a58485b90ff8
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: 1b7473572f5b7ecea866
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: 4aadd41fde9878793618
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: c28bfaddee292374ce21
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: 349adaeeddb11df888d3
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: 526abfd36e04ab5d619b
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: bdbc16d31c58e7a0f310
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: b1561d67a0b90b6f101e
2012-04-19 13:09:58 -05:00
Max Schenkelberg
65c864aff2
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 1294fa0ca190a5c20b5a
2012-04-19 11:11:34 -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: 4d7572a632625cd4262c
2012-04-19 11:11:02 -05:00
Steve Harris
a4e519f3cd
12.4.1-4 baseline
...
Former-commit-id: 67a5a683002a216f333c
2012-04-18 15:18:16 -05:00
Richard Peter
4a93a365bd
Merge "Issue #449 . Fixed problem with simulated time for trend plots in FSS monitors." into 9-Wes2Bridge
...
Former-commit-id: 709be7733bbe060f1b1c
2012-04-17 13:16:22 -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: ed26e06df2fee53dea94
2012-04-10 12:50:03 -05:00
Slav Korolev
47ba302180
Issue #449 . Fixed problem with simulated time for trend plots in FSS
...
monitors.
Former-commit-id: 8d29726365f02da69ff5
2012-04-09 14:50:19 -04:00
Bryan Kowal
5395b66d6e
Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort.
...
Former-commit-id: 94b327d00f2386dd5890
2012-04-09 13:15:50 -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: 1afa927c33839d7c886f
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: f1e81b1a95dcc3c7bb59
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: 87142f9f4ee0e57577ff
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: e792b2a16f2ed20e107d
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: a9398fe4cde0e8e6d00a
2012-04-03 14:16:33 -05:00
Max Schenkelberg
993cac891e
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 9b0d01f8b507cf5069ba
2012-03-30 10:51:31 -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: d3ad6095b75cdda77afb
2012-03-30 09:50:48 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f22bd792cd9
2012-03-30 08:38:33 -05:00
Steve Harris
6884520750
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 70357d90bca0abcf8120
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: 132d68acc654a1d9cdbc
2012-03-29 10:01:55 -05:00
Max Schenkelberg
ac11dd0c18
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: 15a9245592f10f1a5319
2012-03-28 13:32:04 -05:00
Bryan Kowal
81a360d139
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 8a4c883e0b31f989ecb4
2012-03-21 16:49:38 -05:00
Greg Armendariz
f5c96c4af2
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: 65b8521ccbd45249fb2f
2012-03-17 10:35:17 -05:00
Bryan Kowal
117306c734
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: 55a759fb8a64cdd27f62
2012-03-16 12:16:48 -05:00
Max Schenkelberg
954073b38c
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: cd6ebd80d4b9085db25d
2012-03-16 10:13:31 -05:00
Max Schenkelberg
1e5c074e3b
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: cc111ab9ac258d57e825
2012-03-16 09:03:50 -05:00
Max Schenkelberg
ba8af4dcc1
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: 719f87c261556a270a09
2012-03-14 18:03:44 -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: 13af9170b1ed74b90589
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: 6e5964df9d50765e8a34
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: e13850a2b6d433b7d4d6
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: 5bbf80a38410dc140747
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: 58bfa6298166e05f4c96
2012-03-12 11:43:34 -05:00
Max Schenkelberg
4662ece060
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: d43b0456d889f603f448
2012-03-09 12:31:50 -06:00
Bryan Kowal
638d2c964b
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
...
Former-commit-id: fc1ca4efccb871752e3a
2012-03-08 09:00:55 -06:00
David Gillingham
8a86e910aa
Issue #361 : Use queueCreator.sh to build the new ISC data receive QPID
...
queue.
Former-commit-id: 90a745a03778c7f29096
2012-03-07 16:05:54 -06:00
Bryan Kowal
033a4e237b
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: 4d8d3d4d00c803afd454
2012-03-07 10:22:40 -06: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: 9a75c878293cfa029f4b
2012-03-06 16:24:58 -06:00
David Gillingham
8c0b121cbc
Issue #361 : Refactor IscDataRecRequest handler to execute iscDataRec
...
asynchronously.
Former-commit-id: ff231f33f41d69867594
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: bea56356fd00759729a4
2012-03-05 14:36:56 -06:00
Bryan Kowal
81f778e43a
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 5228de77e2793dad5711
2012-03-05 13:46:10 -06:00
David Gillingham
bc61eb1e43
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: d68e3a7eea494fbe93db
2012-03-05 11:23:11 -06:00
Max Schenkelberg
e27d36432a
Issue #358 merged esb.camel project for plot update compatibility
...
Former-commit-id: 0cf00cb7f476e7a02f76
2012-03-02 13:26:44 -06:00
