Commit graph

1200 commits

Author SHA1 Message Date
Nate Jensen
302c4117c6 Merge "Issue #2023: Pure python client implementation of Data Access Framework." into development
Former-commit-id: a5164a148b [formerly 4c9e7eb885] [formerly cc7f3d9cf6] [formerly a5164a148b [formerly 4c9e7eb885] [formerly cc7f3d9cf6] [formerly 78b33b57d1 [formerly cc7f3d9cf6 [formerly f5cc02c442077789e19bf615ec15a7b2e4195721]]]]
Former-commit-id: 78b33b57d1
Former-commit-id: ec2478d6e0 [formerly 9ee84c0d97] [formerly dcea5b11fca6a9d5d8aeb57b102e5f7bccf02e1c [formerly 479a15ab85]]
Former-commit-id: 1017b23e3bb28fadbc9d1a601a67a4217e4d50de [formerly 465f0640d4]
Former-commit-id: 64983bb91d
2013-06-06 16:42:00 -05:00
Steve Harris
f3ba607c69 Merge branch 'omaha_13.4.1' into development
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: a150d8b90b [formerly 64cf1aedb1] [formerly 571757b2a6] [formerly a150d8b90b [formerly 64cf1aedb1] [formerly 571757b2a6] [formerly 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]]
Former-commit-id: 2327205cb7
Former-commit-id: 78f0921f63 [formerly 8b78f538d3] [formerly bfd7bfea914d41fc958828fa95730a334190b2e1 [formerly 035d74b348]]
Former-commit-id: 5ebd8157d1a24184df8083fedec285c5bce096ea [formerly abfd0b9ead]
Former-commit-id: 18fdb31920
2013-06-06 15:46:23 -05:00
Steve Harris
94e72d9982 Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c5f2c1abf1 [formerly b0c0e2e7cf] [formerly 1e4c538e58] [formerly c5f2c1abf1 [formerly b0c0e2e7cf] [formerly 1e4c538e58] [formerly 56e04554e9 [formerly 1e4c538e58 [formerly 2e1e30df32ef00523dbcd995457b854cbcad3d41]]]]
Former-commit-id: 56e04554e9
Former-commit-id: a74c3b01ce [formerly 1d4e65d435] [formerly 584b35262b5cc8d99a405a60f609c90a554cca41 [formerly 72a559120f]]
Former-commit-id: f6282579182b406af7c772e07a2d9e3722cf2a64 [formerly 4b06eb1152]
Former-commit-id: 7d8ae66ddf
2013-06-06 15:43:34 -05:00
Bryan Kowal
d18b556f3f Issue #1927 - build.properties standardization.
Former-commit-id: e6e6def97d [formerly 5d5b26a543] [formerly 0268fa48b0] [formerly e6e6def97d [formerly 5d5b26a543] [formerly 0268fa48b0] [formerly a0e08f5bf7 [formerly 0268fa48b0 [formerly 6cc5a2bee443221c9585bbe75a2e87328088e340]]]]
Former-commit-id: a0e08f5bf7
Former-commit-id: 11ce8abc78 [formerly 4e1d503b5e] [formerly 9b7b5da92be842cbd48e7d3e84aa89ec3bafe8ed [formerly 6fff973f2d]]
Former-commit-id: ff61418c901c4cc495efe2b596b69f83ddf2b91f [formerly d773e6762b]
Former-commit-id: 1499eb7ecb
2013-06-06 14:35:17 -05:00
Steve Harris
c57686831a 13.4.1-14 baseline
Former-commit-id: ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly ffcce90f3f [formerly be236eb722] [formerly c749e122eb] [formerly 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]]
Former-commit-id: 18b90226a2
Former-commit-id: f7316ae4bd [formerly cebc1ddb63] [formerly a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7]]
Former-commit-id: 1e747c10c7b7049ff47d3fe068c65055d7ab4a0e [formerly 8ec7524cbb]
Former-commit-id: d46b0413fb
2013-06-06 15:15:27 -04:00
David Gillingham
dc185b8e49 Issue #2023: Pure python client implementation of Data Access Framework.
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427

Former-commit-id: 98b288f275 [formerly 2c0af328b6] [formerly ae3e7a64b0] [formerly 98b288f275 [formerly 2c0af328b6] [formerly ae3e7a64b0] [formerly 4bdf7178bd [formerly ae3e7a64b0 [formerly edc77397fb74f07c66dd9f7b9ede5e8af81b4b18]]]]
Former-commit-id: 4bdf7178bd
Former-commit-id: 3dca4cce4c [formerly 242d3a5493] [formerly 9db7659ae79bb9f296e845275e0f20ae041ad376 [formerly 3f4b44fbbc]]
Former-commit-id: fd74a36a14878f4d53eb50e60772ff2b8614666b [formerly 402b6c4f86]
Former-commit-id: a8c3259817
2013-06-06 13:47:31 -05:00
Ben Steffensmeier
a81a33625c Issue #2041 fix python job coordinator shutdown.
Former-commit-id: e27f1d20d6 [formerly 955468866e] [formerly 4bf7b44234] [formerly e27f1d20d6 [formerly 955468866e] [formerly 4bf7b44234] [formerly ab0bb800cb [formerly 4bf7b44234 [formerly c749e5f77e06ede7fa39ece6846d957b8edfaed2]]]]
Former-commit-id: ab0bb800cb
Former-commit-id: 460410a87f [formerly b8cef5b733] [formerly 810a58a6800b9e624f27b19c3a48e73c8947a22a [formerly 8111840673]]
Former-commit-id: 43a7b73657cf7ae40f8807ea31b895faa852c2bd [formerly 30df5cc2e4]
Former-commit-id: 2df9ca7847
2013-06-06 13:13:02 -05:00
Max Schenkelberg
d4b992ef52 Issue #1638 Moved python localization project out of common.base feature to keep it minimal.
Amend: Added to wrong edex feature

