xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2815 commits 31 branches 40 tags 3.8 GiB
Commit graph

2815 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Steffensmeier
c6150879d5 Issue #1869 ensure all uses ofdataURI in PDO use getter. 
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f

Former-commit-id: 05e7e0551f [formerly b3865f4efc] [formerly 268ee5ce30] [formerly 191f93653d [formerly 268ee5ce30 [formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]]
Former-commit-id: 191f93653d
Former-commit-id: e05811b6ef35d30d860c10a4de489276bfcbbd43 [formerly 50c5c5edfa]
Former-commit-id: 9c415e2f19
 2013-05-29 17:50:50 -05:00
Nate Jensen
043cc9f661 Issue #1989 remove high memory mode, reorganize wrapper.conf 
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]]
Former-commit-id: 148b20f57c
Former-commit-id: 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3]
Former-commit-id: 47d2bf99b9
 2013-05-29 12:06:15 -05:00
Benjamin Phillippe
a05a910ef9 Issue #2036 Implemented federated query capabilities 
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: ec9881b914 [formerly e16dc02a54] [formerly e7f17cb73caba0c3830169a9b341f90b58134c89 [formerly 4747f7d319]] [formerly d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]]
Former-commit-id: d5263b2b75
Former-commit-id: c7f0b0ec8eb2ed167a7e9c3286f24e4c5995969f [formerly 7cca4d8794]
Former-commit-id: c6af8b4d7c
 2013-05-29 10:34:22 -05:00
Dustin Johnson
6567c1b6ef Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development 
Former-commit-id: 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]
Former-commit-id: ac292f1242
Former-commit-id: af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56]
Former-commit-id: b6c87f42b1
 2013-05-29 09:27:30 -05:00
Richard Peter
6d11397746 Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development 
Former-commit-id: 16c3723df8 [formerly 6dd22b6dfa] [formerly bc0f1c88fc] [formerly 19272c9f28 [formerly bc0f1c88fc [formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]]
Former-commit-id: 19272c9f28
Former-commit-id: f547c20d9919ea9e58a5d840b157b5c4ea811426 [formerly 4be6514b57]
Former-commit-id: d26eac7bdf
 2013-05-29 09:26:10 -05:00
Nate Jensen
768a7dad60 Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables 
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]
Former-commit-id: 452858b86f
 2013-05-29 09:20:53 -05:00
