Commit graph

148 commits

Author SHA1 Message Date
Bryan Kowal
5d6a9c4aa4 Issue #1739 - remove reference to non-existent junit version
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78

Former-commit-id: 62d1793ec6 [formerly ed498a3b53] [formerly 29e157d94e] [formerly 29e157d94e [formerly 5138fe5537]] [formerly 62d1793ec6 [formerly ed498a3b53] [formerly 29e157d94e] [formerly 29e157d94e [formerly 5138fe5537]] [formerly 44215e65e9 [formerly 29e157d94e [formerly 5138fe5537] [formerly 44215e65e9 [formerly f4249d163f057560504b5cbc3745b7ae4b36f28c]]]]]
Former-commit-id: 44215e65e9
Former-commit-id: 1838c06464 [formerly ac84ac231a] [formerly 0be2bc1f80] [formerly a451f55f4ea80a739fa0b04cccd2ae2632bdb7aa [formerly ec1d636d60f95d565582c00e5d92ffdce7b9a719] [formerly 0be2bc1f80 [formerly a2e3556f7e]]]
Former-commit-id: 6b6bbfc923a81405fcc19e52599f3b640b6157d5 [formerly f3958cb699de8789c3842aab868cd73187be60e3] [formerly 105951f556 [formerly e61e84fd6b]]
Former-commit-id: 105951f556
Former-commit-id: 2d5119e347
2013-03-01 10:26:25 -06:00
Max Schenkelberg
7e05dbd642 Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79