Change-Id: Ic1f3bf92a4559ba04eb6a05c39d5773393235330

Former-commit-id: 04256b7548 [formerly 6afefe027b] [formerly 0bfeed7240] [formerly 04256b7548 [formerly 6afefe027b] [formerly 0bfeed7240] [formerly 424ea84d6e [formerly 0bfeed7240 [formerly ac578db9a9809798c30d2c694bedb1d960395e77]]]]
Former-commit-id: 424ea84d6e
Former-commit-id: 0f72f90fa2 [formerly 1872fd5b67] [formerly f4bc575fd4f7424b96fd216a3ef955f3adc3b3f8 [formerly e80b104e15]]
Former-commit-id: b8642787fc6a5f25fa736546cf68951662d9b17f [formerly 6570c3042b]
Former-commit-id: fd9ab77cc6
2013-06-05 17:13:43 -05:00
David Gillingham
8c20759dbc Issue #2063: Improve performance of grid blanking in iscMosaic by only retrieving history data, not entire grid slices.
Change-Id: Icd25e7e54a391ca19445be866e411b35aed54b16

Former-commit-id: 5e53c3f0bd [formerly 51b317ac52] [formerly 9acf385f21] [formerly 5e53c3f0bd [formerly 51b317ac52] [formerly 9acf385f21] [formerly bad6a1fa40 [formerly 9acf385f21 [formerly 5570ee749c5797f8f2c9ab3f6f8392d2c5680d32]]]]
Former-commit-id: bad6a1fa40
Former-commit-id: 8ade43a3dc [formerly 5fe4739fc4] [formerly 71dde9577d001c57231eb1ddf6cca6a71e302a55 [formerly 070365714a]]
Former-commit-id: fadd22c5d4872ae77dc005477bc25d862c93c583 [formerly 8199019e54]
Former-commit-id: ce5c51d360
2013-06-05 16:26:04 -05:00
Dustin Johnson
53e41e9085 Merge "Issue #2064 - Add ability to subscribe to observational point data (MADIS)" into development
Former-commit-id: 7836105cff [formerly 6d589a3c79] [formerly 37791e95a1] [formerly 7836105cff [formerly 6d589a3c79] [formerly 37791e95a1] [formerly 022346b4b3 [formerly 37791e95a1 [formerly 0fe4193763117516c900f4a0236706fd1b08a781]]]]
Former-commit-id: 022346b4b3
Former-commit-id: 37f5475d46 [formerly 4722edba19] [formerly a11103f22a06ee773f069a81e288acdaf952851e [formerly 3554d85245]]
Former-commit-id: 399167c0b0da057899923c0252ebea376bc1ba8d [formerly 0b6ee64ce5]
Former-commit-id: 6af9819687
2013-06-05 13:24:54 -05:00
Mike Duff
4fb549e9f2 Issue #2064 - Add ability to subscribe to observational point data (MADIS)
Change-Id: I298af2d50ec972ab4e728c7aa5d41c0a757d39fa