Mike Duff
d292cfcca0 Issue #2016 - fix TS Trace toggle 
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 0babd4d9b4 [formerly 51de726e49] [formerly afbe294f4a] [formerly 5919687484 [formerly afbe294f4a [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]
Former-commit-id: 5919687484
Former-commit-id: 22647bf8f0aa609c257a8ef84d9b763053337b5e [formerly 66f4e6fe87]
Former-commit-id: d9fd9d297b
 2013-05-29 09:15:46 -05:00
Dustin Johnson
fb15a3e115 Issue #2038 More information when bandwidth manager can't schedule a subscription 
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef]
Former-commit-id: fff0172786
 2013-05-29 09:02:47 -05:00
Nate Jensen
8c756705c5 Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development 
Former-commit-id: d7391928f9 [formerly ba5e69c7ff] [formerly 7c1e6e8b09] [formerly 256a67a9f9 [formerly 7c1e6e8b09 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]
Former-commit-id: 256a67a9f9
Former-commit-id: 729de173162ed2d04e927cd7b463d674c8aac59e [formerly 2fe1960ebb]
Former-commit-id: ac838f62dd
 2013-05-28 15:43:31 -05:00
Nate Jensen
74bce32a88 Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development 
Former-commit-id: 5748201316 [formerly cba08666e6] [formerly 053e37ee76] [formerly e846e539fb [formerly 053e37ee76 [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]
Former-commit-id: e846e539fb
Former-commit-id: 00638cbac9800172a1c3e7bb571d3fdb66dc2446 [formerly 5c60582df2]
Former-commit-id: 607e980d45
 2013-05-28 15:43:23 -05:00
Max Schenkelberg
b2a9cba9c7 Issue #1638 Fixed text box drawn to be correct size with padding around text 
Amend: Fixed format string issues with topo resource and colorbar labels

Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114

Former-commit-id: 98bdd5f786 [formerly a88ca5e983] [formerly 13ff44fdee] [formerly 3175563336 [formerly 13ff44fdee [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]
Former-commit-id: 3175563336
Former-commit-id: dd33ea8ed195002c13b9b3e4e8d6d9dda70e2d8e [formerly 9932114218]
Former-commit-id: 4e8d25b317
 2013-05-28 15:00:59 -05:00
Nate Jensen
e94a5b5494 Issue #1967 fix annoying warnings, remove unused preferences page 
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: 755dd253bb4939ea763815cd0328c8e0a0f2daca [formerly 0b48f54f47]
Former-commit-id: f7817d7c41
 2013-05-28 14:30:26 -05:00
Roger Ferrel
618feeda6d Issue #1966 Changes to CategoryConfig to make parsing more efficent. 
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 24f1c70168 [formerly 365af6b7ce] [formerly cbee731447] [formerly 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]
Former-commit-id: 9263b54845
Former-commit-id: e443885c0974b7dc457a2ea698d05b926b780848 [formerly fce5c2ca1e]
Former-commit-id: 838eacc802
 2013-05-28 13:21:08 -05:00
Max Schenkelberg
ae669fec59 Issue #1638 Added support for null search constraints for updates 
Amend: Fixed comment, added SW history

Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515

Former-commit-id: a91db9c1e3 [formerly 21693d6913] [formerly 1bc4437154] [formerly 807e4501c8 [formerly 1bc4437154 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]]
Former-commit-id: 807e4501c8
Former-commit-id: 1bee1ded94bdf16e7d08cd81e11f8d384dfa0585 [formerly 036b11c84e]
Former-commit-id: 6c9fedb312
 2013-05-28 12:59:27 -05:00
Nate Jensen
4cb8b766b5 Issue #2037 made imageMap concurrent to fix memory leak 
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f

Former-commit-id: e3caafe7ad [formerly 84444b6ba9] [formerly f77f350eb3] [formerly 68eba61c28 [formerly f77f350eb3 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]]
Former-commit-id: 68eba61c28
Former-commit-id: 6b1d9083d66d59225023a96ec8b6bbd68b7d1d44 [formerly af7fcf7e8e]
Former-commit-id: 50d981285d
 2013-05-28 09:21:57 -05:00
Dustin Johnson
d8cdc3c8c5 Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development 
Former-commit-id: c694d523db [formerly f4ad0218f2] [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]]
Former-commit-id: 197a5cef1b
Former-commit-id: 5e3e07d672821d4ad14f8aa22c072b6f5438ab36 [formerly a8fc7295ef]
Former-commit-id: 8d00ba1978
 2013-05-28 06:43:35 -05:00
Ben Steffensmeier
84eac56ea0 Issue #1869 Fix unique checking for things without dataURI and with subtables. 
Former-commit-id: c2ca1551f6 [formerly cdf8e7daaa] [formerly 37df42633ad7fbcc51bf28d03f3ac6f82040b570 [formerly 3b6156843e]] [formerly 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]]
Former-commit-id: 7be9ad1f8b
Former-commit-id: dc6540df2c7c7dee778134e44e92281971fe7bb5 [formerly 2a8a87e564]
Former-commit-id: c71afc4198
 2013-05-24 16:40:21 -05:00
Mike Duff
e7790088ac Issue #2020 - Implement Shared Subscriptions Cave-side. 
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: e3804d48ec [formerly 80b1f95f0c] [formerly 9cee487b71f7329909bd95a36c355637b4bb4978 [formerly 192ce891d0]] [formerly b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]
Former-commit-id: b6b01c3e81
Former-commit-id: bbd9728434e2386f696b8016882158b60232d706 [formerly a9004667b7]
Former-commit-id: 6ee0ef55ff
 2013-05-24 09:20:55 -05:00
Nate Jensen
7fa0ba3069 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart 
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Former-commit-id: 29b3e508e2 [formerly 631567ced9] [formerly 7d1fc954f6] [formerly 7d233ff590 [formerly 7d1fc954f6 [formerly ef313253ec669167b9e1deb2562170c117123937]]]
Former-commit-id: 7d233ff590
Former-commit-id: 6b94d7fe2342db507b4bed04b7cd4e98b8e66316 [formerly 9e37d21dc6]
Former-commit-id: e976a4c94e
 2013-05-24 09:13:10 -05:00
Bryan Kowal
1f0ad9a4a0 Issue #1927 - mimic the EDEX pde build capability for building features outside of the common baseline 
Amend: do not run the clean task after building any wa features

Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a

Former-commit-id: 45c9e4d203 [formerly b3d40951ba] [formerly 8145305580] [formerly a2148650b4 [formerly 8145305580 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]]
Former-commit-id: a2148650b4
Former-commit-id: ee8cf990b046e62c310f31e4215068b2761e859e [formerly 66cf28ab84]
Former-commit-id: c658131c84
 2013-05-23 23:52:35 -05:00
Lee Venable
dea017445b Issue #1964 - inital GUI creation 
Change-Id: I47d58880066fa2ef284e8911390163624b873381

Former-commit-id: 082df6ccd5 [formerly 4ecb65e4a2] [formerly ae020d3960] [formerly c3328077c8 [formerly ae020d3960 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]]
Former-commit-id: c3328077c8
Former-commit-id: b12a8641a04e64e274355ad4f613a4d32ce96f80 [formerly 9a72abf083]
Former-commit-id: 041d612ea2
 2013-05-23 17:16:31 -05:00
Roger Ferrel
2e54bc5af6 Issue #1966 Feature plugin for archive. 
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

Former-commit-id: ff1dac4143 [formerly 75a2fc4723] [formerly 9533bb686d] [formerly e5867cbb79 [formerly 9533bb686d [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]]
Former-commit-id: e5867cbb79
Former-commit-id: 3c4155b82503781781c7dbf83bdca26072bfdbec [formerly bdecc2f309]
Former-commit-id: ef14a57411
 2013-05-23 13:43:53 -05:00
Nate Jensen
3b56918970 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc 
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]
Former-commit-id: a84a6fe6ae
 2013-05-23 11:20:40 -05:00
Nate Jensen
a9a2c23e23 Merge "Issue #1989 use camel's built-in DirectVm component" into development 
Former-commit-id: d7f5eea402 [formerly 876d741ab8] [formerly b8f3307f50] [formerly 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]]
Former-commit-id: 3b058175fe
Former-commit-id: 8e6e7a123de7f2be6cbdd2bdeddbc88cf44a27ef [formerly 71d9076fe2]
Former-commit-id: 3287b6ace2
 2013-05-23 10:43:15 -05:00
Richard Peter
b087cac180 Merge "Issue #1989 fix clustered routes suspending/starting" into development 
Former-commit-id: 25ace04a31 [formerly edd70dfe47] [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]]
Former-commit-id: 9ca63e7d26
Former-commit-id: e52295b07065a9723da62e04d0bd89a3ddba7ec9 [formerly 7a02b90690]
Former-commit-id: e150a51871
 2013-05-23 10:10:51 -05:00
Nate Jensen
b8e6b1a083 Issue #1989 use camel's built-in DirectVm component 
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]
Former-commit-id: 882296f823
 2013-05-23 10:06:28 -05:00
Greg Armendariz
ddb7f13f18 Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development 
Former-commit-id: 362195f3a3 [formerly 8cf9ef2527] [formerly 2089732453] [formerly db8cf0d35f [formerly 2089732453 [formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]]
Former-commit-id: db8cf0d35f
Former-commit-id: a53888056ffd5a6cde39461a7854aaf44b0cb313 [formerly 287f078150]
Former-commit-id: c7e028a6ff
 2013-05-23 09:10:41 -05:00
Greg Armendariz
806a417f0f Merge "Issue #1927 - patch ant includegen task" into development 
Former-commit-id: cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]
Former-commit-id: a4457f8c83
Former-commit-id: 8b49a871cbda6887cd2b43c7a35a68e7f16bf20e [formerly 270269219c]
Former-commit-id: 7c97422501
 2013-05-23 09:10:11 -05:00
Lee Venable
664405e247 Merge "Issue #1966 Feature place holders for the dialogs." into development 
Former-commit-id: 8f2b44a49e [formerly 6e7ed9e02b] [formerly cb156533f4] [formerly 7245dff8b9 [formerly cb156533f4 [formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]]
Former-commit-id: 7245dff8b9
Former-commit-id: 1e5540cfa0e146921b014d691a8a622f845a82f2 [formerly 8b13517100]
Former-commit-id: a551d4b586
 2013-05-23 09:05:11 -05:00
Richard Peter
f43c2d9d61 Merge "Issue #1965 Add org.apache.commons.io package to cots." into development 
Former-commit-id: 4dc4b4131d [formerly 895866b6d9] [formerly df415f7088] [formerly 041c0ad948 [formerly df415f7088 [formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]]
Former-commit-id: 041c0ad948
Former-commit-id: 261ad7af85056f8723367c153d62ac7a260ce0a3 [formerly 08f45fe832]
Former-commit-id: b28bb05fde
 2013-05-23 08:52:47 -05:00
Roger Ferrel
3aa439216d Issue #1966 Feature place holders for the dialogs. 
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]]
Former-commit-id: d35424df4f
Former-commit-id: 71942aa83d41336218c476f9a4456699fc337e09 [formerly 2d4434119d]
Former-commit-id: 760b0f3366
 2013-05-23 07:36:15 -05:00
Bryan Kowal
b85da4c89f Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui 
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8

Former-commit-id: a73d607544 [formerly 73dfc7a5e1] [formerly bfd08efaa9] [formerly 8061922b70 [formerly bfd08efaa9 [formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]]
Former-commit-id: 8061922b70
Former-commit-id: 7f883b486090bea47bbfeee228a09574a9b949d0 [formerly 83c1e3127e]
Former-commit-id: 1469cb15d6
 2013-05-22 22:34:45 -05:00
Bryan Kowal
0f23a3a390 Issue #1927 - patch ant includegen task 
Former-commit-id: fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]
Former-commit-id: 24c0728db9
Former-commit-id: 9b61bbda811981fe5d3e4a80ed88b6107b650443 [formerly 2a17b35e83]
Former-commit-id: e6cfad1759
 2013-05-22 18:00:43 -05:00
Nate Jensen
1aa7bda4f9 Issue #1989 fix clustered routes suspending/starting 
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: 516eca979e [formerly 57e560b745] [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]]
Former-commit-id: a6d525ec96
Former-commit-id: b2203d5e824a80b3594b409d049bc1148ae5c2d7 [formerly 431e97742d]
Former-commit-id: 5525412779
 2013-05-22 16:39:24 -05:00
