Commit graph

3384 commits

Author SHA1 Message Date
Mike Duff
0d2c072dce Issue #2263 - remove build failure on unit test failure
Change-Id: I921470904bf894cf49c7952b6c5feba3caf5b83f

Former-commit-id: e1e84be2b9 [formerly 18f0ef68db] [formerly 367420ad48] [formerly 62c3e2107f [formerly 367420ad48 [formerly 57870e24ca02e1cb66705cac79fb8856685a56b3]]]
Former-commit-id: 62c3e2107f
Former-commit-id: 82b156d8e15bf36f13a55daced70457967e7b450 [formerly cac7a8d0da]
Former-commit-id: bd7c39692a
2013-08-13 14:54:24 -05:00
Nate Jensen
98b8bcaf15 Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
Former-commit-id: ee45599b10 [formerly b435eba010] [formerly f8d8e312f3] [formerly d995e29afe [formerly f8d8e312f3 [formerly 32053b62812fc375aebb5af21af1149b2b4944c5]]]
Former-commit-id: d995e29afe
Former-commit-id: d45c592549b4132053bd6601c4ebc9e98574f455 [formerly 759348ba2e]
Former-commit-id: f8a839a0a1
2013-08-13 12:34:44 -05:00
Greg Armendariz
23c92a0580 Merge "Issue #2164 - fix 13.6.1 build" into development
Former-commit-id: 0e4fb54616 [formerly 8bcfc737e6] [formerly 34b428b5a0] [formerly 84413bd66f [formerly 34b428b5a0 [formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]]
Former-commit-id: 84413bd66f
Former-commit-id: f27556222bac4d9edcd174ff7f0a255be940034e [formerly dbae6131cb]
Former-commit-id: 02dfe84d31
2013-08-13 12:34:04 -05:00
Nate Jensen
f63ade7443 Merge "Issue #2142 removing more dependencies on edex.common" into development
Former-commit-id: d6a7d77ae6 [formerly 86e823cc9f] [formerly 260ea8a0b9] [formerly 576b8fa830 [formerly 260ea8a0b9 [formerly 725b2654ce507b302ac111a740f27460799ecd80]]]
Former-commit-id: 576b8fa830
Former-commit-id: 3bce82da0dd11c2290eaa18420eb44d314e94d13 [formerly 295b29860b]
Former-commit-id: 12fd3b3b8d
2013-08-13 12:32:09 -05:00
Matt Nash
5803a64603 Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186

Former-commit-id: 9289576049 [formerly 80172b1aba] [formerly 5aeda85fca] [formerly dda3d78b48 [formerly 5aeda85fca [formerly 1c72a8cfeeb9263f8d406002de9703a1ee73f40e]]]
Former-commit-id: dda3d78b48
Former-commit-id: 1d7ef8f99d91ca142fcc53e65be8304b5a111b8c [formerly ebb291e6c3]
Former-commit-id: fc6e2bf0c3
2013-08-13 11:59:35 -05:00
Bryan Kowal
ac9f30c364 Issue #2164 - fix 13.6.1 build
Former-commit-id: 17c4406504 [formerly dbaa6da3ea] [formerly 4604653241] [formerly 586b7646f0 [formerly 4604653241 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]]
Former-commit-id: 586b7646f0
Former-commit-id: 35049ac07bfb3bc55f39b499e9526b76e59c3cf0 [formerly 8b3827c745]
Former-commit-id: d96ca6737c
2013-08-13 11:13:52 -05:00
Richard Peter
2be0bfe06c Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
Former-commit-id: 64496ad332 [formerly 3763073459] [formerly 3f6d8a28da] [formerly 60831564a0 [formerly 3f6d8a28da [formerly c4cc04a6b759f934a556004a242da4dfa4709653]]]
Former-commit-id: 60831564a0
Former-commit-id: b8c51d60a2d0aa03907fcbc0718b69115b70690e [formerly a4d9a82ca5]
Former-commit-id: 35a3e81478
2013-08-13 10:10:07 -05:00
Nate Jensen
766da72c20 Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf

Former-commit-id: 5e24a11e06 [formerly 78256fd891] [formerly df95db8f78] [formerly 0c92461c65 [formerly df95db8f78 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]]
Former-commit-id: 0c92461c65
Former-commit-id: 19ebf5cd40eb632cc1ff7e301922bcea379b8369 [formerly bf821fdbe0]
Former-commit-id: 988ac46c2b
2013-08-13 09:09:05 -05:00
Nate Jensen
6d5db1a0ef Merge "Issue #2162: Add performance logging for GFE edit area query evaluation." into development
Former-commit-id: 9424d4d05e [formerly 9e283f0640] [formerly bb955e6ee7] [formerly e6fc534b8c [formerly bb955e6ee7 [formerly 731fb620ed8dec721c1fe4bbc0b55b4e11e1283f]]]
Former-commit-id: e6fc534b8c
Former-commit-id: a3cf360d5a76db93070e8919ea77aed528d12fca [formerly ea4355e018]
Former-commit-id: c370d3b7d0
2013-08-13 08:58:50 -05:00
Nate Jensen
b4d5ba2d2c Merge "Issue #2033 Fixed alertviz startup" into development
Former-commit-id: 74a6174e78 [formerly 5b3334b2ff] [formerly 58e7b31de9] [formerly c62139c327 [formerly 58e7b31de9 [formerly 3312f297f36ab27d9f9fb74d48bf291f60292e5a]]]
Former-commit-id: c62139c327
Former-commit-id: 0e55127933254744d7ac69d6ba3078acd0ce5ab4 [formerly 95010dbbf4]
Former-commit-id: d9e4590947
2013-08-13 08:56:24 -05:00
Nate Jensen
d037198231 Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
Former-commit-id: 7bbc2ec7d7 [formerly ce20de02a7] [formerly 5948ebca87] [formerly 8101c961d4 [formerly 5948ebca87 [formerly e9e46b68652caff85b2206180856654876f55f12]]]
Former-commit-id: 8101c961d4
Former-commit-id: e0c53384ed3969b5434ffaf4846c3219ee84cc83 [formerly 75f31b372e]
Former-commit-id: 835516348f
2013-08-13 08:56:01 -05:00
Max Schenkelberg
971c4d5184 Issue #2033 Fixed alertviz startup
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5

Former-commit-id: 7598c95fd9 [formerly c825e2f0e2] [formerly 49381ac481] [formerly 3f35c335c9 [formerly 49381ac481 [formerly 1cdd5eab835f2df85f8ebc82d0bea79bca3977da]]]
Former-commit-id: 3f35c335c9
Former-commit-id: afbfb22a6fac492f6776c223cc090e8fa76b92f2 [formerly 17a28bf292]
Former-commit-id: c34cc88aa8
2013-08-12 17:37:15 -05:00
Nate Jensen
342649b95b Issue #2142 more removing of dependencies from common plugins to edex.common
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f

Former-commit-id: c137e92198 [formerly 23802cfe02] [formerly 28c79d0a56] [formerly c2bf2163d9 [formerly 28c79d0a56 [formerly 2342170ce4cf51f12759afa26fc5af46f35c6188]]]
Former-commit-id: c2bf2163d9
Former-commit-id: 80525ffd198786b7cfb596c35ca6de95bc0f8008 [formerly 018845db8f]
Former-commit-id: 2117ec71c6
2013-08-12 15:41:39 -05:00
Richard Peter
6dd74d080f Merge "Issue #2224 Changes to have DataSet in configuration." into development
Former-commit-id: 201004e203 [formerly 5548ae76b1] [formerly d8124958b5] [formerly 2de533cbbf [formerly d8124958b5 [formerly d4a46b8283ac0cb47f62c43b999d7f119161e08d]]]
Former-commit-id: 2de533cbbf
Former-commit-id: 36f4d2af4006b315ff6170d430184188400680b2 [formerly 4605595354]
Former-commit-id: e9651a43ed
2013-08-12 15:01:51 -05:00
Nate Jensen
5d26df965e Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
Former-commit-id: 04d2a4741d [formerly 1473d04e25] [formerly 82472058e9] [formerly de38280317 [formerly 82472058e9 [formerly 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521]]]
Former-commit-id: de38280317
Former-commit-id: fbcdcf125155de037dae9b094e3b3d3c7c63fb4c [formerly f6c4ec164f]
Former-commit-id: 65c7c9e9b3
2013-08-12 14:16:29 -05:00
Ben Steffensmeier
f80b7d3112 Issue #2245 make DataTimeCompatible Java 6 compatible.
Former-commit-id: 62961949ba [formerly 00f61c4858] [formerly 67c84f2fb8] [formerly 46c3413805 [formerly 67c84f2fb8 [formerly e32655d3daef131c451d972c7b2747b01e49d840]]]
Former-commit-id: 46c3413805
Former-commit-id: 8897a82fdb7c4ccf99db2fe277299859be6243af [formerly 64b1d5d9dd]
Former-commit-id: 16dd725cc1
2013-08-12 13:43:43 -05:00
Roger Ferrel
3ff13b5a3a Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8

Former-commit-id: 09360f30c5 [formerly 705a3482f8] [formerly 1863d4d65b] [formerly 3ecf95b18a [formerly 1863d4d65b [formerly de48fa389414c87ba557b70a480ce6b45144f4aa]]]
Former-commit-id: 3ecf95b18a
Former-commit-id: d6bebdca540bfacd287d4ffd9f21c25794c91d4f [formerly 3d9be94e7e]
Former-commit-id: 8884343d89
2013-08-12 12:50:12 -05:00
Nate Jensen
f3618a3bca Issue #2142 remove some uf.common dependencies on edex.common
Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887

Former-commit-id: 525666a23f [formerly 2f641b40d7] [formerly 94096b8f65] [formerly 48758e64ef [formerly 94096b8f65 [formerly c0c65319cd731aea51f730f700b0fda3c6992d38]]]
Former-commit-id: 48758e64ef
Former-commit-id: 7f46154e70296dfe6b057533331f4761d699edc2 [formerly ce0c8f3259]
Former-commit-id: f69d155d26
2013-08-12 12:47:51 -05:00
Greg Armendariz
98f05beab6 Merge "Issue #2254 - Fix the nightly automated junit tests" into development
Former-commit-id: 8ac14d0f1b [formerly 773a7a4903] [formerly 1386598257] [formerly 594198b5a5 [formerly 1386598257 [formerly 347fe4615e9902892a95f13d13cfd8c0bcd7c39d]]]
Former-commit-id: 594198b5a5
Former-commit-id: a35a78e5eda85ce674a232de597ca6fd183a8a1f [formerly 3c0c7ee56b]
Former-commit-id: 20cffb4cad
2013-08-12 12:25:17 -05:00
David Gillingham
ef8d1ab050 Issue #2162: Add performance logging for GFE edit area query evaluation.
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338

Former-commit-id: 11384d2198 [formerly ed39a866f0] [formerly 07312fe01f] [formerly 98f48e5a64 [formerly 07312fe01f [formerly 7d24f69078e324c56db448f293d3094df83f5c34]]]
Former-commit-id: 98f48e5a64
Former-commit-id: 0527b1c234a834d22bfd7b3815bbcd2f2a5ee8ef [formerly 0b8a48b12e]
Former-commit-id: ffa45d26d9
2013-08-12 12:18:02 -05:00
Nate Jensen
b886cddc80 Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
Former-commit-id: d4dbb8fe98 [formerly 81510bc3b7] [formerly 9f0698fe75] [formerly c5b96690ce [formerly 9f0698fe75 [formerly 971df482819466e48efcbc3a1b01eab88687436a]]]
Former-commit-id: c5b96690ce
Former-commit-id: a8203aeffc85324d517d20a945883c7a079b265e [formerly b18fa88aaf]
Former-commit-id: 0261071228
2013-08-12 12:06:53 -05:00
Ben Steffensmeier
4376d4c066 Issue #2245 Make all DataTime comparisons consistent.
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d

Former-commit-id: e39f55eeb7 [formerly 7e65ad5fe8] [formerly 479f72bc10] [formerly 9901e7a622 [formerly 479f72bc10 [formerly b175ec81e61f18b42432e0245cddb953fbc5963f]]]
Former-commit-id: 9901e7a622
Former-commit-id: 9bb59859513212d7b568900c9fea7ec4afdb0e0a [formerly 5071cf2fce]
Former-commit-id: 98dab7a5bd
2013-08-12 11:37:51 -05:00
Greg Armendariz
99315891ce Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into development
Former-commit-id: 949e3974ef [formerly ab41d0cdb6] [formerly 5ea53e1c0f] [formerly 487b751143 [formerly 5ea53e1c0f [formerly a978af636454b1c1ef5287869de3b91ceac52ee1]]]
Former-commit-id: 487b751143
Former-commit-id: b1c84fa3b3553a3c0e0d8722e08ad6ea8340df09 [formerly fd306c44bd]
Former-commit-id: 84360a83de
2013-08-12 11:14:03 -05:00
Richard Peter
76acb0349e Merge "Issue #2222 Changes to allow display of all selected data." into development
Former-commit-id: e61f9667c6 [formerly bb2dfdbcce] [formerly b6c34162c6] [formerly b89bb1e8a0 [formerly b6c34162c6 [formerly 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2]]]
Former-commit-id: b89bb1e8a0
Former-commit-id: 5df3d208a95eb5996e46425cd66aab9d4d336f54 [formerly a3895de934]
Former-commit-id: 6d713faf72
2013-08-12 11:09:55 -05:00
Nate Jensen
d9cf3a6d3f Merge "Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base" into development
Former-commit-id: 5fafd2f64e [formerly ba4ca59667] [formerly 564c26361f] [formerly 2245b2f7a6 [formerly 564c26361f [formerly 187dd7ebbada6ef7d2d6cdddd9d9354fc73c0fc8]]]
Former-commit-id: 2245b2f7a6
Former-commit-id: a5bea3938a36d8f40e4ad78c67ad582ea9a1ec66 [formerly 47e3e698de]
Former-commit-id: e82ecb755a
2013-08-12 09:49:22 -05:00
Mike Duff
3ca0a91246 Issue #2254 - Fix the nightly automated junit tests
Change-Id: I8e595c097682ddd01cebf23fedbe5380d078085a

Former-commit-id: 5a3578accd [formerly f25d52e1e7] [formerly 9558b20e7c] [formerly 832e61f938 [formerly 9558b20e7c [formerly 96eddd84c4f1287fa56e5356831961209c76331a]]]
Former-commit-id: 832e61f938
Former-commit-id: 00a0bf66e1141f15efb1bb46edae8f4643e7d7c9 [formerly 7b36ba1a19]
Former-commit-id: 7d5413647c
2013-08-12 09:25:21 -05:00
Brad Gonzales
030b466b8a Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals.
Change-Id: If1037781d8fbf0e3a88556ef4401fb77621187d7

Former-commit-id: b0779c9b4f [formerly 5ebe8ee093] [formerly 21c1b35c8b] [formerly d5ee61dc2b [formerly 21c1b35c8b [formerly 9ddb76125f51eb0ea73b7bb54a77e84fb32349e4]]]
Former-commit-id: d5ee61dc2b
Former-commit-id: 1f321bfc5353c97375cf29fe6b5a3b7362000fbf [formerly 780062acf3]
Former-commit-id: 2468077e8b
2013-08-09 15:42:38 -05:00
Max Schenkelberg
cc6950107f Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f

Former-commit-id: cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: 0d46128ba8af16237227239c716ce61a2bd99042 [formerly 75c95e83ef]
Former-commit-id: 4fdb3c8306
2013-08-09 14:24:49 -05:00
David Gillingham
eb1b2bda8b Issue #1856: Fix HazardRecovery to work in SimulatedTime mode.
Change-Id: I811f9a87ac57c3682f282c45f5b380d7773c805b

Former-commit-id: b498e52510 [formerly beb78ae48d] [formerly 5743aebcbe] [formerly 640452837c [formerly 5743aebcbe [formerly db77c4ea478fbaaf9a9e1b64d9df008874a71548]]]
Former-commit-id: 640452837c
Former-commit-id: a67e0e6bd7abdc943eb4fe37a1a2d56de8d62a8c [formerly f0fbc3766d]
Former-commit-id: d42ae1701d
2013-08-09 10:48:13 -05:00
Bryan Kowal
eb1e753dff Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.


Former-commit-id: 21b835c10b [formerly ff9dd063b9] [formerly b88d324aac] [formerly 620fb06773 [formerly b88d324aac [formerly a29d3008676c2291c27ceed4e7aad10289a64569]]]
Former-commit-id: 620fb06773
Former-commit-id: 43ba1fbf6a0c585906570bfbeac1fcd89f1ea393 [formerly 083ca82113]
Former-commit-id: 10af499f87
2013-08-08 17:45:58 -05:00
Roger Ferrel
e402e512c7 Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: 33e860772d [formerly af8668a4c4] [formerly f167ec49cd] [formerly efed5777e9 [formerly f167ec49cd [formerly b49c3147991d87c32aba619521502438c11eb8f6]]]
Former-commit-id: efed5777e9
Former-commit-id: 02efe6e352bb2e5531596957581bbb2f825eb545 [formerly 96e6d1f7cc]
Former-commit-id: 2dc203ebdf
2013-08-08 16:15:34 -05:00
Nate Jensen
5e3e8941ec Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly a9f5465c99 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]
Former-commit-id: a9f5465c99
Former-commit-id: 30ae61555b26d85ada7506a3e461b768c8ce506c [formerly fe3adecbc2]
Former-commit-id: 71a7b044ae
2013-08-08 14:46:52 -05:00
Ron Anderson
04f7c60a5f Merge "Issue #2027 upgrade version of derby" into development
Former-commit-id: 40af78db23 [formerly a85bfb298b] [formerly b43b05fced] [formerly 92741fe6dd [formerly b43b05fced [formerly d3867fbea055fa4b4fac77bc1524c2999db25c23]]]
Former-commit-id: 92741fe6dd
Former-commit-id: e19fa9210a5d5b214f8dcd6e1513c37b618ea6a5 [formerly 609a5c4a7c]
Former-commit-id: 6b3788382b
2013-08-08 12:48:40 -05:00
Richard Peter
b68ad082d2 Merge "Issue #2191 Addressing comments from previous change" into development
Former-commit-id: cf63f60a44 [formerly 2f6af1cf34] [formerly 95357f0b2c] [formerly 40c4593896 [formerly 95357f0b2c [formerly 8a9557269526e7f8efd21a8c46d50f30fb9f7b6e]]]
Former-commit-id: 40c4593896
Former-commit-id: 75c5dc717c737dd1c66f1a0fc4de0deaebe2a03b [formerly 88768c369a]
Former-commit-id: a7ac9871bb
2013-08-08 09:58:18 -05:00
Benjamin Phillippe
f14971f554 Issue #2191 Addressing comments from previous change
Change-Id: Ib7e23bdfbecebe7141ef2d086d7b049530d11ce2