Former-commit-id: e6f8712306 [formerly 77611d7e9c] [formerly 321209adb8] [formerly e6f8712306 [formerly 77611d7e9c] [formerly 321209adb8] [formerly 12e5155edc [formerly 321209adb8 [formerly 9142ab024fb870b6c9fa18d42d42ae869c4ec58c]]]]
Former-commit-id: 12e5155edc
Former-commit-id: d9c8fa4f5c [formerly 41f817e755] [formerly ab2941e89c2d1b9a72ce27a9b74bec7f87fc7a12 [formerly 5e7ec92696]]
Former-commit-id: 3a4d38d0abfb2f40ce6aee4d0848c7c48a98cd78 [formerly 98d413f51b]
Former-commit-id: be7b0be127
2013-06-05 12:06:58 -05:00
Richard Peter
cfffff295a Merge "Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to." into development
Former-commit-id: a5de9a0b8f [formerly adfc741329] [formerly 27442499e6] [formerly a5de9a0b8f [formerly adfc741329] [formerly 27442499e6] [formerly e8c77bb251 [formerly 27442499e6 [formerly 5eb49ca9bf6a263af5059531b09cdb8a735ba9ac]]]]
Former-commit-id: e8c77bb251
Former-commit-id: 65b21b5776 [formerly 33b799fb50] [formerly 64f387a6c3302df000419d4af8e8bbba8f9b9c19 [formerly 42777a98a8]]
Former-commit-id: c81f02fc51612737d734ed8e888437172d9e6baa [formerly e130b14500]
Former-commit-id: b5a6bb343f
2013-06-05 11:48:09 -05:00
Nate Jensen
4d48f3c558 Merge "Issue #2041 Improve exception handling for concurrent python. Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47" into development
Former-commit-id: fb7e8c6070 [formerly 38b028b665] [formerly 725adab244] [formerly fb7e8c6070 [formerly 38b028b665] [formerly 725adab244] [formerly 4bfba7d6c6 [formerly 725adab244 [formerly 3d70e1866b618991ed0f8decb4925c794222c7ad]]]]
Former-commit-id: 4bfba7d6c6
Former-commit-id: c5ed0f981a [formerly 64ccc2c283] [formerly 6fc65338458aaa9265fae7cd81c3267e87afe0a1 [formerly 07b1854308]]
Former-commit-id: 7aebf2a60d28e6489a09c4231c774644ee1cb25c [formerly 27a4a99771]
Former-commit-id: e61ae7a5e1
2013-06-05 08:42:23 -05:00
Bryan Kowal
07edf607d8 Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
Former-commit-id: b7b51697b8 [formerly 3427534c29] [formerly 4b5c653363] [formerly b7b51697b8 [formerly 3427534c29] [formerly 4b5c653363] [formerly 2abb257d35 [formerly 4b5c653363 [formerly 289cd9fbe02da77b3c56729ec1ee4d3e89256a08]]]]
Former-commit-id: 2abb257d35
Former-commit-id: 6c368db5e0 [formerly b3b85069ea] [formerly 11d840385012f6641f89c0e54c9c442aed3c2d11 [formerly 98150aa493]]
Former-commit-id: 11b7a240d0024bcf99866d466385ac7d25b70731 [formerly 4f871084ec]
Former-commit-id: a4cf78cd95
2013-06-04 18:25:58 -05:00
Ben Steffensmeier
6090cbdde6 Issue #2031 move grib splitting cleanup into a finally block so less tmp files leak.
Former-commit-id: 2370b4305c [formerly a01c4eb02b] [formerly 2dc2e990cb] [formerly 2370b4305c [formerly a01c4eb02b] [formerly 2dc2e990cb] [formerly 19af45e525 [formerly 2dc2e990cb [formerly 327fe058b08967d18fa83ac9e6fc9c3356d68ff2]]]]
Former-commit-id: 19af45e525
Former-commit-id: 05874a2376 [formerly 016ed7211f] [formerly 7f1e69827c61f66c1292d7cb055f2116de1b2d8f [formerly d773bbf625]]
Former-commit-id: f0ba032b8faf66ab230082c83fd4d7e54fee0fd8 [formerly d9b9d4ed7c]
Former-commit-id: 6e18c7a6a8
2013-06-04 18:23:06 -05:00
Ben Steffensmeier
e277655937 Issue #2041 Improve exception handling for concurrent python.
Change-Id: I36bf449af216feb45ea3a2464da5096f94d02d47

Former-commit-id: d9599eb3ae [formerly 5d5cd5e5f4] [formerly 8ce74c44df] [formerly d9599eb3ae [formerly 5d5cd5e5f4] [formerly 8ce74c44df] [formerly ef10b56e2b [formerly 8ce74c44df [formerly c605b0ce9b7437bfaa803b31c6f4b2f7dc17a6ea]]]]
Former-commit-id: ef10b56e2b
Former-commit-id: 4a98cb43a4 [formerly f78e0f18bf] [formerly 137f40ebc8428c8099afb92fc2a47d584a2c089d [formerly 0f70964bc9]]
Former-commit-id: 990432480823f66e862fc9a1dbba21d24cad808a [formerly 6109fde71d]
Former-commit-id: 580302942a
2013-06-04 17:03:05 -05:00
Richard Peter
1a31effed0 Merge "Issue #1965 Initial archive retention dialog work. updated archive creation, purge, and test cases after Roger's last checkin. added edex plugin for feature. added an abstract base archive dialog." into development
Former-commit-id: 96c8232006 [formerly 2281df8c5b] [formerly e513fdbc3e] [formerly 96c8232006 [formerly 2281df8c5b] [formerly e513fdbc3e] [formerly 220e817e15 [formerly e513fdbc3e [formerly 1b5ab5d85b4f634357d0f52551b800378349b363]]]]
Former-commit-id: 220e817e15
Former-commit-id: cbfbab7fb9 [formerly b5cccf449d] [formerly b87e95d2898e502766c05274499e1d042203b0c2 [formerly 6b75cad25f]]
Former-commit-id: f6fef22aee2325e1325aec4030039a6776b9a2aa [formerly c3bc837e61]
Former-commit-id: 1aa877a259
2013-06-04 15:08:09 -05:00
Dustin Johnson
e7fcedbec9 Merge "Issue #2022 Modifications to subscription last run time and notificationservers" into development
Former-commit-id: c4446d26f1 [formerly a98b19c824] [formerly 3198277096] [formerly c4446d26f1 [formerly a98b19c824] [formerly 3198277096] [formerly 37b7e400ea [formerly 3198277096 [formerly 9a3f2121defaaaefd8f6268e289f87ecb2ee3e78]]]]
Former-commit-id: 37b7e400ea
Former-commit-id: 052d397cac [formerly 533fb7139a] [formerly 3c58657e60d5487cc0a3208db071bbf4465c4d6b [formerly b4a51bc24f]]
Former-commit-id: ce574b64d47c2c2151fb647417847c5bcffff967 [formerly bebc4fdbe5]
Former-commit-id: 2576da68e3
2013-06-04 14:22:59 -05:00
Benjamin Phillippe
4d43c0a1ff Issue #2022 Modifications to subscription last run time
and notificationservers

