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
ee210d909f
Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort.
...
Former-commit-id: 898487c15c
[formerly 94b327d00f
] [formerly 2386dd5890
[formerly 1c18ec39ea8a1bf1867ee96d6a33a9c595951d1f]]
Former-commit-id: 2386dd5890
Former-commit-id: 5395b66d6e
2012-04-09 13:15:50 -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
Max Schenkelberg
4234b91d5b
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 74458bfb73
[formerly 9b0d01f8b5
] [formerly 07cf5069ba
[formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]
Former-commit-id: 07cf5069ba
Former-commit-id: 993cac891e
2012-03-30 10:51:31 -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
Max Schenkelberg
bbab188fb9
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: 66eaffb9ee
[formerly 15a9245592
] [formerly f10f1a5319
[formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]
Former-commit-id: f10f1a5319
Former-commit-id: ac11dd0c18
2012-03-28 13:32:04 -05:00
Bryan Kowal
e27502effd
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 5ba68624c5
[formerly 8a4c883e0b
] [formerly 31f989ecb4
[formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]
Former-commit-id: 31f989ecb4
Former-commit-id: 81a360d139
2012-03-21 16:49:38 -05:00
Greg Armendariz
bf867f91d3
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: 9a0f313c23
[formerly 65b8521ccb
] [formerly d45249fb2f
[formerly 866c197c927445c1572fd19da1ebd3c8dee46d97]]
Former-commit-id: d45249fb2f
Former-commit-id: f5c96c4af2
2012-03-17 10:35:17 -05:00
Bryan Kowal
3914878a65
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: 97cb8ab51c
[formerly 55a759fb8a
] [formerly 64cdd27f62
[formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]
Former-commit-id: 64cdd27f62
Former-commit-id: 117306c734
2012-03-16 12:16:48 -05:00
Max Schenkelberg
81bc45f071
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: 468c812dde
[formerly cd6ebd80d4
] [formerly b9085db25d
[formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]
Former-commit-id: b9085db25d
Former-commit-id: 954073b38c
2012-03-16 10:13:31 -05:00
Max Schenkelberg
4e81d2432c
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: 97edff9f7c
[formerly cc111ab9ac
] [formerly 258d57e825
[formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]
Former-commit-id: 258d57e825
Former-commit-id: 1e5c074e3b
2012-03-16 09:03:50 -05:00
Max Schenkelberg
a4b859ae54
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: 10b720381b
[formerly 719f87c261
] [formerly 556a270a09
[formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]
Former-commit-id: 556a270a09
Former-commit-id: ba8af4dcc1
2012-03-14 18:03:44 -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
Max Schenkelberg
f78b932abb
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 18805c68f7
[formerly d43b0456d8
] [formerly 89f603f448
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]
Former-commit-id: 89f603f448
Former-commit-id: 4662ece060
2012-03-09 12:31:50 -06:00
Bryan Kowal
d04bc82c9a
Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
...
Former-commit-id: 5838ff71f1
[formerly fc1ca4efcc
] [formerly b871752e3a
[formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]
Former-commit-id: b871752e3a
Former-commit-id: 638d2c964b
2012-03-08 09:00:55 -06:00
David Gillingham
5e2b3c3955
Issue #361 : Use queueCreator.sh to build the new ISC data receive QPID
...
queue.
Former-commit-id: 15a9e7cdae
[formerly 90a745a037
] [formerly 78c7f29096
[formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]
Former-commit-id: 78c7f29096
Former-commit-id: 8a86e910aa
2012-03-07 16:05:54 -06:00
Bryan Kowal
f046b941ba
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: d4142689c9
[formerly 4d8d3d4d00
] [formerly c803afd454
[formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]
Former-commit-id: c803afd454
Former-commit-id: 033a4e237b
2012-03-07 10:22:40 -06: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
Bryan Kowal
1585b4b827
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 6e8b4a188f
[formerly 5228de77e2
] [formerly 793dad5711
[formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]
Former-commit-id: 793dad5711
Former-commit-id: 81f778e43a
2012-03-05 13:46:10 -06:00
David Gillingham
29f03b0d2a
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: 1908212c27
[formerly d68e3a7eea
] [formerly 494fbe93db
[formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]
Former-commit-id: 494fbe93db
Former-commit-id: bc61eb1e43
2012-03-05 11:23:11 -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
David Gillingham
bce9ad39ae
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: bd01975367
[formerly f6f0ca24df
] [formerly 0c0f659896
[formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]
Former-commit-id: 0c0f659896
Former-commit-id: b3df043f97
2012-03-02 13:22:46 -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
Steve Harris
fe0b1eed94
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 8794c4bcf6
[formerly c21bd2719c
] [formerly 9bdea0399f
[formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]
Former-commit-id: 9bdea0399f
Former-commit-id: 6f5c182af0
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
f8c2ad7136
Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
...
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd
Former-commit-id: aa90109f45
[formerly 49cce84edf
] [formerly 7c2409eab0
[formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]
Former-commit-id: 7c2409eab0
Former-commit-id: 3220ee4745
2012-03-01 12:44:43 -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
Steve Harris
3e4d618486
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 98d1fbeb0e
[formerly 703cb6e748
] [formerly dd52eb4d40
[formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]
Former-commit-id: dd52eb4d40
Former-commit-id: 06baad5169
2012-02-29 16:08:39 -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
Bryan Kowal
421c425047
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 861ca25a4e
[formerly 47230422ce
] [formerly 94d6af30f0
[formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]
Former-commit-id: 94d6af30f0
Former-commit-id: ca62eb90f3
2012-02-29 12:43:46 -06:00
Ben Steffensmeier
dba810ddc4
Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
...
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f
Former-commit-id: 3713d7a181
[formerly 5dee50e7e9
] [formerly d7a63995f1
[formerly d05beaa84618bc01d8cb711298523dc358bb4938]]
Former-commit-id: d7a63995f1
Former-commit-id: e52c2ffb20
2012-02-28 15:20:37 -06:00
Nate Jensen
414785ee0e
Integrating Richard's changes with 12.2.1
...
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c
Former-commit-id: a22448c3d5
[formerly 2515d56c9f
] [formerly c5ba181cd8
[formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]]
Former-commit-id: c5ba181cd8
Former-commit-id: 699e417731
2012-02-28 09:42:47 -06:00
Nate Jensen
a65f8d8242
Integrating Richard's changes with 12.2.1
...
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4
Former-commit-id: 94ae63b740
[formerly d18a15535a
] [formerly afe3c5db9c
[formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]
Former-commit-id: afe3c5db9c
Former-commit-id: 74b6e7b389
2012-02-28 09:37:45 -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
Steve Harris
7c18ec7c7c
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c45e7b888c
[formerly aa597242f9
] [formerly a4538f0a48
[formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]
Former-commit-id: a4538f0a48
Former-commit-id: fdd6018d1a
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
88d2d2e4b6
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 20481daa1b
[formerly 357dc4d88b
] [formerly 637c051a23
[formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]
Former-commit-id: 637c051a23
Former-commit-id: 62f1ea0aac
2012-02-24 14:57:23 -06:00