Former-commit-id: 00cb6b91da [formerly a7258dd8f6] [formerly 59a9aeabf0] [formerly 3c7ad386ed [formerly 59a9aeabf0 [formerly c2d5beba2c9656d80851aee1a7beabe4807c14f6]]]
Former-commit-id: 3c7ad386ed
Former-commit-id: 434e7062b12ec6246bd87fa9773f317f741ec433 [formerly dc2e0f6a7b]
Former-commit-id: 2c2ed655aa
2013-08-08 09:56:35 -05:00
Richard Peter
c9e63f12ce Merge "Issue #2077 Revise pixel size calculations. Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7" into development
Former-commit-id: 85e950e286 [formerly 88a9f32aab] [formerly e412320b39] [formerly f3ba33a84c [formerly e412320b39 [formerly ef55eddb22b9f50dc06496502e66ff170c603493]]]
Former-commit-id: f3ba33a84c
Former-commit-id: 8cf8a793dfa267cd23180dc6915209e3881ba9d2 [formerly 22f9c92e4a]
Former-commit-id: 0b721ec758
2013-08-08 09:52:25 -05:00
Max Schenkelberg
89a9b608cb Issue #2190 removed non-existent .so from meteolib build.properties
Change-Id: I40ff45473518215375ace9fbdcd9a8e416ddb438