Change-Id: Ia11e639249ef7fd769e6e3baae2b09b966b3caea

Former-commit-id: 5b9eecc8b8 [formerly 0862f2b7d3] [formerly f00d8ae721] [formerly 5b9eecc8b8 [formerly 0862f2b7d3] [formerly f00d8ae721] [formerly 1cec0fab74 [formerly f00d8ae721 [formerly 4118d4e3888a5feb9bbc39036a8ceeb70d66e375]]]]
Former-commit-id: 1cec0fab74
Former-commit-id: 8d03dd6c75 [formerly 49ec0363c3] [formerly 3841592d2af8219265cb07e6457697758849bd51 [formerly 6e8314475e]]
Former-commit-id: 434342fc87b6ee05d1fcd27b36ac82d4029eafdd [formerly 585189abb1]
Former-commit-id: d108e2fa66
2013-06-04 14:19:09 -05:00
Richard Peter
ba88ac2d5c Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: a8780f26b5 [formerly 9c3fe01efa] [formerly 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]]
Former-commit-id: 21adb9c78d59896133d2b3efcbf7dcafb108064e [formerly 13f64a7da8]
Former-commit-id: 22f6319986
2013-06-04 14:06:53 -05:00
Roger Ferrel
01fdaebda0 Issue #1965 Initial archive retention dialog work.
updated archive creation, purge, and test cases after Roger's last checkin.
added edex plugin for feature.
added an abstract base archive dialog.

Change-Id: I7c9ca3df40a7591815a1aae4fabf660217d44574

Former-commit-id: ef974b52f0 [formerly dcc56ad5d3] [formerly b952eee030] [formerly ef974b52f0 [formerly dcc56ad5d3] [formerly b952eee030] [formerly f53d6bf4ff [formerly b952eee030 [formerly 64b75031afaecd74649392a19cc0b10dcdb79a2b]]]]
Former-commit-id: f53d6bf4ff
Former-commit-id: 8820399134 [formerly 65d17722a9] [formerly 2833276d9329d4f1b9e5d852a18422d57355c145 [formerly 9aff5f2321]]
Former-commit-id: 437bc5403fa76566d08e9f5c3f08a082fb20cba3 [formerly 39cfbf038b]
Former-commit-id: 6f52e3d3f8
2013-06-04 13:08:05 -05:00
Dustin Johnson
7fdf91ca93 Issue #2038 Change registry code to use GenericRegistry, use Spring 3 embedded DB feature in tests
Change-Id: Ie9e0a4fa4fb457f1d85326c6c2ddcfa16cdc5b63

Former-commit-id: 57b3706e5d [formerly d81592b575] [formerly d47da65262] [formerly 57b3706e5d [formerly d81592b575] [formerly d47da65262] [formerly bc830e67f0 [formerly d47da65262 [formerly 121d9a02acfe528c524788a062c2d2034f80afe5]]]]
Former-commit-id: bc830e67f0
Former-commit-id: efce5e19d5 [formerly cd1db53a35] [formerly ec9fba7ab73ee52c73b56514e1ac66a6a8b5586e [formerly 0b710bc166]]
Former-commit-id: fdc4ef6ee7911f95a849feb6d4d64feef2c9adcb [formerly bdccf71c8b]
Former-commit-id: 13e51bc99c
2013-06-03 14:54:53 -05:00
Benjamin Phillippe
f9f44c0d18 Issue #1931 Fixed Repository Items REST Service
Change-Id: I8876b708b7f6f08b08bc550099ae1bef47751f97

