Commit graph

1520 commits

Author SHA1 Message Date
Nate Jensen
03192766ba Merge "Issue #189 fix contour subgridding for worldwide grids" into development
Former-commit-id: 38b27d23af [formerly ee7daccb2c] [formerly 5055164f55] [formerly 340f8e1fa8 [formerly 5055164f55 [formerly 553b56aa362b452110a7f5a4f76aec9640d13599]]]
Former-commit-id: 340f8e1fa8
Former-commit-id: 20413eb7c1980b78cd6d04d145b4b6df5833b8ad [formerly 6210f94be1]
Former-commit-id: 721ef4452d
2012-11-14 16:09:51 -06:00
Nate Jensen
c281cd6661 Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
Former-commit-id: c4cc7b638c [formerly 0398aeaa5b] [formerly 49c2079963] [formerly 31637efbbc [formerly 49c2079963 [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]]
Former-commit-id: 31637efbbc
Former-commit-id: 0bf1056e5bebc6db3ad2c4e0bf1d7112695b64f7 [formerly 8944e220f6]
Former-commit-id: 9158625765
2012-11-14 16:09:00 -06:00
Lee Venable
e32f3dec10 Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
Former-commit-id: 2c82bf1184 [formerly 6152ecccda] [formerly 695cf85335] [formerly 6134e5d3f7 [formerly 695cf85335 [formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]]
Former-commit-id: 6134e5d3f7
Former-commit-id: 5f410f0507be8de6ebdea359793b084ce6d0667a [formerly 7ed335793f]
Former-commit-id: d82072b975
2012-11-14 16:06:02 -06:00
Lee Venable
e251942c81 Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development
Former-commit-id: 39972763e4 [formerly 64d9ba9184] [formerly 8fa3d794fd] [formerly edfab7e56f [formerly 8fa3d794fd [formerly eceb7bed3794368ebb0cd57e466e7beaee88a19d]]]
Former-commit-id: edfab7e56f
Former-commit-id: d1ce292dff3c47cb135f6e21036c0f1507192a9e [formerly bbba9b1b29]
Former-commit-id: 2f4b1d9d5f
2012-11-14 16:05:20 -06:00
Roger Ferrel
27b63206b7 Issue #1298 Changes for non-blocking DisplayAttributesDialog.
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d

Former-commit-id: 08919ea541 [formerly 82f9c74bef] [formerly 7ca75756ae] [formerly 212045c1a6 [formerly 7ca75756ae [formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]]
Former-commit-id: 212045c1a6
Former-commit-id: fe1b8540deb8623751c11b171ed8881812641aa8 [formerly d069f186e1]
Former-commit-id: 7f33d6ba18
2012-11-14 14:56:42 -06:00
Dustin Johnson
08fd67e94a Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]
Former-commit-id: 5d5dbe27e1
2012-11-14 14:41:57 -06:00
Roger Ferrel
086f464e38 Issue #1298 Changes for non-blocking TEWxSetValueDialog.
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b

Former-commit-id: cac846718a [formerly 679d967382] [formerly 7f22145bf2] [formerly dd8f8a9fa7 [formerly 7f22145bf2 [formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 9c581c148e8a0d69f42133e580578c5ccbd32780 [formerly 89653eb5e1]
Former-commit-id: 56ed69fc83
2012-11-14 14:20:40 -06:00
Steve Harris
4300583fc2 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]
Former-commit-id: e35a321a8c
2012-11-14 14:19:20 -06:00
Roger Ferrel
33cd82df5c Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8

Former-commit-id: a49ee93898 [formerly 62faa06ddf] [formerly e267248b57] [formerly 2331b8e1f5 [formerly e267248b57 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]]
Former-commit-id: 2331b8e1f5
Former-commit-id: f3b0d96220d8990a788ce98360553eaaec46477f [formerly 3f0dc83f89]
Former-commit-id: ce623db367
2012-11-14 14:02:01 -06:00
Lee Venable
0f3fb27af1 Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
Former-commit-id: 68a58d808a [formerly a6e88a6856] [formerly e755889643] [formerly e9ae25e781 [formerly e755889643 [formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]]
Former-commit-id: e9ae25e781
Former-commit-id: 298e4f53220a5c54f7602fa97c954e24234058eb [formerly 09591687a9]
Former-commit-id: 680373301f
2012-11-14 13:30:42 -06:00
Lee Venable
6584f9b3f0 Merge "Issue #1298 Changes for non-blocking WeatherElementGroupDialog. Changes from reviewer comments." into development
Former-commit-id: 4b1e4ea01c [formerly cd0a4804c6] [formerly 341dc89480] [formerly 7634ea221b [formerly 341dc89480 [formerly 3106b10a003ca5985e29c69ee0f02185c88edc12]]]
Former-commit-id: 7634ea221b
Former-commit-id: 8dd28cb82c13d4398691d31e0be1541b3934558d [formerly 389f9c6a87]
Former-commit-id: 23f4face77
2012-11-14 13:29:53 -06:00
Richard Peter
9af2ce6934 Issue #1332: Update pypies createStorageRecord to not pull in parent group node
Change-Id: Ieb4b45bce2f5c0eca41301eacbd7782b3c310edd

Former-commit-id: 3778419a78 [formerly 375383a09f] [formerly 73c2fa6ed3] [formerly d2aff4118b [formerly 73c2fa6ed3 [formerly 926250abd96f2b5e30b6a863735a10203491a257]]]
Former-commit-id: d2aff4118b
Former-commit-id: 797dbdc6515d86bef0473de80cc129c909946fd4 [formerly 859d3840bb]
Former-commit-id: 521ebb7e86
2012-11-14 12:51:53 -06:00
Ben Steffensmeier
069028be40 Issue #189 changes to mappings and ncep merge from code review
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 233398088a [formerly 3d126b41e1] [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 93da211e0f7547578a2ee201bcf8f17e845566f7 [formerly 91254adfd6]
Former-commit-id: 47759f025b
2012-11-14 12:22:53 -06:00
Dustin Johnson
21dc859b85 Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: f1cfa9a60d [formerly afd9a767ea] [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 7d9e7567bd [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: caae98dd9803817a99d22d4cbbe38eccdaeff2f9 [formerly c0c60c2488]
Former-commit-id: 5d410ff934
2012-11-14 12:19:10 -06:00
Roger Ferrel
f954d3dbe5 Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072

Former-commit-id: a8453f1f81 [formerly 7f3d893c84] [formerly d16a448e05] [formerly 590eca2cba [formerly d16a448e05 [formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]]
Former-commit-id: 590eca2cba
Former-commit-id: 8bfed4f98086bca15c0c91bc03d65765d14477ce [formerly 950300e16d]
Former-commit-id: 78422d9893
2012-11-14 12:04:18 -06:00
Nate Jensen
3e5220d216 Merge "Issue #189 modify upgrade script to work with grid resources within bestRes." into development
Former-commit-id: 107e6365fd [formerly 750e91914f] [formerly 7f95e486c8] [formerly 7663818f6c [formerly 7f95e486c8 [formerly 82d0be7824c4dd02d23e4422775d803eec4db115]]]
Former-commit-id: 7663818f6c
Former-commit-id: 7a696184a4aea2751117571932173618b2b2221c [formerly 6aa5904dc9]
Former-commit-id: 2f197bad4d
2012-11-14 11:45:10 -06:00
Ben Steffensmeier
8f5469f3a5 Issue #189 fix contour subgridding for worldwide grids
Former-commit-id: 3165998c1c [formerly 33d07530c6] [formerly a597cd1bd42ebe59853f5dfcc83a963178bbca30 [formerly 3ee95cff21]] [formerly 929a785e1b [formerly 3ee95cff21 [formerly e0fb632cc7e0d089436b64a3f2bc6977a0487708]]]
Former-commit-id: 929a785e1b
Former-commit-id: 3043904c1186406f3a7c5e40c122df9a7ee2f7ad [formerly 76996706f4]
Former-commit-id: 7de15734e9
2012-11-14 11:38:25 -06:00
Roger Ferrel
ffefe1fe90 Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
Changes from reviewer comments.

Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac

Former-commit-id: 4424131662 [formerly 5e805da0e1] [formerly 049ecefe1d] [formerly b32480ed08 [formerly 049ecefe1d [formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]]
Former-commit-id: b32480ed08
Former-commit-id: 488a54e8e90966466526378b7880051a98a03d8f [formerly af0ad0433b]
Former-commit-id: be24ca5ed6
2012-11-14 11:36:52 -06:00
Ron Anderson
6a2f93a290 Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development
Former-commit-id: 31d37c7a8f [formerly 29559e851e] [formerly 86c4a247cd] [formerly 0fe91e0d95 [formerly 86c4a247cd [formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]]]
Former-commit-id: 0fe91e0d95
Former-commit-id: 57456c56cf1258f5f07f6b333d1c42e7c804071e [formerly 652c27918c]
Former-commit-id: 9f112f298c
2012-11-14 11:23:06 -06:00
Ben Steffensmeier
1fe90be139 Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb
Former-commit-id: af2808c4f4 [formerly 6e6823d62d] [formerly 42bbc21a3fb7c54af8002d5868fa85bcb7c56443 [formerly 5a1a6f2fdb]] [formerly 1b4236ccc5 [formerly 5a1a6f2fdb [formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]]
Former-commit-id: 1b4236ccc5
Former-commit-id: 5960908c4df2a4a5a484c956e47d7a5861f6bc10 [formerly 159817f538]
Former-commit-id: 5367f936f4
2012-11-14 11:05:42 -06:00
Steve Harris
0e13c45e0b Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development
Former-commit-id: fb70b19b31 [formerly ac834c0ebb] [formerly f5c87b04d6] [formerly 956e1a45da [formerly f5c87b04d6 [formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]]
Former-commit-id: 956e1a45da
Former-commit-id: 16c5eaa729364210458557da2e30a37a959c6022 [formerly a5ca238e96]
Former-commit-id: 397cac3352
2012-11-14 10:19:27 -06:00
Ben Steffensmeier
7e06343c7c Issue #1331 fix grib-request spring
Former-commit-id: 2ca7447dee [formerly 23190381cd] [formerly b128a3f3c5] [formerly c97223458e [formerly b128a3f3c5 [formerly 3b4dda66b20f04915f406df814ca989350794ae7]]]
Former-commit-id: c97223458e
Former-commit-id: 2b1b7db15036a1c0cfab26f1a1c0221fd8283b45 [formerly 60743ec4b1]
Former-commit-id: 7590451249
2012-11-14 10:07:44 -06:00
Brad Gonzales
e092183f27 Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: de29d9feba [formerly 782ffb92ea] [formerly 4af27e092f] [formerly 1617341e2a [formerly 4af27e092f [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]]
Former-commit-id: 1617341e2a
Former-commit-id: f8f796be57c18271c59de81d8c886b4407b52ee5 [formerly c024c94050]
Former-commit-id: cc8ed35821
2012-11-14 09:39:26 -06:00
Steve Harris
98670f1cc2 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]
Former-commit-id: 21ecd53719
2012-11-13 17:28:50 -06:00
Steve Harris
5f628acefd 12.12.1-3 baseline
Former-commit-id: 48fa2a9106 [formerly a81c46987b] [formerly c999505fba] [formerly b3b5e6d28f [formerly c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: b188535ef6619becad681ca44d5bacd7a27bb351 [formerly 2797cbcdd0]
Former-commit-id: 2e3662028f
2012-11-13 17:27:04 -06:00
Steve Harris
5365b72401 12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]
Former-commit-id: 111e7607cf
2012-11-13 17:14:24 -06:00
Lee Venable
4c936e9bb8 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 4320165247 [formerly 2827143110] [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 989d5dc5e4 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]
Former-commit-id: dbdfda1d04
Former-commit-id: a654acdd7cf3477fb8a44e9b6bf136dee6be7b3d [formerly 282e8858da]
Former-commit-id: 77af9b8699
2012-11-13 16:02:05 -06:00
Steve Harris
7abc2601da Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 5569785336 [formerly 1f1659cb16] [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly 63b0f18a89 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]
Former-commit-id: 5c23f057b3
Former-commit-id: b9c2ea0185e67881a053d4f784a50c258b57989c [formerly 1e0ad343d6]
Former-commit-id: 6db07e2e5e
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
fa599c93a8 Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]
Former-commit-id: 109ec1e778
2012-11-13 16:00:19 -06:00
Roger Ferrel
12ad9f9732 Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: f9265a7f55 [formerly cbacc77367] [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 1d5bd95866 [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]
Former-commit-id: dceb2cde5d
Former-commit-id: 064d919288c957d602a2f2cbce59be833dac3237 [formerly 29eb436b19]
Former-commit-id: c498e21b23
2012-11-13 15:53:03 -06:00
Lee Venable
57725df0a1 Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
Former-commit-id: 65c0b3953e [formerly 5b4f3c68f1] [formerly c1e46f52ca] [formerly 9d149bef29 [formerly c1e46f52ca [formerly 795564ae453a7afb423980679c3719a7c453aa74]]]
Former-commit-id: 9d149bef29
Former-commit-id: 1d750981a09a5ee9d6d9bde6568cd2d514c44071 [formerly 32f088d986]
Former-commit-id: 3d07136ccc
2012-11-13 15:35:13 -06:00
Lee Venable
9d69e051e9 Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development
Former-commit-id: e51783c2e1 [formerly 20548994dd] [formerly 0c936a3f8c] [formerly d935fff585 [formerly 0c936a3f8c [formerly f037a61c9fd0c0d85a7596b95cdd35072f7bafe0]]]
Former-commit-id: d935fff585
Former-commit-id: 22affce710d4ea47f88e06aa55fe36b47d206fda [formerly a78cdc9ee4]
Former-commit-id: 69888e4517
2012-11-13 15:34:40 -06:00
Roger Ferrel
dce9814cc7 Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 9ec6ee1fe4 [formerly 6f6b9dd21a] [formerly 1e8dfdc857] [formerly b421a30116 [formerly 1e8dfdc857 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]
Former-commit-id: b421a30116
Former-commit-id: 9fb3810dd061a915575be1fa8b5d2e12821cf89c [formerly d646f32d6e]
Former-commit-id: 1272837397
2012-11-13 13:20:28 -06:00
Lee Venable
56b783bd6d Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development
Former-commit-id: 3e671640a4 [formerly 4b8129ea58] [formerly 5fce4fde98] [formerly 548973dae0 [formerly 5fce4fde98 [formerly bde192a2c922a9bb239d1558794cf03ec6944118]]]
Former-commit-id: 548973dae0
Former-commit-id: 3949d88900153a0e55e529defe00c146b068a929 [formerly 89e28445e5]
Former-commit-id: 39f2ebaf14
2012-11-13 13:19:00 -06:00
Roger Ferrel
af8fa780d2 Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081

Former-commit-id: 2209d4d650 [formerly e3ae2eb355] [formerly 22f8bc10f0] [formerly 4c3af2a258 [formerly 22f8bc10f0 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]]
Former-commit-id: 4c3af2a258
Former-commit-id: 1c4ed8e46fd206b5fb6dfee23125c65e6807a1ec [formerly 8e85e1c8df]
Former-commit-id: c1c0e53b2d
2012-11-13 12:55:33 -06:00
Ron Anderson
88e7d313c4 Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0

Former-commit-id: dbc5a5bb97 [formerly 1bb7258935] [formerly 8a5a2dc532] [formerly 795dfdc9dd [formerly 8a5a2dc532 [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]]
Former-commit-id: 795dfdc9dd
Former-commit-id: 20e198ff53cca6785546ec870a4e207bdb8ddfbc [formerly bad09a9c0d]
Former-commit-id: d6a33fb39f
2012-11-13 12:06:54 -06:00
Mike Duff
5aadd96ae5 Issue #1317 - Fix problem in edexProcessStats.xml
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03

Former-commit-id: 24aa44a46d [formerly 248db814c1] [formerly 0e32ab85db] [formerly e14b372f42 [formerly 0e32ab85db [formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]]
Former-commit-id: e14b372f42
Former-commit-id: 965fd4a7f301467fa40bb5165f739960f012cec8 [formerly 363aa7bec6]
Former-commit-id: b91dca252e
2012-11-13 11:44:02 -06:00
Roger Ferrel
e4283e3ccd Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.

Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f

Former-commit-id: e82a2e2d5c [formerly fdfa0f2030] [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 5ce67ffd9e [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]
Former-commit-id: ae52206cc7
Former-commit-id: e30f66c230e0ca09d4cf1ce286c67a28b4b91763 [formerly 30c70cc181]
Former-commit-id: 122a5cf0a4
2012-11-13 09:49:16 -06:00
Nate Jensen
e6f79c3e2a Merge "Issue #1324 make times display in 24 hour time" into development
Former-commit-id: dcff3f4711 [formerly ca20259c16] [formerly 8a07ba3c11] [formerly e7045022ad [formerly 8a07ba3c11 [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]]
Former-commit-id: e7045022ad
Former-commit-id: 0145a91c7598ae528ddbebde30ec8710ab7722e0 [formerly 7baf10fc53]
Former-commit-id: 2be953df6b
2012-11-13 09:28:05 -06:00
Ron Anderson
ece8bb15e9 Merge "Issue #1325 Update GeoTools for WA4.7" into development
Former-commit-id: 2f6d7cc03b [formerly 8632dfa784] [formerly 024d384292] [formerly 41f68a9cac [formerly 024d384292 [formerly c7fe4cfae35393df26461d4c4892c2bbfaad0fbe]]]
Former-commit-id: 41f68a9cac
Former-commit-id: 3fe9dfb1515573a495d252408ae0fc1a18702e06 [formerly d07cb8c041]
Former-commit-id: a4d6e197be
2012-11-13 09:17:32 -06:00
Nate Jensen
6719a66001 Merge "Issue #1323 initial commit of interfaces of data access framework" into development
Former-commit-id: 73636a68e9 [formerly b43634a58f] [formerly 7ee0c96e34c72df6266bc727e910f2ab3ca5f8ee [formerly c2631b5ba6]] [formerly ff16f82b18 [formerly c2631b5ba6 [formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]]
Former-commit-id: ff16f82b18
Former-commit-id: bdd1ffdd3e03e63afdf42976f2fb37cc88db659c [formerly 14a139c813]
Former-commit-id: 9170b7f75e
2012-11-13 09:01:43 -06:00
Nate Jensen
826c997e0b Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: 35ea1b7773 [formerly 254e88a70c] [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly 8a1f3a10a4 [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]]
Former-commit-id: e51d86ce3a
Former-commit-id: 41eca00d43f0977ae5f16683be5bae42fb520906 [formerly cf8fd9f731]
Former-commit-id: 14b61ef0f8
2012-11-12 17:16:07 -06:00
Lee Venable
70142d8fa5 Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: ca88126428 [formerly e62c2fb732] [formerly a576274c3c] [formerly d4276e6474 [formerly a576274c3c [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]]
Former-commit-id: d4276e6474
Former-commit-id: dfb666f53c8640e84e9243b56e5e8a82310819b7 [formerly fb4b76b003]
Former-commit-id: eaf7e7c724
2012-11-12 16:58:17 -06:00
Max Schenkelberg
25f5a9b1aa Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]
Former-commit-id: 4408af827f
2012-11-12 16:46:21 -06:00
Nate Jensen
6d3beb139e Issue #1323 initial commit of interfaces of data access framework
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02

Former-commit-id: d7f7152e93 [formerly b24c9eb456] [formerly f255f65b3c] [formerly bf72e29752 [formerly f255f65b3c [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]]
Former-commit-id: bf72e29752
Former-commit-id: 321cb3de1f60b624ae9aad5c85b473334d3d249e [formerly 78a1185b19]
Former-commit-id: cfed9d9664
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
f4aeb4f521 Issue #189 modify upgrade script to work with grid resources within bestRes.
Former-commit-id: 0b3639a6fc [formerly 4a75a9ef3b] [formerly 9c17cd2039] [formerly 8d2a0d4b16 [formerly 9c17cd2039 [formerly 784af5833dd3f7514fee15451482cbe7645cef85]]]
Former-commit-id: 8d2a0d4b16
Former-commit-id: ce92ae2ccb454a7d440f28759388c4c969a410e1 [formerly ff9becd710]
Former-commit-id: d8d2e18a74
2012-11-12 16:37:28 -06:00
Roger Ferrel
4f08c126b6 Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly e982c0f43a [formerly 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]
Former-commit-id: e982c0f43a
Former-commit-id: bad97768d4ebf7b70752c8307f99e51df3dd9fe0 [formerly de21a3f2ef]
Former-commit-id: 3b07bb1ae6
2012-11-12 16:27:08 -06:00
Roger Ferrel
4a8b71a632 Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.

Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f

Former-commit-id: e6030885a1 [formerly 13c0fb3f3d] [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 6445081aa9 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]]
Former-commit-id: 76109f3bf7
Former-commit-id: d744cdfac526c0ce2d581c461d6fbaafbdfaa2c9 [formerly e7cd99ff0d]
Former-commit-id: 01899535e3
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
58ba7be711 Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: dfe697a59c [formerly 65441372df] [formerly 7d3f479031] [formerly b5b472dee1 [formerly 7d3f479031 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]]
Former-commit-id: b5b472dee1
Former-commit-id: 4bb07970a3378bedd6d8d48f328087592e3c8036 [formerly 220f41ec4c]
Former-commit-id: 810e0abd77
2012-11-12 15:15:49 -06:00
Ron Anderson
366df432bc Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94

Former-commit-id: e7cd1f9def [formerly 7aaf4db2dc] [formerly f709ab812a] [formerly 303994ff1b [formerly f709ab812a [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]]
Former-commit-id: 303994ff1b
Former-commit-id: eb6052e7b3aef0480bd8fd7500f4d915b645104c [formerly 7bf1316e8c]
Former-commit-id: 3ae270a65d
2012-11-12 15:02:08 -06:00