Former-commit-id: e14aaef0e4 [formerly 48dd7a6ca7] [formerly f587206b84] [formerly 7ed0b6c5f8 [formerly f587206b84 [formerly 006ea8d18d40c8fb147e4970a1032f0f6efa3cfc]]]
Former-commit-id: 7ed0b6c5f8
Former-commit-id: 93c4c5a25448fbd11e50baf2f97f907e90a09659 [formerly 259f16578c]
Former-commit-id: fbe0988682
2013-08-08 09:15:05 -05:00
Ben Steffensmeier
0e1624674e Issue #2077 Revise pixel size calculations.
Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7

Former-commit-id: fbb18fd8c0 [formerly 6e1c8c7208] [formerly 6c7d1d60a8] [formerly 1bd7cc1097 [formerly 6c7d1d60a8 [formerly 99fa66319bfe07aa84276bd7f9f0817ed5868798]]]
Former-commit-id: 1bd7cc1097
Former-commit-id: 07461a37261a2ba11cc43808c8bbec41bdc88ca8 [formerly 3071e53e45]
Former-commit-id: ffe256a0eb
2013-08-07 18:40:28 -05:00
Ben Steffensmeier
4093a51085 Issue #2235 Fix the build, hopefully.
Change-Id: I09466023c4d15921bc9b86e2d6f0958c1ff83539