Former-commit-id: 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly 5450a58ca6 [formerly 2c147fe159] [formerly 1e413c68f6] [formerly a226f225fd [formerly 1e413c68f6 [formerly b2764126282aab128cc1465905c11686894ab1f7]]]]
Former-commit-id: a226f225fd
Former-commit-id: 396102ea5d [formerly 97a9a6279b] [formerly 747180ba600bf97794019a0d0a919d238456940e [formerly 3b3ae2add0]]
Former-commit-id: 6437394e0207ea10e1ae9b421cc9526b14344c70 [formerly 67d1818a64]
Former-commit-id: f482c88c7b
2013-06-03 10:26:36 -05:00
Ron Anderson
a3e33d4211 Merge "Issue #1759: Add a more detailed comment in code for previous change." into omaha_13.4.1
Former-commit-id: 9e6969eccb [formerly d0897c31d8] [formerly fb5d432669] [formerly 9e6969eccb [formerly d0897c31d8] [formerly fb5d432669] [formerly 0ae8346cfb [formerly fb5d432669 [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]]]
Former-commit-id: 0ae8346cfb
Former-commit-id: 9464771e25 [formerly e6d7b83df5] [formerly 4227600ec53435b3c39496f85e74622ae01b7d76 [formerly f65ce6e3e6]]
Former-commit-id: d45303b850db86b2c970e98ae8be0dd15f308265 [formerly d01a608015]
Former-commit-id: b0f7ac7f1a
2013-06-03 07:45:02 -05:00
Dave Hladky
01c0565b57 Issue #2062 Fixed up AWIPS2_baseline portion of merge
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b

Former-commit-id: 87e81a8b1b [formerly 39f357570b] [formerly 2f67b74318] [formerly 87e81a8b1b [formerly 39f357570b] [formerly 2f67b74318] [formerly fa8ea8ecca [formerly 2f67b74318 [formerly 982daef280be6f3efe87a066fa5919be9cfeb9ec]]]]
Former-commit-id: fa8ea8ecca
Former-commit-id: beeaaab97b [formerly 0317090ffd] [formerly d931c9ba679b7ae50fda63241a3da00faf83a9e9 [formerly 9d2ec44182]]
Former-commit-id: 68379ae55b79c37e4c2fca229ff79a44ed58c694 [formerly 1e55f4ade2]
Former-commit-id: d2c1950237
2013-05-31 15:27:45 -05:00
Richard Peter
3cedef94c2 Issue #2058: Update obsPurgeRules.xml and sfcobsPurgeRules.xml
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c

Former-commit-id: 168e447d81 [formerly 7693aef3db] [formerly 948d1aabfe] [formerly 168e447d81 [formerly 7693aef3db] [formerly 948d1aabfe] [formerly 5a8fe397b2 [formerly 948d1aabfe [formerly ea807c13a7cf0ff8a561feb46c99e649eb5254a0]]]]
Former-commit-id: 5a8fe397b2
Former-commit-id: a9290fdd7e [formerly ba36d7c9af] [formerly cdaf4f74592990a0a1b5829de6954b5ceedcb8de [formerly 8d856602e3]]
Former-commit-id: 821443e944d341e6f2a66d9764204dffd3d0120e [formerly 1846685f3f]
Former-commit-id: 4ec5ca19ea
2013-05-31 14:43:43 -05:00
Richard Peter
83657ef75b Issue #2053: Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
Former-commit-id: 1d378a49c5 [formerly 91bfa4b37a] [formerly c2e1b72f9b] [formerly 1d378a49c5 [formerly 91bfa4b37a] [formerly c2e1b72f9b] [formerly fdcf086681 [formerly c2e1b72f9b [formerly 26c7862ba586d3b109bf0c6799b1ec8b12d360fe]]]]
Former-commit-id: fdcf086681
Former-commit-id: 6d496ca4e8 [formerly 2d3b8706c1] [formerly c97eefc613a06632b1a8aa03a7e670f42dd28610 [formerly 14ef93bf5a]]
Former-commit-id: 82e463238c956ed9be350f85a9486ead68a63d68 [formerly 522dfa3733]
Former-commit-id: 1ac79385f7
2013-05-31 13:01:52 -05:00
Dustin Johnson
347845bc52 Merge "Issue #2038 Change datadelivery retrieval to be plugin contributable" into development
Former-commit-id: 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 35e1c84a01 [formerly ba48f66886] [formerly 2687ebafd6] [formerly 87605571b2 [formerly 2687ebafd6 [formerly 606b358ba6bfebf410151217f1a7ad92839025b0]]]]
Former-commit-id: 87605571b2
Former-commit-id: 26517c1a95 [formerly 0d77acbff2] [formerly 1373c0b90f4a7aaa2a16437bb66461f4bae2c498 [formerly 1214f5e3ea]]
Former-commit-id: ada7c8e7993ab7276cb65bc026f9c40651ed9c08 [formerly 46ec793d11]
Former-commit-id: 7d59d10204
2013-05-31 12:43:49 -05:00
David Gillingham
8eafbcd92f Issue #1759: Add a more detailed comment in code for previous change.
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e

Former-commit-id: 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly 483665612d [formerly 3ec84b8f18] [formerly 5b9094275d] [formerly a11ef45913 [formerly 5b9094275d [formerly 76fd66783565677c99006dd7c2b7628acd61c2a3]]]]
Former-commit-id: a11ef45913
Former-commit-id: eb61d6b8e3 [formerly b77e978008] [formerly 1384cb8b21573990393d2c5eb79b38dc399186fa [formerly 593a5fcbed]]
Former-commit-id: fc9477544adacdd081d02a3a802e8329734ab052 [formerly db859cfe86]
Former-commit-id: c3cdfa4293
2013-05-31 12:25:19 -05:00
Dustin Johnson
8ae74786c1 Issue #2038 Change datadelivery retrieval to be plugin contributable
Amend: Fix class name resolution, no arguments to metadata adapter constructors

Change-Id: I2c08563499a34996502d22f0f9685602b8897139

Former-commit-id: 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 174df7bdd6 [formerly 6234417095] [formerly 4a8adeb80a] [formerly 55aeff3422 [formerly 4a8adeb80a [formerly fc6effe4993694944d5331038d24310dec44a5d8]]]]
Former-commit-id: 55aeff3422
Former-commit-id: d1552d578f [formerly 7ec3c6c09a] [formerly fc670c4505d46445bdd5ffc292571b65c25bcbdf [formerly 075c53763d]]
Former-commit-id: 8852d0761a2b6648b34348793d38aa751867d797 [formerly f9ba7dc5ab]
Former-commit-id: d62a0b863a
2013-05-31 12:19:07 -05:00
Ron Anderson
3ff2e5d9c6 Merge "Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
Former-commit-id: 7f15e7e7ab [formerly 1b9e0c2047] [formerly 7e1d2d273f] [formerly 7f15e7e7ab [formerly 1b9e0c2047] [formerly 7e1d2d273f] [formerly c3f8ab24ea [formerly 7e1d2d273f [formerly 08de853f51cf46cb8b8a7b9f26b355ec59c164ab]]]]
Former-commit-id: c3f8ab24ea
Former-commit-id: fcd98f4e14 [formerly 35f018c206] [formerly 2bade025b66ce81cd9f5c1d5ede35f3f5a87b5ec [formerly b6d6349f09]]
Former-commit-id: 308fbdd189e5a5ebdad0985bb965b5fa39f9b98b [formerly 5b94dbc699]
Former-commit-id: e9fbd70d11
2013-05-31 12:09:49 -05:00
David Gillingham
9f86529f94 Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path.
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b

