Commit graph

3522 commits

Author SHA1 Message Date
Bryan Kowal
95a840ddbd 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: 64cdd27f62 [formerly 97cb8ab51c [formerly 55a759fb8a] [formerly 64cdd27f62 [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]]
Former-commit-id: 97cb8ab51c [formerly 55a759fb8a]
Former-commit-id: 97cb8ab51c
Former-commit-id: dd9c964943
2012-03-16 12:16:48 -05:00
Max Schenkelberg
55afb6ac41 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
case of "NO DATA"

Former-commit-id: b9085db25d [formerly 468c812dde [formerly cd6ebd80d4] [formerly b9085db25d [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]
Former-commit-id: 468c812dde [formerly cd6ebd80d4]
Former-commit-id: 468c812dde
Former-commit-id: a0663a2791
2012-03-16 10:13:31 -05:00
Max Schenkelberg
46a1f6516c Issue #358 Fixed sampling issue with mosaic resource with best
res resources

Former-commit-id: 258d57e825 [formerly 97edff9f7c [formerly cc111ab9ac] [formerly 258d57e825 [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 97edff9f7c [formerly cc111ab9ac]
Former-commit-id: 97edff9f7c
Former-commit-id: 1b8beb3f8d
2012-03-16 09:03:50 -05:00
Max Schenkelberg
d0818c08e6 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: 556a270a09 [formerly 10b720381b [formerly 719f87c261] [formerly 556a270a09 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 10b720381b [formerly 719f87c261]
Former-commit-id: 10b720381b
Former-commit-id: 732c2ddb5c
2012-03-14 18:03:44 -05:00
David Gillingham
7d4e04e386 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: ed74b90589 [formerly e33083c11a [formerly 13af9170b1] [formerly ed74b90589 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]]
Former-commit-id: e33083c11a [formerly 13af9170b1]
Former-commit-id: e33083c11a
Former-commit-id: a1ac93704b
2012-03-14 15:07:59 -05:00
Nate Jensen
5610b37449 Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
Former-commit-id: dc62171533 [formerly feeb8cba7e [formerly 8f8e690470] [formerly dc62171533 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]]]
Former-commit-id: feeb8cba7e [formerly 8f8e690470]
Former-commit-id: feeb8cba7e
Former-commit-id: d73d150241
2012-03-14 11:23:55 -05:00
Matt Nash
9fd32e1bdf Issue #244 icons and login changes
Former-commit-id: 2fd6e28569 [formerly f5c9cfd285 [formerly e06101f9c3] [formerly 2fd6e28569 [formerly ef2993a8545265adbc325080765baef0ee939923]]]
Former-commit-id: f5c9cfd285 [formerly e06101f9c3]
Former-commit-id: f5c9cfd285
Former-commit-id: 0e68f12509
2012-03-14 10:54:13 -05:00
James Korman
63b9b01dff Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: d6003d1e71 [formerly ee20250305 [formerly 095ab0eeab] [formerly d6003d1e71 [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]
Former-commit-id: ee20250305 [formerly 095ab0eeab]
Former-commit-id: ee20250305
Former-commit-id: 4756721ef6
2012-03-14 10:24:17 -05:00
Max Schenkelberg
66efb10629 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: 50765e8a34 [formerly 8fb7eccb73 [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 8fb7eccb73 [formerly 6e5964df9d]
Former-commit-id: 8fb7eccb73
Former-commit-id: 5a61f3ae23
2012-03-14 09:49:32 -05:00
Roger Ferrel
fdd7af365e Issue #244 Close Session connction when view closed. Tighen up dialogs.
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5

Former-commit-id: c321d2aacf [formerly 186aac5b77 [formerly 97a3884017] [formerly c321d2aacf [formerly 486b2186014a14a845e48dac222c293a7891e39e]]]
Former-commit-id: 186aac5b77 [formerly 97a3884017]
Former-commit-id: 186aac5b77
Former-commit-id: bdc8744ea6
2012-03-14 09:26:23 -05:00
David Gillingham
66f00f9cbc Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: d433b7d4d6 [formerly 7e5ec12276 [formerly e13850a2b6] [formerly d433b7d4d6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]
Former-commit-id: 7e5ec12276 [formerly e13850a2b6]
Former-commit-id: 7e5ec12276
Former-commit-id: edde99f0b8
2012-03-13 12:31:38 -05:00
Steve Harris
9eb40914e1 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 10dc140747 [formerly 6d2af585b1 [formerly 5bbf80a384] [formerly 10dc140747 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]
Former-commit-id: 6d2af585b1 [formerly 5bbf80a384]
Former-commit-id: 6d2af585b1
Former-commit-id: 229fa2944d
2012-03-12 13:10:34 -05:00
Bryan Kowal
99b946e585 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: 66e05f4c96 [formerly eab9c845bb [formerly 58bfa62981] [formerly 66e05f4c96 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]]
Former-commit-id: eab9c845bb [formerly 58bfa62981]
Former-commit-id: eab9c845bb
Former-commit-id: 08451e8a63
2012-03-12 11:43:34 -05:00
Matt Nash
ac4fd28fbd Issue #244 new icons for collaboration
Former-commit-id: 39bce3d793 [formerly 6398c01aec [formerly 79f1cbec74] [formerly 39bce3d793 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]]]
Former-commit-id: 6398c01aec [formerly 79f1cbec74]
Former-commit-id: 6398c01aec
Former-commit-id: 8271eb002a
2012-03-12 08:03:54 -05:00
Max Schenkelberg
a36ae8f15d Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 89f603f448 [formerly 18805c68f7 [formerly d43b0456d8] [formerly 89f603f448 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 18805c68f7 [formerly d43b0456d8]
Former-commit-id: 18805c68f7
Former-commit-id: 3beecc1cdf
2012-03-09 12:31:50 -06:00
Roger Ferrel
322f9bebf9 Issue #244 Bug Fix.
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

Former-commit-id: d17ef23899 [formerly 1871be89e7 [formerly be9fe19d9a] [formerly d17ef23899 [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]]
Former-commit-id: 1871be89e7 [formerly be9fe19d9a]
Former-commit-id: 1871be89e7
Former-commit-id: 118c5abe09
2012-03-08 17:16:48 -06:00
Roger Ferrel
d4b8b3d6e0 Issue #244 Added join and refresh actions.
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20

Former-commit-id: f04f775a66 [formerly 71a5524380 [formerly f492b082dc] [formerly f04f775a66 [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]]
Former-commit-id: 71a5524380 [formerly f492b082dc]
Former-commit-id: 71a5524380
Former-commit-id: c8b8a30875
2012-03-08 12:37:56 -06:00
Matt Nash
79ede3da29 Issue #244 added work on the chat for presence notifications
Former-commit-id: 6f354374d6 [formerly c96c33169b [formerly d264743199] [formerly 6f354374d6 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]]
Former-commit-id: c96c33169b [formerly d264743199]
Former-commit-id: c96c33169b
Former-commit-id: b8cb02de4c
2012-03-08 09:08:41 -06:00
Bryan Kowal
3de19594a4 Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: b871752e3a [formerly 5838ff71f1 [formerly fc1ca4efcc] [formerly b871752e3a [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]
Former-commit-id: 5838ff71f1 [formerly fc1ca4efcc]
Former-commit-id: 5838ff71f1
Former-commit-id: 6322415535
2012-03-08 09:00:55 -06:00
Matt Nash
31af6b9634 Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: bbacd337b4 [formerly 1e4472cd78 [formerly 04ae9b48ea] [formerly bbacd337b4 [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]]
Former-commit-id: 1e4472cd78 [formerly 04ae9b48ea]
Former-commit-id: 1e4472cd78
Former-commit-id: b73877e9a5
2012-03-08 08:33:32 -06:00
Roger Ferrel
0948747097 Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: 2114b95a0b [formerly c22d5ef573 [formerly c9459e2e8c] [formerly 2114b95a0b [formerly 28969960d80066def0ef02930875e40d7693c234]]]
Former-commit-id: c22d5ef573 [formerly c9459e2e8c]
Former-commit-id: c22d5ef573
Former-commit-id: b1a69aafff
2012-03-08 08:30:02 -06:00
David Gillingham
703268c0f4 Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: 78c7f29096 [formerly 15a9e7cdae [formerly 90a745a037] [formerly 78c7f29096 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]
Former-commit-id: 15a9e7cdae [formerly 90a745a037]
Former-commit-id: 15a9e7cdae
Former-commit-id: d3fcc3bc54
2012-03-07 16:05:54 -06:00
James Korman
105f324543 Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 5a91d71c12 [formerly 4368616970 [formerly 526a2633ce] [formerly 5a91d71c12 [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]]
Former-commit-id: 4368616970 [formerly 526a2633ce]
Former-commit-id: 4368616970
Former-commit-id: 373f5b4060
2012-03-07 15:38:20 -06:00
Bryan Kowal
b91ba2aa97 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: c803afd454 [formerly d4142689c9 [formerly 4d8d3d4d00] [formerly c803afd454 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]]
Former-commit-id: d4142689c9 [formerly 4d8d3d4d00]
Former-commit-id: d4142689c9
Former-commit-id: bdb4777017
2012-03-07 10:22:40 -06:00
David Gillingham
9394503075 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: 3cfa029f4b [formerly efc9e9000b [formerly 9a75c87829] [formerly 3cfa029f4b [formerly 679996850315f699d47633da5baf593c72ba7927]]]
Former-commit-id: efc9e9000b [formerly 9a75c87829]
Former-commit-id: efc9e9000b
Former-commit-id: d3d2046df0
2012-03-06 16:24:58 -06:00
Nate Jensen
f16bfe804b Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: 412ceb9561 [formerly 13228ab7cc [formerly f950b30463] [formerly 412ceb9561 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]]
Former-commit-id: 13228ab7cc [formerly f950b30463]
Former-commit-id: 13228ab7cc
Former-commit-id: a448a80004
2012-03-06 14:27:15 -06:00
Roger Ferrel
caf5e8b504 Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: 3161380f4d [formerly c62418dcf3 [formerly c26e98376e] [formerly 3161380f4d [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]]
Former-commit-id: c62418dcf3 [formerly c26e98376e]
Former-commit-id: c62418dcf3
Former-commit-id: 5e63f5b576
2012-03-06 14:08:39 -06:00
David Gillingham
5ddf8c9fdd Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: 1d69867594 [formerly 8d2ea4cfba [formerly ff231f33f4] [formerly 1d69867594 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]]
Former-commit-id: 8d2ea4cfba [formerly ff231f33f4]
Former-commit-id: 8d2ea4cfba
Former-commit-id: b8acb1912c
2012-03-05 16:49:23 -06:00
Bryan Kowal
febefb8f15 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: 00759729a4 [formerly ed81095573 [formerly bea56356fd] [formerly 00759729a4 [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]]
Former-commit-id: ed81095573 [formerly bea56356fd]
Former-commit-id: ed81095573
Former-commit-id: 3bd189df23
2012-03-05 14:36:56 -06:00
Bryan Kowal
c209eab132 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 793dad5711 [formerly 6e8b4a188f [formerly 5228de77e2] [formerly 793dad5711 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]]
Former-commit-id: 6e8b4a188f [formerly 5228de77e2]
Former-commit-id: 6e8b4a188f
Former-commit-id: 3341371f4b
2012-03-05 13:46:10 -06:00
David Gillingham
860422a300 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: 494fbe93db [formerly 1908212c27 [formerly d68e3a7eea] [formerly 494fbe93db [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 1908212c27 [formerly d68e3a7eea]
Former-commit-id: 1908212c27
Former-commit-id: 364b9e19b3
2012-03-05 11:23:11 -06:00
Max Schenkelberg
2dd2b95231 Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 76e7a02f76 [formerly 225dfd15be [formerly 0cf00cb7f4] [formerly 76e7a02f76 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]]
Former-commit-id: 225dfd15be [formerly 0cf00cb7f4]
Former-commit-id: 225dfd15be
Former-commit-id: 8438bc54db
2012-03-02 13:26:44 -06:00
David Gillingham
2830346906 Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 0c0f659896 [formerly bd01975367 [formerly f6f0ca24df] [formerly 0c0f659896 [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: bd01975367 [formerly f6f0ca24df]
Former-commit-id: bd01975367
Former-commit-id: 87de9d067b
2012-03-02 13:22:46 -06:00
Max Schenkelberg
cd64a86e69 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

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

Former-commit-id: 48b6d45f00 [formerly e2cd95d3f4 [formerly ae47d9683e] [formerly 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: e2cd95d3f4 [formerly ae47d9683e]
Former-commit-id: e2cd95d3f4
Former-commit-id: fe1811c167
2012-03-01 16:59:40 -06:00
Steve Harris
471662772a Merge branch 'ss_sync' into sync_test
Former-commit-id: 787aed90f8 [formerly 3b9c3e3474 [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 3b9c3e3474 [formerly 951ecfe3dd]
Former-commit-id: 3b9c3e3474
Former-commit-id: 994e79cfb3
2012-03-01 14:01:16 -06:00
Steve Harris
000ffb3705 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 9bdea0399f [formerly 8794c4bcf6 [formerly c21bd2719c] [formerly 9bdea0399f [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 8794c4bcf6 [formerly c21bd2719c]
Former-commit-id: 8794c4bcf6
Former-commit-id: 5bf956755a
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
bc1ba659ae 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: 7c2409eab0 [formerly aa90109f45 [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: aa90109f45 [formerly 49cce84edf]
Former-commit-id: aa90109f45
Former-commit-id: 5395e71757
2012-03-01 12:44:43 -06:00
David Gillingham
aa585c61a0 Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().

Former-commit-id: 8a45f1f4c3 [formerly 6a2b7e12d6 [formerly c6803ba434] [formerly 8a45f1f4c3 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]]
Former-commit-id: 6a2b7e12d6 [formerly c6803ba434]
Former-commit-id: 6a2b7e12d6
Former-commit-id: 33b41f1b0e
2012-03-01 11:19:22 -06:00
Steve Harris
c6ee34dfe3 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: dd52eb4d40 [formerly 98d1fbeb0e [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: 98d1fbeb0e [formerly 703cb6e748]
Former-commit-id: 98d1fbeb0e
Former-commit-id: 27fb50d455
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
2b5155b16f Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: c61e40c426 [formerly 56d97c95d5 [formerly 5c303ed189] [formerly c61e40c426 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: 56d97c95d5 [formerly 5c303ed189]
Former-commit-id: 56d97c95d5
Former-commit-id: 07d98eb7dc
2012-02-29 15:49:47 -06:00
Bryan Kowal
41ee28c3a5 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 94d6af30f0 [formerly 861ca25a4e [formerly 47230422ce] [formerly 94d6af30f0 [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]]
Former-commit-id: 861ca25a4e [formerly 47230422ce]
Former-commit-id: 861ca25a4e
Former-commit-id: 4ba738041e
2012-02-29 12:43:46 -06:00
Ben Steffensmeier
beee68d592 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: d7a63995f1 [formerly 3713d7a181 [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: 3713d7a181 [formerly 5dee50e7e9]
Former-commit-id: 3713d7a181
Former-commit-id: 7c3545170d
2012-02-28 15:20:37 -06:00
Steve Harris
bc82e088b6 Merge branch 'ss_sync' (OB12.2.1) into 11-Collaboration
Former-commit-id: fb9896b8c9 [formerly 45e43fa592 [formerly 7817380140] [formerly fb9896b8c9 [formerly a606419ccbf3cc1503cbe058af2264d0448b31af]]]
Former-commit-id: 45e43fa592 [formerly 7817380140]
Former-commit-id: 45e43fa592
Former-commit-id: 640855a3ca
2012-02-28 09:55:05 -06:00
Nate Jensen
489b369af2 Integrating Richard's changes with 12.2.1
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c

Former-commit-id: c5ba181cd8 [formerly a22448c3d5 [formerly 2515d56c9f] [formerly c5ba181cd8 [formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]]]
Former-commit-id: a22448c3d5 [formerly 2515d56c9f]
Former-commit-id: a22448c3d5
Former-commit-id: 43538daf06
2012-02-28 09:42:47 -06:00
Nate Jensen
20d46f236c Integrating Richard's changes with 12.2.1
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4

Former-commit-id: afe3c5db9c [formerly 94ae63b740 [formerly d18a15535a] [formerly afe3c5db9c [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]]
Former-commit-id: 94ae63b740 [formerly d18a15535a]
Former-commit-id: 94ae63b740
Former-commit-id: 8106ba956f
2012-02-28 09:37:45 -06:00
Steve Harris
b38662dcc1 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: e5b56c99ab [formerly 24059a5b4e [formerly 9b67525e95] [formerly e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: 24059a5b4e [formerly 9b67525e95]
Former-commit-id: 24059a5b4e
Former-commit-id: 6d01784115
2012-02-27 15:58:49 -06:00
Steve Harris
4072b365bf Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: a4538f0a48 [formerly c45e7b888c [formerly aa597242f9] [formerly a4538f0a48 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: c45e7b888c [formerly aa597242f9]
Former-commit-id: c45e7b888c
Former-commit-id: e08a6e4b1c
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
87a4c09b0b Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: 637c051a23 [formerly 20481daa1b [formerly 357dc4d88b] [formerly 637c051a23 [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 20481daa1b [formerly 357dc4d88b]
Former-commit-id: 20481daa1b
Former-commit-id: 8fd9d92f0a
2012-02-24 14:57:23 -06:00
Bryan Kowal
2e8490391e Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: c2cd292c32 [formerly 475849bd91 [formerly 1e3e31a657] [formerly c2cd292c32 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]
Former-commit-id: 475849bd91 [formerly 1e3e31a657]
Former-commit-id: 475849bd91
Former-commit-id: 48d5fd8ee6
2012-02-23 16:46:48 -06:00