Former-commit-id: 4dc61b9064 [formerly 2fd6f3ed4e] [formerly c8a5f1a007] [formerly c8a5f1a007 [formerly 0f1112fb3e]] [formerly 4dc61b9064 [formerly 2fd6f3ed4e] [formerly c8a5f1a007] [formerly c8a5f1a007 [formerly 0f1112fb3e]] [formerly 38bba3705f [formerly c8a5f1a007 [formerly 0f1112fb3e] [formerly 38bba3705f [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]]]
Former-commit-id: 38bba3705f
Former-commit-id: fcfb72a2b7 [formerly bde1619d1c] [formerly 41706c42f2] [formerly ea70ff3bebc47b8acbbac0f3518a7613f0e06b21 [formerly 71ee9b4fe7ff08b057d3d7bee4f424a8213cdcca] [formerly 41706c42f2 [formerly 6ebc058df4]]]
Former-commit-id: 582971cf22b773847565468784ac5692e78d410e [formerly abc90031c64b3efb5931ffb8669c4138a0d5dd1e] [formerly 727602f011 [formerly 22a18ffe01]]
Former-commit-id: 727602f011
Former-commit-id: 81dad90e5f
2013-02-27 12:26:32 -06:00
Steve Harris
30dd6299ea Merge branch 'development' into omaha_13.3.1
Former-commit-id: 5b77c04943 [formerly 90b0bab156] [formerly 0a4564eb97] [formerly 0a4564eb97 [formerly 67f090638f]] [formerly 5b77c04943 [formerly 90b0bab156] [formerly 0a4564eb97] [formerly 0a4564eb97 [formerly 67f090638f]] [formerly 6ec9e73035 [formerly 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]]]
Former-commit-id: 6ec9e73035
Former-commit-id: ee863e38ed [formerly f30d1cdf87] [formerly e46625f8f2] [formerly 0c6c100e8c5cb581ebf0f001d80f0091d47d38ff [formerly bd72fedeff4f0ceca04ec0a96bb50b7706e7a460] [formerly e46625f8f2 [formerly 0051276ad1]]]
Former-commit-id: 1edccb3b21cf660ea0a45ebf112b70591aba1d56 [formerly 8958c8255ceab6eb6c8e58c5cb4c8a688e5de950] [formerly 9db68d0585 [formerly 140ae3191c]]
Former-commit-id: 9db68d0585
Former-commit-id: 9d9a17aa64
2013-02-25 15:58:48 -06:00
Steve Harris
418c06202c Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: e4a0759555 [formerly abdc733151] [formerly 64744fdb19] [formerly 64744fdb19 [formerly a0573644c4]] [formerly e4a0759555 [formerly abdc733151] [formerly 64744fdb19] [formerly 64744fdb19 [formerly a0573644c4]] [formerly 2641d578e2 [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 09d69dbd9a [formerly 7e48d3e684] [formerly 4f155a183a] [formerly 8f5f5cac829fb199ef190abb566cd001cea1b223 [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b] [formerly 4f155a183a [formerly 33dd2589f1]]]
Former-commit-id: 3ec373f83d89d49802de9d70b75cd01681b92a5d [formerly 52ef36f1490e95f8582d69438eed38f21061eafb] [formerly b5d9e75b95 [formerly f3c3191a1c]]
Former-commit-id: b5d9e75b95
Former-commit-id: 34d0f59592
2013-02-21 15:41:39 -06:00
Bryan Kowal
7fafe2d079 Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...


Former-commit-id: bc806e86c3 [formerly 0d4a63efe4] [formerly 519ce2c0fb] [formerly 519ce2c0fb [formerly a8fb04f41c]] [formerly bc806e86c3 [formerly 0d4a63efe4] [formerly 519ce2c0fb] [formerly 519ce2c0fb [formerly a8fb04f41c]] [formerly 803397c7c7 [formerly 519ce2c0fb [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]]]
Former-commit-id: 803397c7c7
Former-commit-id: 371f56b9d7 [formerly 6a47017449] [formerly b2a0a7c148] [formerly 7b5a57375f7ef9aa622774e4183abbcf90d1785e [formerly 6195241ffacf1c8bdcb22aae44f96bfee0eedf78] [formerly b2a0a7c148 [formerly 450e8e7a4c]]]
Former-commit-id: 7d406bc57e26527611b7044ff11caa01eca0bb9b [formerly 302b1a5ae96498f9e93f50ccd303b89ce6085fa5] [formerly b88a24574b [formerly 2a21f2624b]]
Former-commit-id: b88a24574b
Former-commit-id: 55b55a1255
2013-02-21 13:55:28 -06:00
Steve Harris
915a15006f 13.3.1-1 baseline
Former-commit-id: 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly d2a654625f [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]]
Former-commit-id: d2a654625f
Former-commit-id: ea9303b160 [formerly db712e1fcf] [formerly e4435815c9] [formerly c996cf8cb561399a370ef3580c705465d6fa20ac [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0] [formerly e4435815c9 [formerly 46d28be4a4]]]
Former-commit-id: 4e2c476e2dfb865dde40c9f94f4d16824ed729f6 [formerly 30806b31de967d82824f245a2f6cb89f081cfd19] [formerly 8c828dbd75 [formerly b3b56830b0]]
Former-commit-id: 35d8262ef1ba032fcf5d8ea707ad15ee533bd1a9 [formerly 8c828dbd75]
Former-commit-id: fac2d20002
2013-02-20 16:19:40 -06:00
Ron Anderson
a63610593f Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 248bf1269a [formerly 9156b9ffe8] [formerly dc7c9edb87] [formerly dc7c9edb87 [formerly a2a89fb4e7]] [formerly 248bf1269a [formerly 9156b9ffe8] [formerly dc7c9edb87] [formerly dc7c9edb87 [formerly a2a89fb4e7]] [formerly 7c0a5d74bf [formerly dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 2ed0989eee [formerly 12f2ac0171] [formerly d69d628450] [formerly 09203d9a70e32daeb05197143cbf38a108871cde [formerly 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf] [formerly d69d628450 [formerly e952a4f179]]]
Former-commit-id: 95e9c1dc1a8f2e0bbcbb2e724172578932ac608b [formerly af2b3c67dc766d6b95ad299a4853ebd80437f7e4] [formerly 80df624bb3 [formerly 45627edcc7]]
Former-commit-id: 80df624bb3
Former-commit-id: 46248d1c10
2013-02-15 09:03:41 -06:00
Dustin Johnson
4e3f01fe75 Issue #1543 Clean up test files after changing to Spring transactions
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680

Former-commit-id: 70b59e247e [formerly 4f5d6bc65c] [formerly 651c6d55c1] [formerly 651c6d55c1 [formerly 4bcd75c091]] [formerly 70b59e247e [formerly 4f5d6bc65c] [formerly 651c6d55c1] [formerly 651c6d55c1 [formerly 4bcd75c091]] [formerly 19fd95d2c8 [formerly 651c6d55c1 [formerly 4bcd75c091] [formerly 19fd95d2c8 [formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]]]]]
Former-commit-id: 19fd95d2c8
Former-commit-id: f31e0b99f7 [formerly ad99747ea8] [formerly 4a10957512] [formerly 573da9a80d237d04037b8129933bb4b37817ec52 [formerly 6ab33d2052c840a4a5f0ae570b4700da2eac8923] [formerly 4a10957512 [formerly b4367903b0]]]
Former-commit-id: a84f65d564adf9e7b2c9e064b749594ec3149ab4 [formerly 2169ccf6f6caa4c42e2d094d2ff3047464e21f2c] [formerly 691e6d788e [formerly 084f5b7fdf]]
Former-commit-id: 691e6d788e
Former-commit-id: 75eaa4cde0
2013-02-12 11:59:45 -06:00
Dustin Johnson
1a268d04da Issue #1543 Add testing of current OpenDAP type retrievals.
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.

Amend:
  Peer review comments.
  Change to use Spring transactions.

Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366

Former-commit-id: b3cd53cf46 [formerly c79c031f62] [formerly 0d548bd66f] [formerly 0d548bd66f [formerly 8307af022c]] [formerly b3cd53cf46 [formerly c79c031f62] [formerly 0d548bd66f] [formerly 0d548bd66f [formerly 8307af022c]] [formerly ef32853dc1 [formerly 0d548bd66f [formerly 8307af022c] [formerly ef32853dc1 [formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]]]]]
Former-commit-id: ef32853dc1
Former-commit-id: 0d3d1d3f6d [formerly ae6a451422] [formerly 73a5667256] [formerly 5293b04d2dc1f39e6fabd0187f24dc0748662336 [formerly 143e062f3345112806fef29bb7754963c3fc28dc] [formerly 73a5667256 [formerly e504a474f9]]]
Former-commit-id: 89f5ba7964d2dd7bd5a6a92626eb43da142363f9 [formerly a69874d13e21bedfe5a86f9a76cacb772976a779] [formerly 35b13ba973 [formerly e48bf48821]]
Former-commit-id: 35b13ba973
Former-commit-id: d9fe43006a
2013-02-11 14:21:57 -06:00
Steve Harris
3c85f63935 13.2.1-6 baseline
Former-commit-id: f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly a46e33f06e [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 6b128749f2 [formerly 5027d2365b] [formerly bbe92e6824] [formerly f3506870f6207481b364a8cfac79c7de4d08f83e [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d] [formerly bbe92e6824 [formerly 30d38334cc]]]
Former-commit-id: 99ffc46efa72b085e555d1c7d241e0316fa33b30 [formerly 0cd3f4b5889bda9de32b546358edf3d8210d3ad8] [formerly dc55ef579a [formerly 0c128dd8f0]]
Former-commit-id: dc55ef579a
Former-commit-id: b43935a991
2013-02-07 16:00:39 -06:00
Dustin Johnson
887caee2f0 Issue #1543 Add ability to save/read dods files back to net.dods
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf

Former-commit-id: de1c3878dc [formerly 23449a73bf] [formerly efe1bcc4b5] [formerly efe1bcc4b5 [formerly cd381cb819]] [formerly de1c3878dc [formerly 23449a73bf] [formerly efe1bcc4b5] [formerly efe1bcc4b5 [formerly cd381cb819]] [formerly febe492056 [formerly efe1bcc4b5 [formerly cd381cb819] [formerly febe492056 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]]]]]
Former-commit-id: febe492056
Former-commit-id: 24dadd9eac [formerly 7ad9070600] [formerly c81cb3d60b] [formerly 8e04bbcbc1b8a7b35ce4e41e2242abba2115c0ee [formerly 8ed6a0d05f4ab5e36a81ae666ed0b62384b8afd6] [formerly c81cb3d60b [formerly fffbb32775]]]
Former-commit-id: f2ab676bb125d7be9571c710b387a7592889ce48 [formerly 21356a47c76d0ac4674803ca4b53386af099cd4e] [formerly 547362b6bb [formerly 999f3cbcd5]]
Former-commit-id: 547362b6bb
Former-commit-id: 31151f3c5a
2013-02-05 14:07:30 -06:00
Steve Harris
ccbd8dde52 13.2.1-2 baseline
Former-commit-id: 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 328c6dccad [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]]
Former-commit-id: 328c6dccad
Former-commit-id: 19f4c6b47d [formerly ce726fadc7] [formerly d9be4dce21] [formerly 2627373644ec7ef09825bbc0c168afd0abd1a3fe [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050] [formerly d9be4dce21 [formerly 47cc08ac79]]]
Former-commit-id: dc8171a7281c254994a85334494b23b7e0b2a8db [formerly 281ab815ed143a9ff49cedae7054da06195e3c69] [formerly 2779f5c6d9 [formerly 547c1dedd1]]
Former-commit-id: 2779f5c6d9
Former-commit-id: b92dfd1b62
2013-01-23 11:18:44 -05:00
Dustin Johnson
7e7af90768 Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 5c7fbb1841 [formerly 40ef4c5947] [formerly 3ec05a5a9c] [formerly 3ec05a5a9c [formerly 557de162b0]] [formerly 5c7fbb1841 [formerly 40ef4c5947] [formerly 3ec05a5a9c] [formerly 3ec05a5a9c [formerly 557de162b0]] [formerly 15c2c55ff9 [formerly 3ec05a5a9c [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 623f92965c [formerly 02604beac9] [formerly 756080321e] [formerly 2e952681a8cee71340bb60edb67ba32dc47a3af5 [formerly 6bc759f6c2019b3fef1eb1a080cf002dc07697ce] [formerly 756080321e [formerly a3c99f86bb]]]
Former-commit-id: 00b1956f849de752f4d2a6d3e577ea076b7d9346 [formerly 07f8633fb9fb320b16573c6dc1052a735e4bf124] [formerly 7da688f138 [formerly 2168713505]]
Former-commit-id: 7da688f138
Former-commit-id: a2ca5bd06f
2013-01-22 11:45:18 -06:00
Dustin Johnson
eb740a64fe Issue #1441 Break net.dods dependency on AWIPS code
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480

Former-commit-id: 28e808b91e [formerly 3c2ace6854] [formerly 3ebe0cf1ca] [formerly 3ebe0cf1ca [formerly ddcc816bba]] [formerly 28e808b91e [formerly 3c2ace6854] [formerly 3ebe0cf1ca] [formerly 3ebe0cf1ca [formerly ddcc816bba]] [formerly c00f5f394a [formerly 3ebe0cf1ca [formerly ddcc816bba] [formerly c00f5f394a [formerly 010eabebb27f6a2571ffb2a09e1715cb84c57ce9]]]]]
Former-commit-id: c00f5f394a
Former-commit-id: 8eb923dabe [formerly 773a3303da] [formerly 59a209e77d] [formerly 20a0d0301078a5fee7dd667d93d7484604bca8fd [formerly 4fdeee1cd88dd8b672dbfac13924276692db343f] [formerly 59a209e77d [formerly c29d2e2e71]]]
Former-commit-id: 6329add887f3e261bea048531b785342b30cd0b5 [formerly df764faee1a820d7e1c3135dff3105e8c7cec707] [formerly 24d1f60c83 [formerly 4aa7257146]]
Former-commit-id: 24d1f60c83
Former-commit-id: 283acaab90
2013-01-10 12:06:39 -06:00
Richard Peter
7248f7a327 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: eed654179f [formerly 95f0508c29] [formerly d0a6ba23e5] [formerly d0a6ba23e5 [formerly 029ebaa63a]] [formerly eed654179f [formerly 95f0508c29] [formerly d0a6ba23e5] [formerly d0a6ba23e5 [formerly 029ebaa63a]] [formerly 328be6ac2b [formerly d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: b480278be5 [formerly 177a54d19a] [formerly 80bf1d7a28] [formerly 734795b497aa969bad1d1a49c78928ce2dc06a5e [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46] [formerly 80bf1d7a28 [formerly 6a5a0d7d09]]]
Former-commit-id: cff48810db7c3c538cd226e24e473cc5407da6e2 [formerly 8e36b37de071d25b4a9a89babcf0974ae973fdbe] [formerly 398b47967d [formerly 709af3b25e]]
Former-commit-id: 398b47967d
Former-commit-id: 7d529beed2
2013-01-09 17:55:05 -06:00
Bryan Kowal
3537a231ec Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: ecf0b1fb0d [formerly 199e202979] [formerly ab8b346489] [formerly ab8b346489 [formerly c8a43edd9e]] [formerly ecf0b1fb0d [formerly 199e202979] [formerly ab8b346489] [formerly ab8b346489 [formerly c8a43edd9e]] [formerly d6b4cb65f4 [formerly ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: e0b7bbe036 [formerly 0e985cf0f3] [formerly 6d7f57c62a] [formerly 0dd33edc97fd40ee1e23f636ee8460ede5c150ef [formerly acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8] [formerly 6d7f57c62a [formerly 146c43a606]]]
Former-commit-id: 1750beb59730d70fb8a19cf09ec110d72aded2a1 [formerly caceba3a84e843b279eb8a807b33e26d81487e49] [formerly 1996f92f7e [formerly 0136f9d5a3]]
Former-commit-id: 1996f92f7e
Former-commit-id: 904678e8f4
2013-01-07 12:16:01 -06:00
Steve Harris
a2241acbc5 13.1.2-6 baseline
Former-commit-id: 750f03f602 [formerly 1d4d25b49b] [formerly efd3392abe] [formerly efd3392abe [formerly 8e5f9e0e6c]] [formerly 750f03f602 [formerly 1d4d25b49b] [formerly efd3392abe] [formerly efd3392abe [formerly 8e5f9e0e6c]] [formerly 59969775ad [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]]
Former-commit-id: 59969775ad
Former-commit-id: 7058edde32 [formerly fe763963e9] [formerly 82a1ed77a4] [formerly e0da2714c31e9f48ef47551baeecd5541fe2e224 [formerly fa884fbcd584330564fea44a1538e11036e753a8] [formerly 82a1ed77a4 [formerly dbcae57f57]]]
Former-commit-id: f1899c432c7f194616c4f9d49b19f53f87a0c962 [formerly 385d5b42196eb703cc60637c47506c02c454b5fc] [formerly b7f180d9d3 [formerly 05bdc0ecd2]]
Former-commit-id: b7f180d9d3
Former-commit-id: 3e63f280a2
2013-01-06 14:55:11 -06:00
Steve Harris
2827d6bd6e 13.1.2-2 baseline
Former-commit-id: e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly 4ba416aeb3 [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 771913b0c7 [formerly 82cdde8491] [formerly cd4185ef5c] [formerly 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c [formerly 941337c553]]]
Former-commit-id: 5cd56308fe7c05824700e702851648ed30cdff6e [formerly c69e1900269e630aefc061c2464bc8fea1c9776a] [formerly f52ec0b0a0 [formerly b6fa9b4858]]
Former-commit-id: f52ec0b0a0
Former-commit-id: 745f2c6409
2013-01-06 14:32:24 -06:00
Ron Anderson
1f172f6d31 Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1

Former-commit-id: 83728c7a48 [formerly e5c1e61664] [formerly 3e4aeeab8b] [formerly 3e4aeeab8b [formerly 753fa0487b]] [formerly 83728c7a48 [formerly e5c1e61664] [formerly 3e4aeeab8b] [formerly 3e4aeeab8b [formerly 753fa0487b]] [formerly 639b5abbd9 [formerly 3e4aeeab8b [formerly 753fa0487b] [formerly 639b5abbd9 [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]]]]
Former-commit-id: 639b5abbd9
Former-commit-id: b994aae11b [formerly 3ef1648013] [formerly 8b81f0bfb4] [formerly ab6e5ea4e62a5d797ab8707c10eadb6e386f0597 [formerly 268b50c70033e4dcada30393facee318b4eee737] [formerly 8b81f0bfb4 [formerly 995f28220a]]]
Former-commit-id: cb27030baaf02899bdfb108e67ae9039ee2ce568 [formerly 478c9f69d24b78dec665e13375c109ca93983718] [formerly c341ac0f55 [formerly 676819adfa]]
Former-commit-id: c341ac0f55
Former-commit-id: c62c47db45
2012-12-13 15:25:24 -06:00
Ron Anderson
793c35ca8c Issue #1393 Add additional jars to org.geotools
Change-Id: I10aaef928d2eb7333d3d65c3871b633d5760e14f

Former-commit-id: 197c387bc1 [formerly 3b29368389] [formerly 30c396680c] [formerly 30c396680c [formerly 95696f6396]] [formerly 197c387bc1 [formerly 3b29368389] [formerly 30c396680c] [formerly 30c396680c [formerly 95696f6396]] [formerly 7cd3b46dfd [formerly 30c396680c [formerly 95696f6396] [formerly 7cd3b46dfd [formerly 910af88ea60686f094bb3de17f5412cb9656111f]]]]]
Former-commit-id: 7cd3b46dfd
Former-commit-id: fd5924afd0 [formerly 8ac9be23c6] [formerly 87f3e0f015] [formerly 3efd5fd9b8677936693434ba1ccebd1f97589cc1 [formerly aac2fc71ff06ed900732b4fedab93a2fbd417eab] [formerly 87f3e0f015 [formerly a96fa17142]]]
Former-commit-id: 6ee1e2f600e3699a299b0e2d9c72b66bf574ce48 [formerly 8bbeec3c85599cd933b7f35f6e0dee5ed2c15dc5] [formerly 04dc7bc022 [formerly 010c54b239]]
Former-commit-id: 04dc7bc022
Former-commit-id: 7e0d1195da
2012-12-06 14:17:35 -06:00
Matt Nash
0347d215b4 Issue #1369 fix geotiff import in CAVE
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50

Former-commit-id: 548b6b82f2 [formerly b591c681fb] [formerly cb9cd97d1f] [formerly cb9cd97d1f [formerly fc4d7daab4]] [formerly 548b6b82f2 [formerly b591c681fb] [formerly cb9cd97d1f] [formerly cb9cd97d1f [formerly fc4d7daab4]] [formerly 10d399aafe [formerly cb9cd97d1f [formerly fc4d7daab4] [formerly 10d399aafe [formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]]]]]
Former-commit-id: 10d399aafe
Former-commit-id: 7283befe73 [formerly d5654048bd] [formerly 01dc19b06d] [formerly 2bf038be261236fe5ec34b14f5ac8767fb6016ed [formerly 919796c9928b099579e5d3474a4ef09ebcf528d6] [formerly 01dc19b06d [formerly c9372636d9]]]
Former-commit-id: a5c5ea1c7a8c022bd423f8469df8d8e8df1f7842 [formerly 8169e8edbe656bfd9d3be0b23d6119b2f699421a] [formerly 2a207511e4 [formerly dc7355a3e4]]
Former-commit-id: 2a207511e4
Former-commit-id: 6b907be8c9
2012-12-06 12:02:11 -06:00
Nate Jensen
ce4d1c09f4 Merge "Issue #1325 add missing sourcepath for jts" into development
Former-commit-id: 5a100e5125 [formerly 1e1049386d] [formerly 397c71cb00] [formerly 397c71cb00 [formerly 19d74235d9]] [formerly 5a100e5125 [formerly 1e1049386d] [formerly 397c71cb00] [formerly 397c71cb00 [formerly 19d74235d9]] [formerly c4e1d26056 [formerly 397c71cb00 [formerly 19d74235d9] [formerly c4e1d26056 [formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]]]]]
Former-commit-id: c4e1d26056
Former-commit-id: dd364a146c [formerly 4475544f1a] [formerly 72a741c6a3] [formerly 5452b26335646d6073672c2f7fa4a37a6f89105c [formerly 2a500d5ac4d21be7fe96c6af1e73df54c1aa995e] [formerly 72a741c6a3 [formerly 84e98e2364]]]
Former-commit-id: 7c934d0f79e654ff715eda18c3ac1c1511ecba9a [formerly 073a2033994835edea92a0e233ef779691604007] [formerly cabeee008a [formerly e76a412fb4]]
Former-commit-id: cabeee008a
Former-commit-id: 473c368786
2012-11-15 11:02:35 -06:00
Ron Anderson
59a796d6ca Issue #1325 add missing sourcepath for jts
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653

Former-commit-id: 2b5a6d409e [formerly f3ee84c21e] [formerly 0984f201b2] [formerly 0984f201b2 [formerly 94ec6eaeaf]] [formerly 2b5a6d409e [formerly f3ee84c21e] [formerly 0984f201b2] [formerly 0984f201b2 [formerly 94ec6eaeaf]] [formerly 457d55ecdf [formerly 0984f201b2 [formerly 94ec6eaeaf] [formerly 457d55ecdf [formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]]]]]
Former-commit-id: 457d55ecdf
Former-commit-id: 786e449ca5 [formerly f45b7720e1] [formerly 9d832ad8be] [formerly be035c706e0225d3359bcfc16e6d572d778862a9 [formerly 0a5977386395099b02d8f8518f5295e0e06d0602] [formerly 9d832ad8be [formerly 1157e5a55e]]]
Former-commit-id: 37b53d6193fec91dc0b49644cf942cccf06ba508 [formerly c14adb26b07a5e1a6cce2422a3ce311966ce9431] [formerly 7a9826a27f [formerly c55588f57c]]
Former-commit-id: 7a9826a27f
Former-commit-id: 0314a1e4c3
2012-11-15 11:00:02 -06:00
Dustin Johnson
a418bb8181 Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: 231a1520c3 [formerly f1cfa9a60d] [formerly afd9a767ea] [formerly afd9a767ea [formerly 7d9e7567bd]] [formerly 231a1520c3 [formerly f1cfa9a60d] [formerly afd9a767ea] [formerly afd9a767ea [formerly 7d9e7567bd]] [formerly 7c59f9ea41 [formerly afd9a767ea [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: bb2a53b80d [formerly 21dc859b85] [formerly 5d410ff934] [formerly 750bfa9a334c2fa7a3c2e02579adc8bc2804ffae [formerly caae98dd9803817a99d22d4cbbe38eccdaeff2f9] [formerly 5d410ff934 [formerly c0c60c2488]]]
Former-commit-id: a0ca2859c265bc96c51582646dc60c90972490c9 [formerly 0453e709fd374f851f35d3dfd273d46e8e3bbc65] [formerly 0c5a52f3b1 [formerly 3129d3bd3a]]
Former-commit-id: 0c5a52f3b1
Former-commit-id: f4fc1060be
2012-11-14 12:19:10 -06:00
Ron Anderson
c9af4ef630 Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0

Former-commit-id: 74bc7dd511 [formerly dbc5a5bb97] [formerly 1bb7258935] [formerly 1bb7258935 [formerly 8a5a2dc532]] [formerly 74bc7dd511 [formerly dbc5a5bb97] [formerly 1bb7258935] [formerly 1bb7258935 [formerly 8a5a2dc532]] [formerly 795dfdc9dd [formerly 1bb7258935 [formerly 8a5a2dc532] [formerly 795dfdc9dd [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]]]]
Former-commit-id: 795dfdc9dd
Former-commit-id: b8b856e167 [formerly 88e7d313c4] [formerly d6a33fb39f] [formerly b997d9c0f61d52f183a6c0aa69ae191e18fe6ff6 [formerly 20e198ff53cca6785546ec870a4e207bdb8ddfbc] [formerly d6a33fb39f [formerly bad09a9c0d]]]
Former-commit-id: 72f86baeeb0af0d6b48d23e76e22da324e1fba91 [formerly 3b9d5c03dba338511c7106110cef946f3ebdfc75] [formerly 6bf06bf78f [formerly dc6b83dccc]]
Former-commit-id: 6bf06bf78f
Former-commit-id: ae896a9da2
2012-11-13 12:06:54 -06:00
Ron Anderson
4c24d058c8 Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94

Former-commit-id: 1659753498 [formerly e7cd1f9def] [formerly 7aaf4db2dc] [formerly 7aaf4db2dc [formerly f709ab812a]] [formerly 1659753498 [formerly e7cd1f9def] [formerly 7aaf4db2dc] [formerly 7aaf4db2dc [formerly f709ab812a]] [formerly 303994ff1b [formerly 7aaf4db2dc [formerly f709ab812a] [formerly 303994ff1b [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]]]]
Former-commit-id: 303994ff1b
Former-commit-id: 81f6e0de1d [formerly 366df432bc] [formerly 3ae270a65d] [formerly 72151392a62cc62bce7240c17c89c7b9c68b11ee [formerly eb6052e7b3aef0480bd8fd7500f4d915b645104c] [formerly 3ae270a65d [formerly 7bf1316e8c]]]
Former-commit-id: 90bcb3ccff4d29226848450821d9d7a0561c420f [formerly 99d7658e5a1037952c27cb188299ce2c75c3e4ee] [formerly 46bedc0009 [formerly 80a6ade49c]]
Former-commit-id: 46bedc0009
Former-commit-id: d2d6f87ea4
2012-11-12 15:02:08 -06:00
Dustin Johnson
57c029b9a1 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: 91cad99824 [formerly 19c2e301b8] [formerly db4d728eb7] [formerly db4d728eb7 [formerly 595c421e47]] [formerly 91cad99824 [formerly 19c2e301b8] [formerly db4d728eb7] [formerly db4d728eb7 [formerly 595c421e47]] [formerly 2b6e98954e [formerly db4d728eb7 [formerly 595c421e47] [formerly 2b6e98954e [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]]]
Former-commit-id: 2b6e98954e
Former-commit-id: a6d72a4c39 [formerly 272761ae41] [formerly eac5bc8197] [formerly de9f2ae72306eebeb98b4928d9525fc9511b4dd5 [formerly 3fe0762a484ee2e5830878352f009474c977d9f7] [formerly eac5bc8197 [formerly 0806be04dd]]]
Former-commit-id: ba888e2b41dd9c897005f308d7b06e70667a9897 [formerly 8e66108e274790c8749fcb207ab943f1083f8acf] [formerly f9c6566ba7 [formerly 1317e0b3ef]]
Former-commit-id: f9c6566ba7
Former-commit-id: 63240a4ec5
2012-11-08 14:47:17 -06:00
Dustin Johnson
8863642277 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: c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly 1dbeb22893 [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: e9b7956d0f [formerly cd5faf58bf] [formerly 2d1e886cf3] [formerly e239f886daa359a6280760b8fa6b78b5c8380ec8 [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc] [formerly 2d1e886cf3 [formerly 4222b24d09]]]
Former-commit-id: 807d5554bc7b021defe634c74b7c5d059408a145 [formerly 58274565203c021076e001f24f089a98cd2216f6] [formerly b4a13190ad [formerly 6613c51d3b]]
Former-commit-id: b4a13190ad
Former-commit-id: eb82c7672b
2012-11-08 09:57:16 -06:00
Max Schenkelberg
6c4bb4e5a0 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.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: b509b0b6f8 [formerly 94e64c9b0d] [formerly f069f34a96] [formerly f069f34a96 [formerly 2f90120248]] [formerly b509b0b6f8 [formerly 94e64c9b0d] [formerly f069f34a96] [formerly f069f34a96 [formerly 2f90120248]] [formerly ca4177dd08 [formerly f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]]]
Former-commit-id: ca4177dd08
Former-commit-id: 7c98f74df1 [formerly f9e6347863] [formerly 5a5bd522a1] [formerly 082a977ca10e61c029a5c8992d7e42d06b9c7952 [formerly 42f60026840ae4bf86371ebfd3e40ca565028c4b] [formerly 5a5bd522a1 [formerly 747ab974e9]]]
Former-commit-id: 2951cbd77dc372be3c17a88e1f16e6924b339e01 [formerly 0f95dc114844e36c224300902fd5c26ef83108c0] [formerly 2345861756 [formerly 50625b0453]]
Former-commit-id: 2345861756
Former-commit-id: 3a1cefc612
2012-11-07 10:44:42 -06:00
Dustin Johnson
237b100361 Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: 6d36eb6f2e [formerly a03d79bbf0] [formerly 8d5c86f31e] [formerly 8d5c86f31e [formerly 2f28e19bf6]] [formerly 6d36eb6f2e [formerly a03d79bbf0] [formerly 8d5c86f31e] [formerly 8d5c86f31e [formerly 2f28e19bf6]] [formerly a8f9c4f90a [formerly 8d5c86f31e [formerly 2f28e19bf6] [formerly a8f9c4f90a [formerly 87641d4b41b10f66e12c8d839548b8012e900438]]]]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 9e1ebe4f1d [formerly feb6c540b8] [formerly 7b4967b5bb] [formerly 1915700ab396ee39a1202d7cc5c2d4b9b9581824 [formerly 8eeb213e5becb7f3d249c38ca4c6b67ae70efd03] [formerly 7b4967b5bb [formerly 7f994472ae]]]
Former-commit-id: 2b14bbcd3b260d9f09472e96532e2645f683bebf [formerly 1573ccd4bca30af5c08df435bccce6502732d849] [formerly 7843e33544 [formerly e0c68bde6d]]
Former-commit-id: b2e2d4a02d818357663ab432c314452034764cba [formerly 7843e33544]
Former-commit-id: 42b6933141
2012-11-01 16:31:14 -05:00
Dustin Johnson
9d4be7348f Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: d51d594e7e [formerly 7d0e4a6e75] [formerly 8e69107b5a] [formerly 8e69107b5a [formerly 98d7beae50]] [formerly d51d594e7e [formerly 7d0e4a6e75] [formerly 8e69107b5a] [formerly 8e69107b5a [formerly 98d7beae50]] [formerly 31d7d09c10 [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: ae183fca66 [formerly fe8a2a3b09] [formerly e7a0f96a9a] [formerly 55a41099e1396bc77b91bb9c62fad3b1d22efc4b [formerly 465044dd2793505eba62cb46e6b3a8ac48623765] [formerly e7a0f96a9a [formerly bcf575966b]]]
Former-commit-id: b7a0d046a48a764818e233bf0f08a36bc23a5f3a [formerly df421cc2225941d22d1932b1c7a86fb3bdad68ce] [formerly 931d94d1de [formerly 4d9c945388]]
Former-commit-id: c1eaba9befa2ec7cf2eeda222b35df8a9dffd0fb [formerly 931d94d1de]
Former-commit-id: 4bc4d95b21
2012-11-01 13:36:06 -05:00
Steve Harris
cafcd7036b 12.11.1-4 baseline
Former-commit-id: e177511e24 [formerly 6e44abdba1] [formerly 98171b5de9] [formerly 98171b5de9 [formerly d3497e47eb]] [formerly e177511e24 [formerly 6e44abdba1] [formerly 98171b5de9] [formerly 98171b5de9 [formerly d3497e47eb]] [formerly 6958b861f0 [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]]
Former-commit-id: 6958b861f0
Former-commit-id: f230f4d248 [formerly c9b563338a] [formerly 2c82d9cb07] [formerly ce2c9618fca3eeff95ca78dceed5a5cdc772fbe4 [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1] [formerly 2c82d9cb07 [formerly cbbdb231ce]]]
Former-commit-id: 5593c4b491703cc2606dd21a1dc15bdbd66a4ed3 [formerly 892afd7b093bec93e8f4c170f6b8ae08bea40239] [formerly 35e34308c5 [formerly 560f0d9cc3]]
Former-commit-id: 35e34308c5
Former-commit-id: 8794e3b599
2012-10-16 13:27:07 -05:00
Steven Harris
93236b4084 12.11.1-1 baseline
Former-commit-id: 78133c5314 [formerly ffe3641057] [formerly 0e86bfd1d3] [formerly 0e86bfd1d3 [formerly 618aa3f316]] [formerly 78133c5314 [formerly ffe3641057] [formerly 0e86bfd1d3] [formerly 0e86bfd1d3 [formerly 618aa3f316]] [formerly feec28f274 [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]]
Former-commit-id: feec28f274
Former-commit-id: 6f0716689d [formerly 9c67bbab77] [formerly f5e63d5f93] [formerly 183e013fa0cc3647a5509f1efaa773d6706225ff [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09] [formerly f5e63d5f93 [formerly 8843ffd022]]]
Former-commit-id: 7d82076e7dce91a21df5c801d2e903299b1b1d29 [formerly d6911f5473d9aadbb4a4b9d3389106feb8c83693] [formerly 2f855322f6 [formerly a544be6d83]]
Former-commit-id: 2f855322f6
Former-commit-id: db663faca9
2012-09-27 15:57:45 -05:00
Steve Harris
cb1a3bcfbf 12.10.1-3 baseline
Former-commit-id: 2f82c24930 [formerly 0403e7d0a9] [formerly de1639aea2] [formerly de1639aea2 [formerly 21f430062b]] [formerly 2f82c24930 [formerly 0403e7d0a9] [formerly de1639aea2] [formerly de1639aea2 [formerly 21f430062b]] [formerly 969e7e6dfd [formerly de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: ccf7db3390 [formerly 64699fa90b] [formerly f376a4b4db] [formerly a4719e9d3c45b845daebc1e7b62967b7a8660213 [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e] [formerly f376a4b4db [formerly 438d139fdd]]]
Former-commit-id: 9cf6ea0909f2af5c7ecb7d47672d4d944d6404f6 [formerly 477c548d5650883749d49288002c87221b218db7] [formerly 5030894212 [formerly faadb51529]]
Former-commit-id: 5030894212
Former-commit-id: 9d4e230e7a
2012-09-11 16:00:38 -05:00
Steve Harris
c6d379cd5c 12.9.1-10 baseline
Former-commit-id: bb39a650af [formerly 264d870cbf] [formerly bdb45cdfae] [formerly bdb45cdfae [formerly 3adc50a783]] [formerly bb39a650af [formerly 264d870cbf] [formerly bdb45cdfae] [formerly bdb45cdfae [formerly 3adc50a783]] [formerly cb9b80f3a0 [formerly bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: 73d57ac89f [formerly c704490769] [formerly f43a5af47f] [formerly 3965c844ff83fbd2750de49b6fb40d70f888abed [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3] [formerly f43a5af47f [formerly dc08c5a71a]]]
Former-commit-id: 2d6e24d7764f888be9861769bcd01d797db440e8 [formerly 8b8bb30a759783a20d278f5fb0049d2db76cb8dc] [formerly ede38c4b3f [formerly 5bb474d33c]]
Former-commit-id: ede38c4b3f
Former-commit-id: cba4faf995
2012-08-30 14:28:27 -05:00
Steve Harris
a2164a88d8 12.9.1-5 baseline
Former-commit-id: 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly f2fac39428 [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]]
Former-commit-id: f2fac39428
Former-commit-id: c68ab3311a [formerly d9faed979f] [formerly 7fb0b17bd5] [formerly 5b54a131b7dd8cd501953ba8fd918503d0851b4c [formerly 54140b7733222bbc423315196e9781453b12f896] [formerly 7fb0b17bd5 [formerly 72824561cb]]]
Former-commit-id: a2129aca55a7ff6fdaf13fb64bacec56ad158149 [formerly 84e9e52a92ae5e740b0daf680a98316f7435f7f7] [formerly 2d928d328e [formerly 9b5c2094ed]]
Former-commit-id: b40318710922ff74b3d17e2773847774993ac0db [formerly 2d928d328e]
Former-commit-id: 98059f9ef1
2012-08-21 15:27:03 -05:00
Steve Harris
d60e78a9ee 12.6.1-9 baseline
Former-commit-id: 56ce907ff2 [formerly 32fdf6ed3b] [formerly 7c064b6868] [formerly 7c064b6868 [formerly 2c0ff851ca]] [formerly 56ce907ff2 [formerly 32fdf6ed3b] [formerly 7c064b6868] [formerly 7c064b6868 [formerly 2c0ff851ca]] [formerly 27afa60345 [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]]
Former-commit-id: 27afa60345
Former-commit-id: 9fc0cbac36 [formerly e528bb0df2] [formerly dc50bc8443] [formerly 202bf137851885adaaf1ac7f8ae4b23be4084de6 [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d] [formerly dc50bc8443 [formerly 4f7bb90bb0]]]
Former-commit-id: 94f256444a3b2e57847ac115fc0d1511e30f8e94 [formerly 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4] [formerly 37f2b6e138 [formerly d5fa61041b]]
Former-commit-id: 37f2b6e138
Former-commit-id: c74431ba29
2012-07-10 07:53:49 -05:00
Steve Harris
7eaa5ba208 12.5.1-15 baseline
Former-commit-id: 015a8da70c [formerly 2f10c7a1e4] [formerly 8552902906] [formerly 8552902906 [formerly b13cbb7e00]] [formerly 015a8da70c [formerly 2f10c7a1e4] [formerly 8552902906] [formerly 8552902906 [formerly b13cbb7e00]] [formerly 3904c4ccf5 [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 8ccf4a080b [formerly 1f521a70b3] [formerly 97c4db937e] [formerly 97da88e714a2380193993a8566392a59d8676bcd [formerly 0e40eb424698bf43c230ac21347627590405fcb2] [formerly 97c4db937e [formerly 676ea3192f]]]
Former-commit-id: af467b247de91107ea43705eb1f608a755f6dd75 [formerly 5dd364497cd5da1357297a4b842e962ad3d5e006] [formerly 39ff9954f8 [formerly 9054c5ab6c]]
Former-commit-id: 39ff9954f8
Former-commit-id: 46068c6716
2012-06-08 13:39:48 -05:00
Steve Harris
a7d4792406 12.4.1-10 baseline
Former-commit-id: 5a9d6c7e53 [formerly 7fa9dbd5fb] [formerly 4bfbdad17d] [formerly 4bfbdad17d [formerly 9f8cb727a5]] [formerly 5a9d6c7e53 [formerly 7fa9dbd5fb] [formerly 4bfbdad17d] [formerly 4bfbdad17d [formerly 9f8cb727a5]] [formerly 8485b90ff8 [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 6723602d7c [formerly 40aa780b3d] [formerly 33a67cdd82] [formerly 52719153ecfda25f148e6c62deff2923a38c0bc2 [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319] [formerly 33a67cdd82 [formerly a28d70b5c5]]]
Former-commit-id: 8222befd757ec0a8a9a4056a4f80321f65ebe856 [formerly a16a1b4dd44fc344ee709abbe262aeed58a8339b] [formerly 0c25458510 [formerly e5543a0e86]]
Former-commit-id: 0c25458510
Former-commit-id: 7f90924706
2012-05-01 18:06:13 -05:00
Steve Harris
26b250dbd1 12.4.1-4 baseline
Former-commit-id: 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 2a216f333c [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 6456a7f75f [formerly 98d8b3f188] [formerly a2a6a18fae] [formerly 8177a31ae65520dcaf2978b703dc497369e03cf1 [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b] [formerly a2a6a18fae [formerly a4e519f3cd]]]
Former-commit-id: a5e6e414f62a4ad9f7e0da4037f64ad5885e2f16 [formerly 816045b74a6ddb3791f4e241a6f25a4d4ab3391a] [formerly 74b66d9683 [formerly 8cd5974f4c]]
Former-commit-id: 74b66d9683
Former-commit-id: 5b35d8a6e0
2012-04-18 15:18:16 -05:00
Steve Harris
3a2456ee1d Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 75847786a2 [formerly 55b44a00db] [formerly 608a0c17a0] [formerly 608a0c17a0 [formerly f9baa1c98c]] [formerly 75847786a2 [formerly 55b44a00db] [formerly 608a0c17a0] [formerly 608a0c17a0 [formerly f9baa1c98c]] [formerly 46e1499e43 [formerly 608a0c17a0 [formerly f9baa1c98c] [formerly 46e1499e43 [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]]]
Former-commit-id: 46e1499e43
Former-commit-id: 0e99cf2ef2 [formerly 1fa3e31716] [formerly 63764220c4] [formerly 65e8da8dd2aa030ee9808345b7320a010bd5aa0d [formerly 4963e367347650292e79807030506ea282547db3] [formerly 63764220c4 [formerly 096ba6eb30]]]
Former-commit-id: 9bd9420a9b1db9a4f7aba1d0b0a48cbaa6988574 [formerly 72d2a2722e035133e9f491f4cc02223a9f5a00ab] [formerly 034270857e [formerly 1328771113]]
Former-commit-id: 034270857e
Former-commit-id: fab0e2ccd5
2012-02-23 13:16:35 -06:00
Steve Harris
73825b3c57 removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 512ac11502 [formerly 2f8260ccbc] [formerly 07ac42866c] [formerly 07ac42866c [formerly c502603907]] [formerly 512ac11502 [formerly 2f8260ccbc] [formerly 07ac42866c] [formerly 07ac42866c [formerly c502603907]] [formerly ecb38ba165 [formerly 07ac42866c [formerly c502603907] [formerly ecb38ba165 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]]]
Former-commit-id: ecb38ba165
Former-commit-id: ccf612326a [formerly 9397ca10a8] [formerly d83100c3df] [formerly 9c803bac15aa44394bacac6800b4984dcdc4ae55 [formerly 7430208f5d1e69b088b0ad09205b10f1007182e4] [formerly d83100c3df [formerly a9b900821a]]]
Former-commit-id: 6b571252f47beae00d67eac8a7e13939ed476373 [formerly 45ca1834b3349431a2e9329f63d92b5396d451f6] [formerly 3433a1e31c [formerly 32fa2a28c5]]
Former-commit-id: 3433a1e31c
Former-commit-id: 3c8ac339bb
2012-02-23 12:45:50 -06:00
Steve Harris
65659c7ca7 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: f7e218e8f9 [formerly 5a96582f16] [formerly 92084b3f20] [formerly 92084b3f20 [formerly d0bbbfefcc]] [formerly f7e218e8f9 [formerly 5a96582f16] [formerly 92084b3f20] [formerly 92084b3f20 [formerly d0bbbfefcc]] [formerly 7a10ca9766 [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 1180916a07 [formerly 2d02f819be] [formerly 92b7072b82] [formerly 43e6cb72041ade192010e6fbe7f83b6adc71dc75 [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b] [formerly 92b7072b82 [formerly 3d511fe719]]]
Former-commit-id: 856bddcc44621b450aa6e450b43cd072b943423a [formerly 91921bfe8a96f90874dbc2e55763bb94f1fea024] [formerly 3aef320ffd [formerly ae9c52b012]]
Former-commit-id: 3aef320ffd
Former-commit-id: 43ff909553
2012-02-23 10:06:18 -06:00
Roger Ferrel
bdb97b9bea Issue #181
Changes from January ncep_cave

Former-commit-id: 0117e5a38b [formerly aa10b2f656] [formerly ae0981ac0f] [formerly ae0981ac0f [formerly 7427aeaf29]] [formerly 0117e5a38b [formerly aa10b2f656] [formerly ae0981ac0f] [formerly ae0981ac0f [formerly 7427aeaf29]] [formerly fa42f2dc60 [formerly ae0981ac0f [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]]]]
Former-commit-id: fa42f2dc60
Former-commit-id: 0eeb162e28 [formerly 38f1182c6e] [formerly 9475b22c54] [formerly a742c17ea3da1bc31084c33a2285e06f968b6e68 [formerly f688e047f0ccf0adc31f824c5e1224b8d1c1598b] [formerly 9475b22c54 [formerly 376f6868b6]]]
Former-commit-id: 90c1d2a3beb5dc5a0559f5a7a553ecb08e46fd00 [formerly 16e6613039d30140d16a08ef42c054c08fe5a737] [formerly 80b5a2049b [formerly 0d2ef82d19]]
Former-commit-id: 80b5a2049b
Former-commit-id: c42448a8d5
2012-01-26 09:26:07 -06:00
Bryan Kowal
79afc32536 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: ea61776821 [formerly c1d930b119] [formerly be0b6a87eb] [formerly be0b6a87eb [formerly 5039d66b12]] [formerly ea61776821 [formerly c1d930b119] [formerly be0b6a87eb] [formerly be0b6a87eb [formerly 5039d66b12]] [formerly cf4d56d0a0 [formerly be0b6a87eb [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 05027907f5 [formerly 3bc50618b7] [formerly f6b08149ad] [formerly cd7c0b6b07ae77fbd45b4c76b6cb4d998c2d7059 [formerly 04447b381e8f34176bf56aeac8375d7e5d6866ba] [formerly f6b08149ad [formerly 90c33ef882]]]
Former-commit-id: 5900c65d028b815318de2f78c708f3771a442117 [formerly 5deeaa5352ab19e9521a87ced725f98ed250df11] [formerly f0cdfeb9a8 [formerly a5a50ccfe0]]
Former-commit-id: c2947fc0e66fd8fdb7854cf3cb124b4404150d6e [formerly f0cdfeb9a8]
Former-commit-id: 819b77d5d0
2012-01-23 13:25:11 -06:00
Bryan Kowal
dffd0064d8 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 3057cd2656 [formerly 28957b7118] [formerly 971bf802ac] [formerly 971bf802ac [formerly 2142afe3f1]] [formerly 3057cd2656 [formerly 28957b7118] [formerly 971bf802ac] [formerly 971bf802ac [formerly 2142afe3f1]] [formerly 2b5ee4b940 [formerly 971bf802ac [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: c4a7b84ffd [formerly 4c4fc64253] [formerly a1dbdff475] [formerly f0404c650d01a559e9557702f048175f8d26e8bc [formerly e24d39003e4489633c8f3c358cda877ba7831b9e] [formerly a1dbdff475 [formerly 2a7b92ec91]]]
Former-commit-id: 5f83ac231a5665dc9cfa2c3eb054a61816ed9af2 [formerly 9e6a3f061015a2573aab1ed70eb6bcd887a1fb1a] [formerly 7afea63245 [formerly 3bcecdfe66]]
Former-commit-id: 7afea63245
Former-commit-id: 5609d47b35
2012-01-20 11:37:38 -06:00
Matt Nash
1b128de135 Moving 12.1.1 into ss_sync
Former-commit-id: 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly c83e5ff474 [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]]
Former-commit-id: c83e5ff474
Former-commit-id: 50944163ba [formerly fa4cd88c90] [formerly 82300ccdcf] [formerly bcc32c10bc [formerly 21d2361f00] [formerly 82300ccdcf [formerly 1faae42484]]]
Former-commit-id: bcc32c10bc [formerly 21d2361f00]
Former-commit-id: bcc32c10bc
Former-commit-id: 515196cb86
2012-01-19 11:53:12 -06:00
root
57877615f5 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 06a8b51d6d [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 2c3569dd39 [formerly 9bb8decbcf] [formerly 8e80217e59] [formerly e2ecdcfe33 [formerly 377dcd10b9] [formerly 8e80217e59 [formerly 3360eb6c5f]]]
Former-commit-id: e2ecdcfe33 [formerly 377dcd10b9]
Former-commit-id: e2ecdcfe33
Former-commit-id: 7dbd17a5aa
2012-01-06 08:55:05 -06:00