Former-commit-id: 6fe3ffa07e [formerly 88eed9bc17] [formerly 3ccf091c44] [formerly 6fe3ffa07e [formerly 88eed9bc17] [formerly 3ccf091c44] [formerly cab1c849bf [formerly 3ccf091c44 [formerly 6ebf8b354145cac21458617b9bb4cdcbedeff7e7]]]]
Former-commit-id: cab1c849bf
Former-commit-id: e4626b7534 [formerly 912212b953] [formerly c70bfb52dbc0daf601b003261f6af93be9c8e983 [formerly df9c5492c8]]
Former-commit-id: 3ec56baf9412693f3e3e2e387ae597846f5dfbbb [formerly 06bfd0413c]
Former-commit-id: ca548953d2
2013-05-31 10:42:51 -05:00
Richard Peter
a291f47841 Issue #2053: Add dx2f to capture
Former-commit-id: 44977d565c [formerly 345a9e4d65] [formerly d8d7c01705] [formerly 44977d565c [formerly 345a9e4d65] [formerly d8d7c01705] [formerly d4cf7a1312 [formerly d8d7c01705 [formerly 6bcb1c44f311370d54747785cd4fe650ca846d67]]]]
Former-commit-id: d4cf7a1312
Former-commit-id: e23a5ddc08 [formerly 4f7125d343] [formerly 7976f75a4ecd8105bf1fea42677f574d7cd1b78e [formerly 337efabc5a]]
Former-commit-id: e92cf1d0019c1b279749e27a8b2c153e951083cc [formerly 43b0fa7d11]
Former-commit-id: 896593c691
2013-05-31 10:37:48 -05:00
Dustin Johnson
27f47006a3 Issue #2038 Fix ability to get shared subscriptions by id
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: f6c89fa3d9 [formerly b4bc2ca947] [formerly fc807288a7] [formerly f6c89fa3d9 [formerly b4bc2ca947] [formerly fc807288a7] [formerly 05bd3e113d [formerly fc807288a7 [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]]]
Former-commit-id: 05bd3e113d
Former-commit-id: 8df55423f5 [formerly 3f4b010b84] [formerly e9924f52a848d24038a0a3fb3705c0ff67f9a02e [formerly 42d1d74b04]]
Former-commit-id: d226711a5e279ef4eee9fd981a46da15d8fdd405 [formerly 62131327ed]
Former-commit-id: b122700fed
2013-05-31 09:29:44 -05:00
Richard Peter
183aeefcd3 Issue #2056: Update FileLocker to handle release of ACQUIRING locks
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23

Former-commit-id: ba4d97a349 [formerly c15635bccc] [formerly e63f2de395] [formerly ba4d97a349 [formerly c15635bccc] [formerly e63f2de395] [formerly 163998df17 [formerly e63f2de395 [formerly 9097197872da18fded96e09d133132872d4dcc27]]]]
Former-commit-id: 163998df17
Former-commit-id: 03eab26980 [formerly 49cdce7b03] [formerly 56aa526ca54199e714cc0a88b0154a267a00a414 [formerly a10651b3b9]]
Former-commit-id: 465880b45c4990cac8e24c49a0902a90acd4568e [formerly b1e80dd072]
Former-commit-id: 02cdefa3de
2013-05-30 17:53:17 -05:00
Richard Peter
fe51c7a559 Merge "Issue #1966 Changes to make manger stateless and updates for Case Creation." into development
Former-commit-id: a25207c4f5 [formerly 6a19a0074f] [formerly 6487cd6578] [formerly a25207c4f5 [formerly 6a19a0074f] [formerly 6487cd6578] [formerly 0e4782aea5 [formerly 6487cd6578 [formerly a8f4dced2e1a5ed2851291627d2349b818da239d]]]]
Former-commit-id: 0e4782aea5
Former-commit-id: dcee8de5bf [formerly 9675eb9b1e] [formerly 94f8dd7cc2d9448c67b8b2be7d600c1f56ec5379 [formerly c81610b720]]
Former-commit-id: 7fd0de4ebc2d6c64e6e122c31801bc918f26a647 [formerly 6d07981ce3]
Former-commit-id: 7ccdaf58ad
2013-05-30 17:17:23 -05:00
Dustin Johnson
2e8d964866 Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: f3835a5670 [formerly 54045d6b9b] [formerly c01ea33d5b] [formerly f3835a5670 [formerly 54045d6b9b] [formerly c01ea33d5b] [formerly e4ecae9e7e [formerly c01ea33d5b [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]]]
Former-commit-id: e4ecae9e7e
Former-commit-id: 5d995a726f [formerly 353630fcca] [formerly f7a467f666496a4ca4ff1bd58f5061cc1b7eb62c [formerly 58b11e075c]]
Former-commit-id: 0a802f6e1b921fb3e8dd770fb896e6f40227ef97 [formerly 89d71040c6]
Former-commit-id: f8d7eaa98b
2013-05-30 17:11:19 -05:00
Dave Hladky
29bc32e4f8 Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: 7393abfc91 [formerly c292bf1b55] [formerly 1608d407d1] [formerly 7393abfc91 [formerly c292bf1b55] [formerly 1608d407d1] [formerly 83dae4fe01 [formerly 1608d407d1 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]]]
Former-commit-id: 83dae4fe01
Former-commit-id: e28331d3bb [formerly 64596d3468] [formerly 724bfb742a41ede685551f3df79514daaee58c8b [formerly 90e6d184e7]]
Former-commit-id: 840b99ef71d98ebb1214419884d5f21e71aa53dd [formerly 8c0c235087]
Former-commit-id: 1b07bcea0c
2013-05-30 17:04:16 -05:00
Roger Ferrel
aa8e3ff5c4 Issue #1966 Changes to make manger stateless and updates for Case Creation.
Change-Id: I62118209fad2a28d6dd3cac4abf7bb86cc782387

Former-commit-id: cfcd38da58 [formerly d6672697aa] [formerly c6cddc605d] [formerly cfcd38da58 [formerly d6672697aa] [formerly c6cddc605d] [formerly 3c875a6f44 [formerly c6cddc605d [formerly 3f43fdc896ff616915a8aa5ef986d3a82e52aa51]]]]
Former-commit-id: 3c875a6f44
Former-commit-id: 9ef53f18b9 [formerly 36b8cbcd5d] [formerly bf07997d68cd2a97eb874705475caf9100eded09 [formerly eaca117b9c]]
Former-commit-id: 050e3efc0fa52bd630915bd8ae54d58f55ec3c52 [formerly 3dc84dbe80]
Former-commit-id: f6c557904d
2013-05-30 16:35:11 -05:00
Nate Jensen
f572e69f0e Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
Former-commit-id: 03833d148d [formerly 10dd7ea61f] [formerly 4aa3657d1a] [formerly 03833d148d [formerly 10dd7ea61f] [formerly 4aa3657d1a] [formerly e4578ca7ba [formerly 4aa3657d1a [formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]]]
Former-commit-id: e4578ca7ba
Former-commit-id: 09215e6dbb [formerly 698d793e9c] [formerly 86618d2ea904ba85327447d5180c4eef0264924d [formerly c0bca7ec27]]
Former-commit-id: fd247f05a5ed4a76a913decd848faabf0606a30a [formerly cdd438d3e2]
Former-commit-id: f6d958a18b
2013-05-30 14:50:39 -05:00
Steve Harris
617bfcfc26 Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]]
Former-commit-id: 26bf27c70d
Former-commit-id: e83fa33a36 [formerly 629e76e0ff] [formerly 1a20439be64f0eb903e06ca2e50db5a76b284942 [formerly 1691fa413c]]
Former-commit-id: 3f4447bcb9d22cc2cdec3a061500d9497c6a3d38 [formerly 9704fd6a82]
Former-commit-id: 4d8d9354e7
2013-05-30 14:33:24 -05:00
Ron Anderson
90b02d376c Merge "Issue #1869 ensure all uses ofdataURI in PDO use getter. Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f" into development
Former-commit-id: 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7d2d162be4 [formerly 79a8cd1b6f] [formerly dd10af4a8a] [formerly 7f41d701be [formerly dd10af4a8a [formerly 6677e2f2af09b114066c64b465e7245d0566ee8a]]]]
Former-commit-id: 7f41d701be
Former-commit-id: d3a25be20d [formerly 5858e8fc19] [formerly 29d381fcafb440df8bee454e31c8b3d99cccd467 [formerly d2f617a49c]]
Former-commit-id: 49ac9580799a6f8e8e6f9ed09976978c1289bb2c [formerly 9e3809d6cd]
Former-commit-id: 9579b62577
2013-05-30 13:08:26 -05:00
Everett Kladstrup
fb8b21d92d Issue #2052 Fix FeatureExplorer feature comparison
* fixes complaint when feature A includes features B and C
  which both include feature D.
  Used to get error that plugin X is in feature D and feature D