Steve Harris
d477564678 Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]
Former-commit-id: 389eefd1f9
 2013-05-22 16:13:08 -05:00
Steve Harris
a6bb8b38dd Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202]
Former-commit-id: 026674d0b2
 2013-05-22 16:10:04 -05:00
Steve Harris
fb41995981 13.4.1-12 baseline 
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]
Former-commit-id: b745b332ae
 2013-05-22 16:42:39 -04:00
Benjamin Phillippe
09126056a6 Issue #2022 Removed data delivery project from feature 
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd

Former-commit-id: feeb6126bb [formerly 0308f217d6] [formerly 4d1252523e] [formerly 3e9fe9892e [formerly 4d1252523e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]]
Former-commit-id: 3e9fe9892e
Former-commit-id: fa6325803c190e9467895d087ac2f99cbe7f7004 [formerly ce20ead9e7]
Former-commit-id: 8cae1b56f1
 2013-05-22 12:49:46 -05:00
David Gillingham
60850d6f8a Issue #1759: Fix regression to ISC request reply due to missing import. 
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: 511098fffd [formerly 2555cf9819] [formerly fc3c7eb9fbf37bb7d9daf99d556d79bdf45aeb63 [formerly 5cba0f5e40]] [formerly 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]
Former-commit-id: 801c659108
Former-commit-id: 7464c78970ff1efe18387d6d2105db0eb2e2d4ad [formerly 60aeb71652]
Former-commit-id: 1471a7fa34
 2013-05-22 11:42:08 -05:00