Former-commit-id: 49e1e56ec5 [formerly 49a2b27ab1] [formerly 95c4e2d65d] [formerly 4b705b1436 [formerly 95c4e2d65d [formerly 1545f57a99f47bd8dabb70235914bdaa14025b00]]]
Former-commit-id: 4b705b1436
Former-commit-id: 2a94c93ceb85f295c20443cee1806295f3b7e104 [formerly cdddcac87b]
Former-commit-id: 1de459b743
2013-08-07 17:15:06 -05:00
Nate Jensen
de5ac0756a Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: 0aab8a628a [formerly 8968389383] [formerly ec01e6e872] [formerly be9315642b [formerly ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]
Former-commit-id: be9315642b
Former-commit-id: 71058eb3f64680175103324660052217c65f2678 [formerly b0f3d536e4]
Former-commit-id: 8cca3c32ac
2013-08-07 16:44:30 -05:00
Greg Armendariz
434c5fe208 Merge "Issue #2190 attempt to fix build" into development
Former-commit-id: cbd270b486 [formerly 430dd1bb43] [formerly 52b95b4809b76f5cf5347da449d048097282c0e1 [formerly 614a9a5ca0]] [formerly c588a5ce7e [formerly 614a9a5ca0 [formerly 3cf79c8f9e9391b4bac3d6dba05570eb9a1cedfc]]]
Former-commit-id: c588a5ce7e
Former-commit-id: 83f5a45605cf9e00f0e0b71e61536e678ce5fb8b [formerly 8c8439446a]
Former-commit-id: 85b41d68d1
2013-08-07 14:41:37 -05:00
Nate Jensen
ae9d10af53 Issue #2190 attempt to fix build
Change-Id: I733289250b318c81134bacb676837b36b67fb6c6

Former-commit-id: 6cade095f9 [formerly 88cefe228a] [formerly f56bb10cb2] [formerly d1e2274f46 [formerly f56bb10cb2 [formerly 9e6ca01815f880282ec87fdce72d108131039f2e]]]
Former-commit-id: d1e2274f46
Former-commit-id: ebf4b1c6040bb679265b692cf1876a32c85b647d [formerly 8478d68a56]
Former-commit-id: 2ceeb152ba
2013-08-07 14:15:50 -05:00
Ron Anderson
441702e186 Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 17ed074c5e [formerly 896b5333d1] [formerly 216b2a5c86] [formerly 0a9068e6d3 [formerly 216b2a5c86 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]]
Former-commit-id: 0a9068e6d3
Former-commit-id: 72056a95440f5bfa6c34f417686f4cf38ac5b799 [formerly fcb78e78d3]
Former-commit-id: 44c10c798d
2013-08-07 14:05:36 -05:00
Nate Jensen
071380df2d Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: 86d32ce3e0 [formerly 04e78d5a64] [formerly cdfea29b16] [formerly 5c7dc36583 [formerly cdfea29b16 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]]
Former-commit-id: 5c7dc36583
Former-commit-id: c8ded44555418c15296b5bf17e62b4980ac6d12e [formerly d520081243]
Former-commit-id: e99fd427ec
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
4a92feba62 Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c

Former-commit-id: fb3a11161a [formerly f9cd8457bc] [formerly 2ecba23bb9] [formerly 2a51ddd697 [formerly 2ecba23bb9 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]]
Former-commit-id: 2a51ddd697
Former-commit-id: 77c845fde31945d0fea149cfd3d18a9817475c57 [formerly 15ddd45995]
Former-commit-id: 794d41a8f7
2013-08-06 18:27:21 -05:00
Nate Jensen
9c6c35e033 Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 27dd27a73f [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 5da0c0771f6b8cf3997cc0c8fb770658e04f2445 [formerly 15006517a2]
Former-commit-id: 04d55ac1c0
2013-08-06 17:17:53 -05:00
Richard Peter
2d6d983e5e Merge "Issue #2142 fix logback ingest config" into development
Former-commit-id: 47ccb5664c [formerly 91bef56489] [formerly a229fd3abb] [formerly 883f450f28 [formerly a229fd3abb [formerly 3deb3b03c2ab71ce00b1bf465bae6139e462c39e]]]
Former-commit-id: 883f450f28
Former-commit-id: eb0599c9a3d5d84873578ef41866b54b2ea192d9 [formerly d75818c241]
Former-commit-id: 52d44a496e
2013-08-06 14:23:41 -05:00
Nate Jensen
d9c89f8bb9 Issue #2142 fix logback ingest config
Change-Id: I7b50e76bea11eff68cc29930faa1cd1443558a70

Former-commit-id: 3cbbe0c45e [formerly 7aecba7abe] [formerly f756c0039a] [formerly ac3071cc0a [formerly f756c0039a [formerly f191176549581689ac20b62a2033c19264aaa8df]]]
Former-commit-id: ac3071cc0a
Former-commit-id: d9c941a6af8ad27f53271c1a2f0680929ecfdfec [formerly b50304a16f]
Former-commit-id: 83e9df5281
2013-08-06 14:22:15 -05:00
Richard Peter
0a5d8013e1 Merge "Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup" into development
Former-commit-id: 4158d57607 [formerly d6ac029070] [formerly 6eb59502f8] [formerly a91d535a99 [formerly 6eb59502f8 [formerly 14e07542613348b91e60baa914cdffe1b936d9d7]]]
Former-commit-id: a91d535a99
Former-commit-id: 41f990e3501baf98e41534e615878951c611f1dd [formerly 6fb0e514f5]
Former-commit-id: 3e07f1af5a
2013-08-06 14:21:53 -05:00
Nate Jensen
4fe731ccdb Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
Former-commit-id: 746a96fd40 [formerly fb6b9a8b42] [formerly 0bf9eed643] [formerly e7949c04ad [formerly 0bf9eed643 [formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]]
Former-commit-id: e7949c04ad
Former-commit-id: ff0fd5a9b04f0b8a202951409f834a7e581a8e3e [formerly 2bd358ff19]
Former-commit-id: a321310dd8
2013-08-06 14:14:27 -05:00