* Updated FeatureExplorer jar in build.edex to reflect change

Change-Id: Ifbd5957a33f9815143794d8d4a29a6e66ce275c7

Former-commit-id: 7d7e276e2a [formerly 9541c93640] [formerly 0b2839fd43] [formerly 7d7e276e2a [formerly 9541c93640] [formerly 0b2839fd43] [formerly 4621271329 [formerly 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]]]
Former-commit-id: 4621271329
Former-commit-id: f78c5c3640 [formerly 282ec3b45f] [formerly 0783e1b2908b365b45911f9fff3604f64d2ddbc5 [formerly 9ad045d141]]
Former-commit-id: 489e03a0b245e5971ba19c2513ffe3674df9905d [formerly 83adbb8545]
Former-commit-id: 033b8bae36
2013-05-30 13:02:49 -05:00
Dustin Johnson
fe81c4ee08 Merge "Issue #2038 Remove unused schemas from datadelivery spring files" into development
Former-commit-id: b7d7d66727 [formerly 80309d6a4e] [formerly 7e6bdb7b70] [formerly b7d7d66727 [formerly 80309d6a4e] [formerly 7e6bdb7b70] [formerly 9c9caf00d1 [formerly 7e6bdb7b70 [formerly b1c288e1e4d9a4df409ac8c1156c0c91f3eb67a8]]]]
Former-commit-id: 9c9caf00d1
Former-commit-id: bf277cb980 [formerly 48c37c972a] [formerly 14f966873ac8e545bcc3b5a381d244edc0c40df1 [formerly 0bdf7d614c]]
Former-commit-id: fca2cc5ff4cf78409f8465237e7f299f93b4a6db [formerly a82e3aa078]
Former-commit-id: b59dbc5553
2013-05-30 11:32:09 -05:00
Ron Anderson
8ee12d17a7 Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