Benjamin Phillippe
99ed99e6d3 Issue #2022 Added registry federation capabilities 
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028

Former-commit-id: aab1aa57d4 [formerly 7a908bbeaf] [formerly b9f2bde20e] [formerly c3a376475b [formerly b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]]
Former-commit-id: c3a376475b
Former-commit-id: 97b5016d0f29b44e02a2e20c7079fd9348e0adf5 [formerly ad039bae0c]
Former-commit-id: 1c50a8b9d3
 2013-05-22 11:38:42 -05:00
Brad Gonzales
6811365078 Issue #1965 Add org.apache.commons.io package to cots. 
Change-Id: Ib444054da83b7e7d6062c84e3e1a705a3d4f63ed

Former-commit-id: 819160fcde [formerly 33045d73a6] [formerly 4bc98160ab] [formerly 598a7a221e [formerly 4bc98160ab [formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]]]
Former-commit-id: 598a7a221e
Former-commit-id: ca35c74668d7cc1c2b516ca39d37aeba84ced527 [formerly 858f68fc5c]
Former-commit-id: 6d483764e3
 2013-05-21 16:29:01 -05:00
Richard Peter
b3c32889b1 Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development 
Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]
Former-commit-id: b4344d3c04
Former-commit-id: 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1]
Former-commit-id: 1bbddf8fdf
 2013-05-21 13:07:51 -05:00
