1429 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nate Jensen	14b61ef0f8	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: 254e88a70c [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]] Former-commit-id: e51d86ce3a Former-commit-id: cf8fd9f731	2012-11-12 17:16:07 -06:00
Lee Venable	eaf7e7c724	Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development ... Former-commit-id: e62c2fb732 [formerly a576274c3c] [formerly d4276e6474 [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]] Former-commit-id: d4276e6474 Former-commit-id: fb4b76b003	2012-11-12 16:58:17 -06:00
Max Schenkelberg	4408af827f	Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml ... Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e Former-commit-id: 30c1802398 [formerly d1099addc6] [formerly 00822a4f39 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]] Former-commit-id: 00822a4f39 Former-commit-id: c4e5092f94	2012-11-12 16:46:21 -06:00
Nate Jensen	cfed9d9664	Issue #1323 initial commit of interfaces of data access framework ... Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02 Former-commit-id: b24c9eb456 [formerly f255f65b3c] [formerly bf72e29752 [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]] Former-commit-id: bf72e29752 Former-commit-id: 78a1185b19	2012-11-12 16:45:33 -06:00
Ben Steffensmeier	d8d2e18a74	Issue #189 modify upgrade script to work with grid resources within bestRes. ... Former-commit-id: 4a75a9ef3b [formerly 9c17cd2039] [formerly 8d2a0d4b16 [formerly 784af5833dd3f7514fee15451482cbe7645cef85]] Former-commit-id: 8d2a0d4b16 Former-commit-id: ff9becd710	2012-11-12 16:37:28 -06:00
Roger Ferrel	3b07bb1ae6	Issue #1298 Changes for non-blocking WrapLengthDialog. ... Changes from reviewer's comments. Fix merge conflict. Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4 Former-commit-id: ab77dfa758 [formerly 66606f88de] [formerly e982c0f43a [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]] Former-commit-id: e982c0f43a Former-commit-id: de21a3f2ef	2012-11-12 16:27:08 -06:00
Roger Ferrel	01899535e3	Issue #1298 Changes for non-blocking StoreTransmitDlg. ... Changes from reviewer's coments. Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f Former-commit-id: 13c0fb3f3d [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]] Former-commit-id: 76109f3bf7 Former-commit-id: e7cd99ff0d	2012-11-12 15:26:03 -06:00
Ben Steffensmeier	810e0abd77	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: 65441372df [formerly 7d3f479031] [formerly b5b472dee1 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]] Former-commit-id: b5b472dee1 Former-commit-id: 220f41ec4c	2012-11-12 15:15:49 -06:00
Ron Anderson	3ae270a65d	Issue #1325 Update GeoTools for WA4.7 ... Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94 Former-commit-id: 7aaf4db2dc [formerly f709ab812a] [formerly 303994ff1b [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]] Former-commit-id: 303994ff1b Former-commit-id: 7bf1316e8c	2012-11-12 15:02:08 -06:00
Roger Ferrel	398f71471d	Issue #1298 Changes for non-blocking NewToolDialog. ... Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5 Former-commit-id: 6ec9c1fac4 [formerly 9c9a068908] [formerly f48474fc82 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]] Former-commit-id: f48474fc82 Former-commit-id: b11413b7f0	2012-11-12 14:22:02 -06:00
Lee Venable	6ab3480255	Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development ... Former-commit-id: 72aedbcece [formerly ab62adea95] [formerly 7db247e33a [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]] Former-commit-id: 7db247e33a Former-commit-id: ded0bfb92f	2012-11-12 14:13:06 -06:00
Lee Venable	2b1be166a2	Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development ... Former-commit-id: d9022d16a6 [formerly 879078484e] [formerly 62c42850e8 [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]] Former-commit-id: 62c42850e8 Former-commit-id: 4f26da9a9a	2012-11-12 14:09:44 -06:00
Roger Ferrel	88968c54e5	Issue #1298 Changes for non-blocking NewTextProductDialog. ... Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d Former-commit-id: ce6d6e277e [formerly 3676829e8f] [formerly ee323d9c60 [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]] Former-commit-id: ee323d9c60 Former-commit-id: 73d9e78e92	2012-11-12 13:20:05 -06:00
Matt Nash	dcda4b3fa4	Issue #1324 make times display in 24 hour time ... Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2 Former-commit-id: 7fa21f5041 [formerly 1480e0abfc] [formerly 0a2f7c9ed2 [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]] Former-commit-id: 0a2f7c9ed2 Former-commit-id: d728ffadd0	2012-11-12 12:53:26 -06:00
Roger Ferrel	8490814573	Issue #1298 Changes for non-blocking GridInfoDialog. ... Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a Former-commit-id: 1f509c5a54 [formerly 30ef939e3c] [formerly 438731ca2e [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]] Former-commit-id: 438731ca2e Former-commit-id: 195d876753	2012-11-12 12:00:03 -06:00
Roger Ferrel	ecba7301a1	Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog. ... Changes from reviewer's comments. Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079 Former-commit-id: b60cbeda7a [formerly d89ce26aeb] [formerly d489a7ef9f [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]] Former-commit-id: d489a7ef9f Former-commit-id: e01a4ae243	2012-11-12 07:14:15 -06:00
Ben Steffensmeier	5ee5347fc0	Issue #1108 fix the order of arguments for grib 1 parameter mappings ... Former-commit-id: 894998b95f [formerly adf0fec9a2] [formerly c4f99aae63 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]] Former-commit-id: c4f99aae63 Former-commit-id: 87ec259477	2012-11-09 13:36:49 -06:00
Lee Venable	ff21b8d604	Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development ... Former-commit-id: 125ac804a7 [formerly 109076cb73] [formerly dac9544eed [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]] Former-commit-id: dac9544eed Former-commit-id: a267d9020b	2012-11-08 17:06:54 -06:00
Nate Jensen	38511f0e95	Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development ... Former-commit-id: 5e718ca85b [formerly a92bfa9393] [formerly cdd6a986e8 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]] Former-commit-id: cdd6a986e8 Former-commit-id: 5e3c076506	2012-11-08 14:50:17 -06:00
Dustin Johnson	eac5bc8197	Issue #1302 Restore jdom.jar, delete net.jcip/.project ... Amend: Also change the manifest and .classpath for ohd common Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b Former-commit-id: db4d728eb7 [formerly 595c421e47] [formerly 2b6e98954e [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]] Former-commit-id: 2b6e98954e Former-commit-id: 0806be04dd	2012-11-08 14:47:17 -06:00
Ben Steffensmeier	7c93db759c	Issue #1108 initial implementation of mappings ... Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d Conflicts: edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]] Former-commit-id: 693090cb36 Former-commit-id: 884c82c4fe	2012-11-08 14:45:36 -06:00
Richard Peter	fa6141c745	Merge "Issue #189 add more comments to grib decoder." into development ... Former-commit-id: 7f49c5fe04 [formerly db28cc26aa] [formerly 7077a82458 [formerly 1ad439769c601fe61365f015bc56da0442553be5]] Former-commit-id: 7077a82458 Former-commit-id: e1852956e2	2012-11-08 14:40:05 -06:00
Ben Steffensmeier	d75b59622a	Issue #189 merge ncep changes to unified grid. ... Change-Id: I3dac0d3785f093c095f50799890744919edb1891 Former-commit-id: f62cf2713d [formerly e6b0751f5c] [formerly fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]] Former-commit-id: fbed67a208 Former-commit-id: 7c9341a3a6	2012-11-08 14:34:55 -06:00
Richard Peter	e7151070ee	Merge "Issue #189 fix another Unknown Model" into development ... Former-commit-id: 10138f3ae8 [formerly 7d8dfb9c01] [formerly 675b1666fd [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]] Former-commit-id: 675b1666fd Former-commit-id: ed90d0aa23	2012-11-08 13:43:37 -06:00
Richard Peter	b8ea93cb95	Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development ... Former-commit-id: 62e5aff255 [formerly 3450ca3cd3] [formerly 2e9cdbe43e [formerly 6fce68b90116d30cf090db64032322916276136b]] Former-commit-id: 2e9cdbe43e Former-commit-id: 4e0c207306	2012-11-08 13:30:27 -06:00
Dustin Johnson	d0867fedef	Issue #1302 Fix spring/project errors pointed out by CAVE spring changes ... Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c Former-commit-id: 1220f5167e [formerly ddaa681d8a] [formerly 9784b563cf [formerly 217a17fe79d9156f03597d72e51ab47325b00991]] Former-commit-id: 9784b563cf Former-commit-id: 9bb53555a9	2012-11-08 12:00:15 -06:00
Roger Ferrel	553344fb3b	Issue #1298 Changes for non-blocking IssuanceSiteIdDlg. ... Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba Former-commit-id: 709798659d [formerly e26b14a84d] [formerly 89617dda68 [formerly a2a52b7754d831406e591763930f419def7cb1eb]] Former-commit-id: 89617dda68 Former-commit-id: 05825bd6f3	2012-11-08 11:19:51 -06:00
Lee Venable	1e61d4bd08	Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development ... Former-commit-id: 6c0bb76679 [formerly be460c956e] [formerly e791e73a30 [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]] Former-commit-id: e791e73a30 Former-commit-id: 7b5f085643	2012-11-08 11:11:15 -06:00
Nate Jensen	bdbad943ef	Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development ... Former-commit-id: e3487942ac [formerly 96cb1ecc7f] [formerly 01072652dc [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]] Former-commit-id: 01072652dc Former-commit-id: 375c864d28	2012-11-08 11:08:48 -06:00
Lee Venable	9523ad6085	Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development ... Former-commit-id: c4526c5ba0 [formerly ff5083715b] [formerly c44f90f675 [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]] Former-commit-id: c44f90f675 Former-commit-id: 4a22ded443	2012-11-08 10:57:45 -06:00
Roger Ferrel	e7aa940f52	Issue #1298 Changes for non-blocking SaveDeleteComboDlg. ... Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f Former-commit-id: 359ee69fa6 [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]] Former-commit-id: eae8a68fd5 Former-commit-id: 24a2e79b28	2012-11-08 10:54:41 -06:00
Nate Jensen	fca1922f7b	Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development ... Former-commit-id: ca5db2ec43 [formerly 9038ff4e10] [formerly 48dae3a5e9 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]] Former-commit-id: 48dae3a5e9 Former-commit-id: 7da4882cfb	2012-11-08 10:34:56 -06:00
Mike Duff	7bed38a373	Issue #1317 - Update the stats config files ... Issue #1317 - Peer review comments. Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f Former-commit-id: e72c2822ad [formerly 1372c08cdc] [formerly 50f0c4c226 [formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]] Former-commit-id: 50f0c4c226 Former-commit-id: 688b7cce30	2012-11-08 10:15:41 -06:00
Max Schenkelberg	c219fcb112	Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time. ... Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b Former-commit-id: 5f0b4286ba [formerly 9aa4221fdf] [formerly c80dbffad8 [formerly 598e0268c95155536fb94798cc134d18b2566dbc]] Former-commit-id: c80dbffad8 Former-commit-id: 0a410412db	2012-11-08 10:08:38 -06:00
Dustin Johnson	2d1e886cf3	Issue #1302 Address peer review comments for 5-Data_Delivery/development merge ... Amend: More peer review comments Restore PreferencesHandler Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7 Former-commit-id: efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]] Former-commit-id: 1dbeb22893 Former-commit-id: 4222b24d09	2012-11-08 09:57:16 -06:00
Roger Ferrel	9a1283fb1e	Issue #1298 Changes for non-blocking FuzzValueDialog. ... Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef Former-commit-id: 3ad0d7d516 [formerly 023252fb84] [formerly c3f451f799 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]] Former-commit-id: c3f451f799 Former-commit-id: de534f5b43	2012-11-08 08:24:38 -06:00
Roger Ferrel	c1d0b744b2	Issue #1298 Chnages for non-blocking FindReplaceDlg. ... Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7 Former-commit-id: 94a4440625 [formerly 76f60240c5] [formerly 199475f671 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]] Former-commit-id: 199475f671 Former-commit-id: e072532a77	2012-11-08 07:57:56 -06:00
Bryan Kowal	b45ba40abf	Issue #1318 - fix first dat dependency issue. ... Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78 Former-commit-id: a4d6021e5f [formerly 079fdb33a0] [formerly 88a5451ce1 [formerly 0087827da79fedd354a227bad4e02aa76cebc684]] Former-commit-id: 88a5451ce1 Former-commit-id: 4f36912786	2012-11-08 07:27:39 -06:00
Nate Jensen	2fe69a5871	Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development ... Former-commit-id: 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]] Former-commit-id: 6b205399d4 Former-commit-id: e3208d48a0	2012-11-07 18:18:06 -06:00
Lee Venable	15842d7d22	Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development ... Former-commit-id: c8955b5425 [formerly 36c44db46b] [formerly 8956718961 [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]] Former-commit-id: 8956718961 Former-commit-id: eacc1ca32c	2012-11-07 17:38:21 -06:00
Lee Venable	d985b1c66e	Merge "Issue #1298 Changes for non-blocking CallToActionsDlg." into development ... Former-commit-id: b52b156faa [formerly c2e8c3a50e] [formerly 0dff0bf0b7 [formerly 9efe5208b4383d844c32fb7d8207ce48a04d27d6]] Former-commit-id: 0dff0bf0b7 Former-commit-id: 7fdfbae106	2012-11-07 17:38:03 -06:00
Brad Gonzales	69d7fe5cd0	Issue #1309 added units to Aggregate.java and AggregateRecord.java ... Amend: Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs. Removed Unit from AggregateRecord.java. Change-Id: If4f6fccb65c584055d68129874a398d6391155e7 Former-commit-id: 2a0b6ad151 [formerly 577df6943e] [formerly 4c49c9116d [formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]] Former-commit-id: 4c49c9116d Former-commit-id: b17893d7e0	2012-11-07 15:36:44 -06:00
Roger Ferrel	42f453ffca	Issue #1298 Changes for non-blocking ClearZoneGroupsDialog. ... Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0 Former-commit-id: ee038e811c [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]] Former-commit-id: 65d10be5d6 Former-commit-id: 35f3a3953c	2012-11-07 15:07:47 -06:00
Roger Ferrel	d6e00b6c35	Issue #1298 Changes for non-blocking CallToActionsDlg. ... Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc Former-commit-id: 4b0c701d69 [formerly 190922a233] [formerly 81de6cd45b [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]] Former-commit-id: 81de6cd45b Former-commit-id: d6560d7730	2012-11-07 14:35:38 -06:00
Steve Harris	4f243de928	12.12.1-1 baseline ... Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]] Former-commit-id: e1498006c7 Former-commit-id: 214fcd3b63	2012-11-07 12:41:20 -06:00
Lee Venable	412c29f116	Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development ... Former-commit-id: 074543d75e [formerly f368b93484] [formerly 297d2bbc9c [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]] Former-commit-id: 297d2bbc9c Former-commit-id: 24dd8a1bc7	2012-11-07 12:31:39 -06:00
Nate Jensen	531114d066	Merge "Issue #1273 product browser can now change order for grid" into development ... Former-commit-id: ce706de2d8 [formerly 335939d5c1] [formerly edadd4d018 [formerly f8354c7abdcc3188d1b20ca6804550b7203c7f7f]] Former-commit-id: edadd4d018 Former-commit-id: 3ab1b4ebb7	2012-11-07 12:26:54 -06:00
Roger Ferrel	35b0dc2cef	Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking. ... Change-Id: I6c5679269985eeb32d48afa44862632e00939a91 Former-commit-id: 8bf89ad495 [formerly 82abbbf0b7] [formerly 974431a13a [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]] Former-commit-id: 974431a13a Former-commit-id: c6749e3740	2012-11-07 11:27:36 -06:00
Nate Jensen	87a1701dd1	Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development ... Former-commit-id: 904120bb43 [formerly 2cf2e79f34] [formerly 433a79e689 [formerly bab65855839a69e29d90582e021d13ae439242ce]] Former-commit-id: 433a79e689 Former-commit-id: b3ecd946ff	2012-11-07 11:04:45 -06:00
Ben Steffensmeier	ac8cd2ef9a	Issue #189 fix another Unknown Model ... Former-commit-id: 643212a0ad [formerly eaa7e420df] [formerly 64f59b94e4 [formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]] Former-commit-id: 64f59b94e4 Former-commit-id: 89efb7cf22	2012-11-07 10:56:26 -06:00