Former-commit-id: ff6fe9e225 [formerly 165bc6c409] [formerly 6557515f64] [formerly ff6fe9e225 [formerly 165bc6c409] [formerly 6557515f64] [formerly 08e09382db [formerly 6557515f64 [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]]]
Former-commit-id: 08e09382db
Former-commit-id: f9eeac331e [formerly 3f9cb35feb] [formerly 844223fb2342ed488da4564f04128cde03cba0ca [formerly c3363d43fa]]
Former-commit-id: 0f81f278f82f6fc1e74905f9388934a694727db6 [formerly b04716dd2b]
Former-commit-id: 40b8d1ed3c
2013-05-30 11:01:07 -05:00
Dustin Johnson
ca4a64dee5 Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly 0ac058008d [formerly 463bed7647] [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: ac8c2784ae [formerly 74d985af51] [formerly 29d324567d73f72efae9e9fed9f02433168147e4 [formerly b1d66a0450]]
Former-commit-id: d6fa7618e1d515d026b04f58e34f197cb54bf5be [formerly 3dbb682493]
Former-commit-id: 03cbf9a455
2013-05-30 09:49:09 -05:00
Brad Gonzales
0870b96276 Issue #1965 Commit for purge and archive with tests.
A lot of this ended up being duplication of Roger's code. Roger's changes should go first,
and then this commit will be merged and refactored with his code in an amend.

Amend: better test coverage, fixes to old other pattern
       integrated with Roger's changes.
       added header comments, deleted FileArchiveElement.
       removed search and filter code.

Change-Id: I4e48842a75b9da27062349fee01099e1ea13f59e

Former-commit-id: 778cf6542c [formerly 6243f1f789] [formerly aa76f81b3c] [formerly 778cf6542c [formerly 6243f1f789] [formerly aa76f81b3c] [formerly 321f153547 [formerly aa76f81b3c [formerly 991622c763767a1e291be8c9f3c10da2b5fd7e32]]]]
Former-commit-id: 321f153547
Former-commit-id: c8811ff347 [formerly cb69ca7e93] [formerly 34d580ade00224baada454c96f672dc4ee914ab2 [formerly bbc15413d4]]
Former-commit-id: 0776fffd932d7c3db19f10d0311c62bc31aa040e [formerly 34707fe272]
Former-commit-id: 5a66a33017
2013-05-30 09:34:18 -05:00
Bryan Kowal
6121ed1ea5 Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14

Former-commit-id: 3c98d835bf [formerly 52a1addb29] [formerly 7b24cd293a] [formerly 3c98d835bf [formerly 52a1addb29] [formerly 7b24cd293a] [formerly bd9251eba0 [formerly 7b24cd293a [formerly 19a96c99d10b540058e4d9c0d1729852dd18f1e9]]]]
Former-commit-id: bd9251eba0
Former-commit-id: cad451315d [formerly 5ee9c9f6a1] [formerly 12f6e2d4de44a38803b3d5a550206ae1507ca67f [formerly 4eb7d951e4]]
Former-commit-id: 2e12ac548fa59c066072d6a9c53eaa4c78cab888 [formerly 28bbbfefef]
Former-commit-id: d6ce03a31d
2013-05-29 21:52:10 -05:00
Ben Steffensmeier
bebd2c0459 Issue #1869 ensure all uses ofdataURI in PDO use getter.
Change-Id: I96dd68cd345c39127fbb69821f48956363001c9f

Former-commit-id: 05e7e0551f [formerly b3865f4efc] [formerly 268ee5ce30] [formerly 05e7e0551f [formerly b3865f4efc] [formerly 268ee5ce30] [formerly 191f93653d [formerly 268ee5ce30 [formerly bcb8cea56a2efb9bf953c7acb474bb8046ef7570]]]]
Former-commit-id: 191f93653d
Former-commit-id: c6150879d5 [formerly 9c415e2f19] [formerly e05811b6ef35d30d860c10a4de489276bfcbbd43 [formerly 50c5c5edfa]]
Former-commit-id: 0fd3a99bb649f24420d64a4e6e8887e7a5aff825 [formerly bc19b816c4]
Former-commit-id: f73b0b551e
2013-05-29 17:50:50 -05:00
Nate Jensen
cf843cfa42 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]]
Former-commit-id: fc691cbb2f
Former-commit-id: fde771fa01 [formerly ab10e0072d] [formerly 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]]
Former-commit-id: 73458acdcd0744f3e4a6cc7ea7fac5b0d28ee6a0 [formerly 3588ed1899]
Former-commit-id: 528ab65a66
2013-05-29 16:19:28 -05:00