Greg Armendariz
bb67a4fe0a Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development 
Former-commit-id: da4e717772 [formerly fce1512b37] [formerly 20a9ad95e5] [formerly eecbf2718a [formerly 20a9ad95e5 [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]]
Former-commit-id: eecbf2718a
Former-commit-id: faf103cebb41e879d86ec60b59e142420585d7d2 [formerly 525cd5c751]
Former-commit-id: cd96d6d2e6
 2013-05-21 12:24:19 -05:00
Richard Peter
ffe0b35085 Merge branch 'omaha_13.4.1' (13.4.1-11) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]
Former-commit-id: 76f11f00ae
 2013-05-21 12:11:21 -05:00
Bryan Kowal
1d462b582b Issue #1952 - remove duplicate filesystem hierarchy 
Former-commit-id: b14dd898ac [formerly e9abe7185b] [formerly 4b8868ca54] [formerly 7027f97e2a [formerly 4b8868ca54 [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]]
Former-commit-id: 7027f97e2a
Former-commit-id: 82aa40c3c40fcbbba4f5844ff450074ef0571e57 [formerly 62d21498a6]
Former-commit-id: 61a613b490
 2013-05-21 11:09:57 -05:00
Nate Jensen
e464b37ce3 Merge "Issue #2001 fix message handling" into development 
Former-commit-id: 2bf84e9044 [formerly 8438eb1b4a] [formerly 737b265c34] [formerly 4d519da3a9 [formerly 737b265c34 [formerly 50ea25c2563c109b92e4251c05174b9b3d077909]]]
Former-commit-id: 4d519da3a9
Former-commit-id: 23644d491fafa6221b12115945c203db822dd9d5 [formerly d2cccd342b]
Former-commit-id: 0fc260728b
 2013-05-21 11:00:32 -05:00
Richard Peter
8e252f89f0 Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878]
Former-commit-id: 21b87e9ea7
 2013-05-21 10:35:00 -05:00
Nate Jensen
22d9440b6a Issue #2001 fix message handling 
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: deea93d7e7 [formerly 56309efafe] [formerly 1ab118958f] [formerly 960bc6db69 [formerly 1ab118958f [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]
Former-commit-id: 960bc6db69
Former-commit-id: c70110d442b8e122c8572c0d2850cbac6c42bc1a [formerly e575c19ab6]
Former-commit-id: a06bb176ba
 2013-05-21 10:26:18 -05:00
Nate Jensen
1c581fd607 Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development 
Former-commit-id: 8e7905197a [formerly 18e6f84418] [formerly f16606cfba] [formerly d02ce9d389 [formerly f16606cfba [formerly a6b4bd31146009e3d958efde759408daec52d2f4]]]
Former-commit-id: d02ce9d389
Former-commit-id: 8f11dd9f2fd571f626dc03f0b07328cca234dcf7 [formerly 80b1a9d18c]
Former-commit-id: 51a31a08ca
 2013-05-21 10:22:24 -05:00
Dustin Johnson
bf3f162fc9 Merge "Issue #2000 Subscription overlap configuration GUI" into development 
Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967]
Former-commit-id: bd65447c9f
 2013-05-21 08:19:34 -05:00