Commit graph

6870 commits

Author SHA1 Message Date
Max Schenkelberg
e220ddf515 Issue #358 Fixed sampling issue with mosaic resource with best
res resources

Former-commit-id: 97edff9f7c [formerly cc111ab9ac] [formerly 97edff9f7c [formerly cc111ab9ac] [formerly 258d57e825 [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 258d57e825
Former-commit-id: 4e81d2432c [formerly 1e5c074e3b]
Former-commit-id: a3bda1957c
2012-03-16 09:03:50 -05:00
Max Schenkelberg
d585d19f48 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 10b720381b [formerly 719f87c261] [formerly 556a270a09 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: a4b859ae54 [formerly ba8af4dcc1]
Former-commit-id: 682aca1dda
2012-03-14 18:03:44 -05:00
David Gillingham
21a13f6340 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 e33083c11a [formerly 13af9170b1] [formerly ed74b90589 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]]]
Former-commit-id: ed74b90589
Former-commit-id: 558c69401d [formerly 5dac19bde9]
Former-commit-id: 0658b4049c
2012-03-14 15:07:59 -05:00
Nate Jensen
8e796d06de Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
Former-commit-id: feeb8cba7e [formerly 8f8e690470] [formerly feeb8cba7e [formerly 8f8e690470] [formerly dc62171533 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]]]
Former-commit-id: dc62171533
Former-commit-id: 77a50a5e25 [formerly 8d78571942]
Former-commit-id: 7f88a56232
2012-03-14 11:23:55 -05:00
Matt Nash
1236a90d7e Issue #244 icons and login changes
Former-commit-id: f5c9cfd285 [formerly e06101f9c3] [formerly f5c9cfd285 [formerly e06101f9c3] [formerly 2fd6e28569 [formerly ef2993a8545265adbc325080765baef0ee939923]]]
Former-commit-id: 2fd6e28569
Former-commit-id: d6ef74a95b [formerly 5b949aeacf]
Former-commit-id: ab5e4cb2de
2012-03-14 10:54:13 -05:00
James Korman
0d4ccaf2e6 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: ee20250305 [formerly 095ab0eeab] [formerly ee20250305 [formerly 095ab0eeab] [formerly d6003d1e71 [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]
Former-commit-id: d6003d1e71
Former-commit-id: 578594cdfd [formerly b29c262362]
Former-commit-id: 072c79a582
2012-03-14 10:24:17 -05:00
Max Schenkelberg
9366a5f308 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 8fb7eccb73 [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7 [formerly cf440b3884]
Former-commit-id: 6378e8c4ee
2012-03-14 09:49:32 -05:00
Roger Ferrel
69552760cd Issue #244 Close Session connction when view closed. Tighen up dialogs.
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5

Former-commit-id: 186aac5b77 [formerly 97a3884017] [formerly 186aac5b77 [formerly 97a3884017] [formerly c321d2aacf [formerly 486b2186014a14a845e48dac222c293a7891e39e]]]
Former-commit-id: c321d2aacf
Former-commit-id: a64f2e6070 [formerly b21f1555e2]
Former-commit-id: 8474561724
2012-03-14 09:26:23 -05:00
David Gillingham
69adfe2e40 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: 7e5ec12276 [formerly e13850a2b6] [formerly 7e5ec12276 [formerly e13850a2b6] [formerly d433b7d4d6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 3c4e90e0bf [formerly 2b5588bd1e]
Former-commit-id: 2d82185a1d
2012-03-13 12:31:38 -05:00
Steve Harris
749ee2f4f4 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 6d2af585b1 [formerly 5bbf80a384] [formerly 10dc140747 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]
Former-commit-id: 10dc140747
Former-commit-id: 7fc8cf3d94 [formerly 7bdde9f690]
Former-commit-id: a97a9f80c9
2012-03-12 13:10:34 -05:00
Bryan Kowal
6b35ea48d0 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 eab9c845bb [formerly 58bfa62981] [formerly 66e05f4c96 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]]
Former-commit-id: 66e05f4c96
Former-commit-id: 64a7f1db84 [formerly 3b97383354]
Former-commit-id: 6851775548
2012-03-12 11:43:34 -05:00
Matt Nash
164c1d3715 Issue #244 new icons for collaboration
Former-commit-id: 6398c01aec [formerly 79f1cbec74] [formerly 6398c01aec [formerly 79f1cbec74] [formerly 39bce3d793 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]]]
Former-commit-id: 39bce3d793
Former-commit-id: c743c0c44b [formerly 22eb44eb26]
Former-commit-id: cd16dd73a4
2012-03-12 08:03:54 -05:00
Max Schenkelberg
0f005d3521 Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 18805c68f7 [formerly d43b0456d8] [formerly 18805c68f7 [formerly d43b0456d8] [formerly 89f603f448 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: f78b932abb [formerly 4662ece060]
Former-commit-id: 1303289d12
2012-03-09 12:31:50 -06:00
Roger Ferrel
c828bfb110 Issue #244 Bug Fix.
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

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

Former-commit-id: 71a5524380 [formerly f492b082dc] [formerly 71a5524380 [formerly f492b082dc] [formerly f04f775a66 [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]]
Former-commit-id: f04f775a66
Former-commit-id: d6a4919b9a [formerly 674cc116b2]
Former-commit-id: 31c8dddd6c
2012-03-08 12:37:56 -06:00
Matt Nash
f060c674d7 Issue #244 added work on the chat for presence notifications
Former-commit-id: c96c33169b [formerly d264743199] [formerly c96c33169b [formerly d264743199] [formerly 6f354374d6 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]]
Former-commit-id: 6f354374d6
Former-commit-id: b4a5aaea11 [formerly 4f35191a6b]
Former-commit-id: 825570f37c
2012-03-08 09:08:41 -06:00
Bryan Kowal
0c547b30ce Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: 5838ff71f1 [formerly fc1ca4efcc] [formerly 5838ff71f1 [formerly fc1ca4efcc] [formerly b871752e3a [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]
Former-commit-id: b871752e3a
Former-commit-id: d04bc82c9a [formerly 638d2c964b]
Former-commit-id: 4c87af89f9
2012-03-08 09:00:55 -06:00
Matt Nash
347a36704a Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: 1e4472cd78 [formerly 04ae9b48ea] [formerly 1e4472cd78 [formerly 04ae9b48ea] [formerly bbacd337b4 [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]]
Former-commit-id: bbacd337b4
Former-commit-id: dd57ff6b7f [formerly 7efd993e18]
Former-commit-id: 9ec70444da
2012-03-08 08:33:32 -06:00
Roger Ferrel
12df2e3f0b Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: c22d5ef573 [formerly c9459e2e8c] [formerly c22d5ef573 [formerly c9459e2e8c] [formerly 2114b95a0b [formerly 28969960d80066def0ef02930875e40d7693c234]]]
Former-commit-id: 2114b95a0b
Former-commit-id: 40b910c05e [formerly 1a2608a2fa]
Former-commit-id: 890f2bffb9
2012-03-08 08:30:02 -06:00
David Gillingham
f91abb8deb Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: 15a9e7cdae [formerly 90a745a037] [formerly 15a9e7cdae [formerly 90a745a037] [formerly 78c7f29096 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]
Former-commit-id: 78c7f29096
Former-commit-id: 5e2b3c3955 [formerly 8a86e910aa]
Former-commit-id: b70345182d
2012-03-07 16:05:54 -06:00
James Korman
fe7db93589 Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 4368616970 [formerly 526a2633ce] [formerly 4368616970 [formerly 526a2633ce] [formerly 5a91d71c12 [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]]
Former-commit-id: 5a91d71c12
Former-commit-id: f242c1a430 [formerly 2fea86a591]
Former-commit-id: e40ee702aa
2012-03-07 15:38:20 -06:00
Bryan Kowal
c8c031d8d7 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 d4142689c9 [formerly 4d8d3d4d00] [formerly c803afd454 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]]
Former-commit-id: c803afd454
Former-commit-id: f046b941ba [formerly 033a4e237b]
Former-commit-id: 2cc79e1acb
2012-03-07 10:22:40 -06:00
David Gillingham
5bc4e2b41b 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 efc9e9000b [formerly 9a75c87829] [formerly 3cfa029f4b [formerly 679996850315f699d47633da5baf593c72ba7927]]]
Former-commit-id: 3cfa029f4b
Former-commit-id: 882544b165 [formerly 1818e488c5]
Former-commit-id: 2f723abcb7
2012-03-06 16:24:58 -06:00
Nate Jensen
9c3c717032 Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: 13228ab7cc [formerly f950b30463] [formerly 13228ab7cc [formerly f950b30463] [formerly 412ceb9561 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]]
Former-commit-id: 412ceb9561
Former-commit-id: 39f89588a1 [formerly d0672cf2b6]
Former-commit-id: 54ab82c837
2012-03-06 14:27:15 -06:00
Roger Ferrel
192093aa37 Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: c62418dcf3 [formerly c26e98376e] [formerly c62418dcf3 [formerly c26e98376e] [formerly 3161380f4d [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]]
Former-commit-id: 3161380f4d
Former-commit-id: 0cf600a16c [formerly ccfadae952]
Former-commit-id: 8395a3937e
2012-03-06 14:08:39 -06:00
David Gillingham
f67e4bc8c2 Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: 8d2ea4cfba [formerly ff231f33f4] [formerly 8d2ea4cfba [formerly ff231f33f4] [formerly 1d69867594 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]]
Former-commit-id: 1d69867594
Former-commit-id: 000ca27db9 [formerly 8c0b121cbc]
Former-commit-id: 773b6c7af6
2012-03-05 16:49:23 -06:00
Bryan Kowal
2fad8b9298 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 ed81095573 [formerly bea56356fd] [formerly 00759729a4 [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]]
Former-commit-id: 00759729a4
Former-commit-id: 0b690e438c [formerly 1fda54a89b]
Former-commit-id: 94beefffcd
2012-03-05 14:36:56 -06:00
Bryan Kowal
2f7b3400c5 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 6e8b4a188f [formerly 5228de77e2] [formerly 6e8b4a188f [formerly 5228de77e2] [formerly 793dad5711 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]]
Former-commit-id: 793dad5711
Former-commit-id: 1585b4b827 [formerly 81f778e43a]
Former-commit-id: faa13ee9f7
2012-03-05 13:46:10 -06:00
David Gillingham
678953ae76 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: 1908212c27 [formerly d68e3a7eea] [formerly 1908212c27 [formerly d68e3a7eea] [formerly 494fbe93db [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 29f03b0d2a [formerly bc61eb1e43]
Former-commit-id: ad8efe180e
2012-03-05 11:23:11 -06:00
Max Schenkelberg
9385c7c7b3 Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 225dfd15be [formerly 0cf00cb7f4] [formerly 225dfd15be [formerly 0cf00cb7f4] [formerly 76e7a02f76 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]]
Former-commit-id: 76e7a02f76
Former-commit-id: b23dc95d40 [formerly e27d36432a]
Former-commit-id: b1a521b17e
2012-03-02 13:26:44 -06:00
David Gillingham
0b79b9ea21 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 bd01975367 [formerly f6f0ca24df] [formerly 0c0f659896 [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: 0c0f659896
Former-commit-id: bce9ad39ae [formerly b3df043f97]
Former-commit-id: 788007ff63
2012-03-02 13:22:46 -06:00
Max Schenkelberg
4590c7b694 Issue #358 merged dataURI changes from thinclient in for plot
compatibility

Former-commit-id: 4d91a4fd74 [formerly f96ff96259] [formerly 4d91a4fd74 [formerly f96ff96259] [formerly 1f714b1a5b [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]]
Former-commit-id: 1f714b1a5b
Former-commit-id: 79365f1f62 [formerly e4914cbe89]
Former-commit-id: 28052629c8
2012-03-02 12:24:19 -06:00
Max Schenkelberg
ae389f0b57 Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements

Former-commit-id: e2cd95d3f4 [formerly ae47d9683e] [formerly e2cd95d3f4 [formerly ae47d9683e] [formerly 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0 [formerly 3212cc6ebb]
Former-commit-id: 585e979c76
2012-03-01 16:59:40 -06:00
Steve Harris
cdc4d1cb44 Merge branch 'ss_sync' into sync_test
Former-commit-id: 3b9c3e3474 [formerly 951ecfe3dd] [formerly 3b9c3e3474 [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 787aed90f8
Former-commit-id: b3f831a7b4 [formerly db45babec8]
Former-commit-id: 376edad3c9
2012-03-01 14:01:16 -06:00
Steve Harris
9ce7c680d7 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 8794c4bcf6 [formerly c21bd2719c] [formerly 8794c4bcf6 [formerly c21bd2719c] [formerly 9bdea0399f [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 9bdea0399f
Former-commit-id: fe0b1eed94 [formerly 6f5c182af0]
Former-commit-id: 6cdedca0a3
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
4e0ec11a6f 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 aa90109f45 [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: 7c2409eab0
Former-commit-id: f8c2ad7136 [formerly 3220ee4745]
Former-commit-id: e0ad3aee33
2012-03-01 12:44:43 -06:00
David Gillingham
1d48986042 Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().

Former-commit-id: 6a2b7e12d6 [formerly c6803ba434] [formerly 6a2b7e12d6 [formerly c6803ba434] [formerly 8a45f1f4c3 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]]
Former-commit-id: 8a45f1f4c3
Former-commit-id: 234801c998 [formerly 953f8a6535]
Former-commit-id: ad5601c5ec
2012-03-01 11:19:22 -06:00
Steve Harris
3306848158 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 98d1fbeb0e [formerly 703cb6e748] [formerly 98d1fbeb0e [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: dd52eb4d40
Former-commit-id: 3e4d618486 [formerly 06baad5169]
Former-commit-id: a4d8f58c90
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
da7275d80b Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 56d97c95d5 [formerly 5c303ed189] [formerly 56d97c95d5 [formerly 5c303ed189] [formerly c61e40c426 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: 390700efb0 [formerly 84e6c9beb8]
Former-commit-id: 588432f980
2012-02-29 15:49:47 -06:00
Bryan Kowal
e3f992a525 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 861ca25a4e [formerly 47230422ce] [formerly 861ca25a4e [formerly 47230422ce] [formerly 94d6af30f0 [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]]
Former-commit-id: 94d6af30f0
Former-commit-id: 421c425047 [formerly ca62eb90f3]
Former-commit-id: e23844d671
2012-02-29 12:43:46 -06:00
Ben Steffensmeier
f668495c76 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 3713d7a181 [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: dba810ddc4 [formerly e52c2ffb20]
Former-commit-id: 7d4367ee7a
2012-02-28 15:20:37 -06:00
Steve Harris
e567859e3b Merge branch 'ss_sync' (OB12.2.1) into 11-Collaboration
Former-commit-id: 45e43fa592 [formerly 7817380140] [formerly 45e43fa592 [formerly 7817380140] [formerly fb9896b8c9 [formerly a606419ccbf3cc1503cbe058af2264d0448b31af]]]
Former-commit-id: fb9896b8c9
Former-commit-id: 1a6195da8b [formerly c1e626d256]
Former-commit-id: 39b71d1960
2012-02-28 09:55:05 -06:00
Nate Jensen
25a134cc57 Integrating Richard's changes with 12.2.1
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c

Former-commit-id: a22448c3d5 [formerly 2515d56c9f] [formerly a22448c3d5 [formerly 2515d56c9f] [formerly c5ba181cd8 [formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]]]
Former-commit-id: c5ba181cd8
Former-commit-id: 414785ee0e [formerly 699e417731]
Former-commit-id: a0d01a57d0
2012-02-28 09:42:47 -06:00
Nate Jensen
8bf1058be3 Integrating Richard's changes with 12.2.1
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4

Former-commit-id: 94ae63b740 [formerly d18a15535a] [formerly 94ae63b740 [formerly d18a15535a] [formerly afe3c5db9c [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]]
Former-commit-id: afe3c5db9c
Former-commit-id: a65f8d8242 [formerly 74b6e7b389]
Former-commit-id: 5c1aae46e1
2012-02-28 09:37:45 -06:00
Steve Harris
f8ae79c35c 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 24059a5b4e [formerly 9b67525e95] [formerly e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 73a337bc31 [formerly 40d7357165]
Former-commit-id: 21f12bae82
2012-02-27 15:58:49 -06:00
Steve Harris
98c100b36f Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c45e7b888c [formerly aa597242f9] [formerly c45e7b888c [formerly aa597242f9] [formerly a4538f0a48 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: a4538f0a48
Former-commit-id: 7c18ec7c7c [formerly fdd6018d1a]
Former-commit-id: ba4a6aa434
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
cc91522fa0 Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: 20481daa1b [formerly 357dc4d88b] [formerly 20481daa1b [formerly 357dc4d88b] [formerly 637c051a23 [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: 88d2d2e4b6 [formerly 62f1ea0aac]
Former-commit-id: 0b4134f364
2012-02-24 14:57:23 -06:00
Bryan Kowal
48f3f1e2d7 Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 475849bd91 [formerly 1e3e31a657] [formerly 475849bd91 [formerly 1e3e31a657] [formerly c2cd292c32 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]
Former-commit-id: c2cd292c32
Former-commit-id: d4367098a7 [formerly 49a30a5b1a]
Former-commit-id: 8350501de4
2012-02-23 16:46:48 -06:00
David Gillingham
98bc9450d3 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: ef903bc728 [formerly d79f7e9613] [formerly ef903bc728 [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: 6bca8d6353 [formerly f9ed20bada]
Former-commit-id: 85c082f1e9
2012-02-23 14:40:25 -06:00
Bryan Kowal
511f0efe24 Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 4881def0e9 [formerly bae0cb555e] [formerly 4881def0e9 [formerly bae0cb555e] [formerly e135f4508d [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]]
Former-commit-id: e135f4508d
Former-commit-id: fa23b673c4 [formerly 5c86773a77]
Former-commit-id: 4a78479648
2012-02-23 14:20:50 -06:00