xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
620 commits 31 branches 40 tags 3.8 GiB
Commit graph

143 commits

Author SHA1 Message Date
Max Schenkelberg
78e1bd2c62 Issue #588 Added serialization adapter registration to better support serializing DrawableString objects 
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 6c456c0bad00aaa1fea67f90a4633b3e14a78495
 2012-05-09 15:02:30 -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
Steve Harris
27bc369818 Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration 
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
 2012-05-09 13:14:00 -05:00
Steve Harris
84d191e7b6 12.5.1-2 baseline 
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
 2012-05-03 19:17:13 -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
Max Schenkelberg
a912786429 Added network logging for http traffic 
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25

Former-commit-id: 7696dd610b5d6f0fc3620db461de68ba06c61699
 2012-04-25 17:28:52 -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
Steve Harris
704b75e1a1 12.4.1-10 baseline 
Former-commit-id: 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a
 2012-04-24 15:38:29 -05:00
Steve Harris
90ae4bbb36 12.4.1-7 baseline 
Former-commit-id: 3524730cc38b5420e7529b5a75d62313695e64d6
 2012-04-24 15:24:39 -05:00
Max Schenkelberg
f4193b0e4e Issue #239 Added persistence capability to Collaboration data events 
Former-commit-id: 39e1cc313eae6df99483cc657c39cdd5e3d24533
 2012-04-24 13:44:16 -05:00
Nate Jensen
a4b0addeee Issue #443 better logging of traffic 
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81

Former-commit-id: 4a7faa743900edada4ecf8b42aa3315515617e71
 2012-04-23 11:23:22 -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
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
Max Schenkelberg
12dcb4b044 Issue #239 Added wireframe shape capability 
Former-commit-id: f56dd661225103b08b1d51a9f0cb174bd73340eb
 2012-04-12 14:46:08 -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
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
Bradley Gonzales
6fc14461ee Issue #440 more descriptive login failure message 
Former-commit-id: 909362d88423e3c5a39c73b5e5da2d2168f5ed91
 2012-04-04 16:26:58 -05:00
Max Schenkelberg
6c411ffb07 Issue #239 Start of remote target capabilities 
Former-commit-id: 30b76609cff9a737b8e4190bbfebb5a37a259fad
 2012-04-03 15:11:20 -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
23d65caf2e Merge branch 'ss_sync (12.3.1)' into 11-Collaboration 
Former-commit-id: e8402b080c7d2a712f4f385293aa9b5d1a18484e
 2012-04-02 16:15:21 -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
Nate Jensen
615962f5dd Issue #427 Share maps and editor 
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 7a58d8a17be53fc504cafe32d19de2f52121eeff
 2012-03-22 09:39:59 -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
Steve Harris
5bbf80a384 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set 
Former-commit-id: a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c
 2012-03-12 13:10:34 -05:00
Bryan Kowal
58bfa62981 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: eaa45d7123c43590be3d58fdf845708ade2dbb51
 2012-03-12 11:43:34 -05:00
David Gillingham
9a75c87829 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: 679996850315f699d47633da5baf593c72ba7927
 2012-03-06 16:24:58 -06:00
David Gillingham
ff231f33f4 Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec 
asynchronously.

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

Former-commit-id: 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de
 2012-03-02 12:24:19 -06:00
Max Schenkelberg
ae47d9683e Issue #358 Committing NPP core rendering improvements merged with Thin 
Client core improvements

Former-commit-id: 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6
 2012-03-01 16:59:40 -06:00
Steve Harris
951ecfe3dd Merge branch 'ss_sync' into sync_test 
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
 2012-03-01 14:01:16 -06:00
David Gillingham
c6803ba434 Issue #20: Fix breakage to alertViz caused by changes to 
FileUtil.join().

Former-commit-id: 8832c64ba47f87027d5215caf7d84b9fc6a187cd
 2012-03-01 11:19:22 -06:00
Ben Steffensmeier
5c303ed189 Issue #353 add logic to syncronize times for thin client data updates.. 
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: f94248823eed52b2d9f8c56af3dc7607b323fc1e
 2012-02-29 15:49:47 -06:00
Steve Harris
9b67525e95 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: fb9d0adece5806382d0aa5c7c3e7c41f89594143
 2012-02-27 15:58:49 -06:00