Commit graph

2822 commits

Author SHA1 Message Date
Richard Peter
ffe0b35085 Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

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

Former-commit-id: deea93d7e7 [formerly 56309efafe] [formerly 1ab118958f] [formerly 960bc6db69 [formerly 1ab118958f [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]
Former-commit-id: 960bc6db69
Former-commit-id: c70110d442b8e122c8572c0d2850cbac6c42bc1a [formerly e575c19ab6]
Former-commit-id: a06bb176ba
2013-05-21 10:26:18 -05:00
Nate Jensen
1c581fd607 Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development
Former-commit-id: 8e7905197a [formerly 18e6f84418] [formerly f16606cfba] [formerly d02ce9d389 [formerly f16606cfba [formerly a6b4bd31146009e3d958efde759408daec52d2f4]]]
Former-commit-id: d02ce9d389
Former-commit-id: 8f11dd9f2fd571f626dc03f0b07328cca234dcf7 [formerly 80b1a9d18c]
Former-commit-id: 51a31a08ca
2013-05-21 10:22:24 -05:00
Dustin Johnson
bf3f162fc9 Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967]
Former-commit-id: bd65447c9f
2013-05-21 08:19:34 -05:00
Steve Harris
5db95cce55 13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]
Former-commit-id: 4d88863515
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
bd89419f5e Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]
Former-commit-id: 931e76ae59
Former-commit-id: b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4]
Former-commit-id: 30eb486e45
2013-05-20 18:00:32 -05:00
Richard Peter
5efe58df0b Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 36148f00d4aad37c667d7244e309f001bd6335f8 [formerly 8b7cf1beb8]
Former-commit-id: 72206676ee
2013-05-20 17:49:22 -05:00
Roger Ferrel
0db7741ce5 Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

Former-commit-id: 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly dfd586fca6 [formerly 16c7de874a [formerly 57a43dfefb79d49895beace44930db630cd502be]]]
Former-commit-id: dfd586fca6
Former-commit-id: 4c43796fabb9d77c96bd1af9250c9c7f64374a79 [formerly c9e6e367fe]
Former-commit-id: 4a5073902f
2013-05-20 17:43:47 -05:00
Ben Steffensmeier
a075a5d665 Issue #1869 Remove DataURI column from sat plot types.
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb

Former-commit-id: 7d52bbbaa0 [formerly aa3b8c80f4] [formerly 26e80bbd18] [formerly 885b106652 [formerly 26e80bbd18 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]]
Former-commit-id: 885b106652
Former-commit-id: cbee870e9d200703dc59998e51a5ad2251e0852a [formerly 13b2b4afef]
Former-commit-id: a03dbd284b
2013-05-20 17:27:15 -05:00
Dustin Johnson
4d30dc16c6 Issue #2000 Subscription overlap configuration GUI
Amend:
  Peer review comments.

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 095acb5ac3 [formerly 554347f17c] [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly 5b62669f8e [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 97b3d509a5df6b5067753a00490a5ec5d5462760 [formerly 7858a3b57f]
Former-commit-id: 3a504d1e7b
2013-05-20 17:12:47 -05:00
Bryan Kowal
075f4bdd6a Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries
- removed only python 2.5 native libraries
- removed old scripts utilized by IzPack


Former-commit-id: 4452ec48d9 [formerly 5b6fa4e360] [formerly e4cdc64c07] [formerly 35be00792e [formerly e4cdc64c07 [formerly cf94670fe9807a5253209da892f7305defaf32a8]]]
Former-commit-id: 35be00792e
Former-commit-id: f6db456f7652fc448445374bbe6b5e50cb0f12a8 [formerly 13febf859e]
Former-commit-id: 07188502aa
2013-05-20 16:58:56 -05:00
Bryan Kowal
0ad544cd3e Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
Former-commit-id: 3a5ae717cb [formerly 081d1c724a] [formerly 99ba7adfe7] [formerly e4874a873a [formerly 99ba7adfe7 [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]]
Former-commit-id: e4874a873a
Former-commit-id: e1ec52afdddf5b48f29ce53fbeaaa24e087bb331 [formerly 31605b7a94]
Former-commit-id: 3f20eed975
2013-05-20 15:03:33 -05:00
Richard Peter
5cfae97674 Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 0d7f36c84c [formerly 8079561032] [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 30a61c3e17 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]
Former-commit-id: 3d861eca69
Former-commit-id: 8cf1fe91f6ba1e424448c5cb7262a1998e5c2cfc [formerly 0ced8c87e4]
Former-commit-id: e03cf56895
2013-05-20 14:48:47 -05:00
Steve Harris
ac83fff244 13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]
Former-commit-id: 7e04d8cd13
2013-05-20 10:52:47 -04:00
Bryan Kowal
1e095fc20b Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
Former-commit-id: dd508d5bdd [formerly db9b06cc9d] [formerly eb54fa14ad0ff4cfcc795a392370b390ab7327ac [formerly d8ce0f369c]] [formerly a070d28ecc [formerly d8ce0f369c [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]
Former-commit-id: a070d28ecc
Former-commit-id: 6bbd21751b1aa7bfaacb409592f0ad2110b3d569 [formerly 7dd9b1e1c0]
Former-commit-id: a52363e2df
2013-05-17 18:21:03 -05:00
Richard Peter
f186912fe1 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]
Former-commit-id: aff520d61b
2013-05-17 10:33:18 -05:00
Bryan Kowal
0694a91485 Issue #1927 - handle common base until new build implementation
Former-commit-id: 3f924f74b8 [formerly 84c3c114a9] [formerly c65cf6534415b98d0066b6b117c42063775cf382 [formerly 63f57de31f]] [formerly 79816de308 [formerly 63f57de31f [formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]]
Former-commit-id: 79816de308
Former-commit-id: f7807c86dc7b6a81272596cbb22664b42ab2bec4 [formerly 9ea4bab577]
Former-commit-id: 5d21fa1fd7
2013-05-16 23:56:47 -05:00
Max Schenkelberg
0c954fc284 Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: 71624ccda3 [formerly 4d435d3dd5] [formerly c421240835] [formerly d07de0870f [formerly c421240835 [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]
Former-commit-id: d07de0870f
Former-commit-id: ccf927342ef0766ab38c884f7d5b2cc881d0fb52 [formerly a94469df82]
Former-commit-id: 7ce0b7ef13
2013-05-16 18:04:26 -05:00
Nate Jensen
8ff1aae296 Merge "Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource." into development
Former-commit-id: c7868a028e [formerly 9a3f855a1a] [formerly 39543d7ee0] [formerly 6ef214f1b8 [formerly 39543d7ee0 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]]
Former-commit-id: 6ef214f1b8
Former-commit-id: 45406f4e5394c5620f8f9c11ae40ea432dc3982e [formerly ffa74c3bdb]
Former-commit-id: 7f58e8a568
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
7651920be7 Issue #1869 Remove DataURI column from qc.
Former-commit-id: c7b7f58de8 [formerly 89b4bd571a] [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly c0d8dad8ae [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 50574b57e3d993a195cef03df3a9392ebf66dafd [formerly 6353b7e04b]
Former-commit-id: 777f12fbad
2013-05-16 17:48:37 -05:00
Nate Jensen
f3f2475bec Merge "Issue #1989 disable camel JMX to speed up edex" into development
Former-commit-id: 2376c4593f [formerly 0704a0a610] [formerly a5372205e6] [formerly b710a7c288 [formerly a5372205e6 [formerly d9e7d87f7eb454e66ecd42446544fcec473e95b6]]]
Former-commit-id: b710a7c288
Former-commit-id: 9b088541cd21fc5f1e9863ddceedb89b72c5a4ef [formerly e7001cfba5]
Former-commit-id: 7fb7c68b89
2013-05-16 17:33:18 -05:00
Nate Jensen
009ed8605d Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: 2c6fbd0c68 [formerly bc8d798973] [formerly bfcdcb607a] [formerly d905453660 [formerly bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]]
Former-commit-id: d905453660
Former-commit-id: 29c74ab437171949434e0b34fa54e7aeadcdb266 [formerly c3bafc88cd]
Former-commit-id: b57c84d12b
2013-05-16 17:13:46 -05:00
Steve Harris
9b898a6478 Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: f9535abb10 [formerly 87a31f9990] [formerly 16ba74496d] [formerly b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615]
Former-commit-id: b5d3ff1867
2013-05-16 13:45:58 -05:00
Bryan Kowal
ad92c1c79e Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds
- The new p2 director is not able to install zipped repositories; so, each repository
  is now unzipped before installation during the CAVE Assembly phase of the Windows
  32-bit build
- Adjusted the order of the p2 repositories are built so Windows will install them
  in the correct order during the CAVE Assembly phase of the Windows 32-bit build


Former-commit-id: da601e2c35 [formerly dccc6e4a96] [formerly 7e849f0af3] [formerly 22d4494918 [formerly 7e849f0af3 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]
Former-commit-id: 22d4494918
Former-commit-id: bc694aaf1872e8bd9a930f4cc339550e297ab627 [formerly 560fb81038]
Former-commit-id: 88cc3a6011
2013-05-16 11:01:40 -05:00
Bryan Kowal
4a6d46f29c Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
Former-commit-id: 3abd701fa4 [formerly 17101171b6] [formerly 1e726506e0] [formerly 39b12ee0fb [formerly 1e726506e0 [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]]
Former-commit-id: 39b12ee0fb
Former-commit-id: a6b1893a7952d3070c7de78ed3013e85240b36c9 [formerly 37461e68dd]
Former-commit-id: 3812567894
2013-05-16 11:00:47 -05:00
Max Schenkelberg
6ddb455763 Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource.
Amend: Corrected ticket number

Change-Id: Ice336b6b4fb286dd4905f43b6f16259f23dea0c6

Former-commit-id: 33f7156a45 [formerly 62efca5041] [formerly 67e0d17aed] [formerly 8b4d47c690 [formerly 67e0d17aed [formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]]
Former-commit-id: 8b4d47c690
Former-commit-id: 9c30edc05a7e1827e11b53976977decdf367c0eb [formerly 0038138fdc]
Former-commit-id: a3ad1c7c45
2013-05-16 10:54:52 -05:00
Nate Jensen
d71f246645 Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: b01f942e66 [formerly 9f8654e4ff] [formerly 1ecdd989df] [formerly ce2579a289 [formerly 1ecdd989df [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]]
Former-commit-id: ce2579a289
Former-commit-id: 2076bee14faf74bd27ac75d44642ca376db29ce9 [formerly 04c7c4a4da]
Former-commit-id: 53f994c0a8
2013-05-16 10:25:38 -05:00
Bryan Kowal
fd6dec8c03 Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e

Former-commit-id: 443fa1a125 [formerly 2149099abb] [formerly 7d4d2749ce57a39dd5830ef41c882fc46ec08cd7 [formerly 11c93f548e]] [formerly 43ec909008 [formerly 11c93f548e [formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]]
Former-commit-id: 43ec909008
Former-commit-id: 134ed31084c1662f1e828cda0c3059ae2bb2adf0 [formerly 97cff7bf9c]
Former-commit-id: c03d61587c
2013-05-16 10:21:11 -05:00
Bryan Kowal
c7cd48449e Issue #1872 - merge 2002; do not include .gitignore files in the rpm
Former-commit-id: 34c87d5256 [formerly c83d93b527] [formerly b0122e794e] [formerly 20fd227d99 [formerly b0122e794e [formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]]
Former-commit-id: 20fd227d99
Former-commit-id: 125acc649473b68c049da6f9fe45530d4b3c3030 [formerly 7ec8600dc1]
Former-commit-id: 8cba03d5a5
2013-05-16 10:19:31 -05:00
Steve Harris
7d55d0e959 13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]
Former-commit-id: 67a95d07d2
2013-05-16 11:12:07 -04:00
Nate Jensen
c90f9d93c4 Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 3777b1bdec [formerly 5b4c91d734] [formerly 03f93712a2] [formerly 367784bd99 [formerly 03f93712a2 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]
Former-commit-id: 367784bd99
Former-commit-id: 02ae66490caf635a65f4c6e90eb7bba1df7b05a1 [formerly e4b47d1eb9]
Former-commit-id: 1355010c38
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
7c5e49cf35 Issue #1869 Switch acars back to original plot resource.
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: da6bf90b2d [formerly 5a8118b5a8] [formerly 51015cd592] [formerly 1a1592ea3d [formerly 51015cd592 [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 039dcec9a1c91a057d7e28627ea17b7cb99824f6 [formerly 4a8a5b16af]
Former-commit-id: 4fa2a21323
2013-05-15 18:22:25 -05:00
Richard Peter
d3dc818b4d Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: 55bface874 [formerly 9a8bc5871f] [formerly fc5b621973] [formerly a073bf2702 [formerly fc5b621973 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]]
Former-commit-id: a073bf2702
Former-commit-id: af31e934cdfd6faede0ff3cfe67eded5377faa3f [formerly 57698cc95b]
Former-commit-id: 671aaba9d9
2013-05-15 18:14:00 -05:00
Dustin Johnson
f1217c2623 Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: 29bdf1cf7e [formerly 28a4f02216] [formerly 8eeb2f4f9c] [formerly d62e51ad7e [formerly 8eeb2f4f9c [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]]
Former-commit-id: d62e51ad7e
Former-commit-id: 3b08746afcd2e96a955f14302d482d194318a5f7 [formerly 00e9f3305d]
Former-commit-id: 6fa299ecd8
2013-05-15 17:06:42 -05:00
Dustin Johnson
7f1f50d8b9 Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c

Former-commit-id: 38714c1547 [formerly 695c64a9f4] [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 8a9e1f643a [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]
Former-commit-id: ef1e80b61f
Former-commit-id: c86021e68028c259d0aabec26dbd9c639da89626 [formerly b8d6f54206]
Former-commit-id: 31fbf71aa2
2013-05-15 16:54:40 -05:00
Nate Jensen
eb47297ab1 Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

Former-commit-id: a818b84f5f [formerly b7076f6947] [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 2abccdfe2b [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]]
Former-commit-id: 662fac5b31
Former-commit-id: 2ff5c10f02a0d7646fee845f2165008d3070734a [formerly ae5df55dba]
Former-commit-id: 8b1298777c
2013-05-15 16:25:23 -05:00
Richard Peter
e793f3059a Merge "Issue #1989 removing unused jars" into development
Former-commit-id: 1a8735e760 [formerly 3e1fe851e4] [formerly 303267be4d] [formerly ad43b7bab5 [formerly 303267be4d [formerly 544b8830ec6c95ff88726b1095662fac5438cfcb]]]
Former-commit-id: ad43b7bab5
Former-commit-id: ed0ec7ef2315281996de0732e565ee6419744cc5 [formerly fb1197ecb7]
Former-commit-id: a504d84327
2013-05-15 16:17:57 -05:00
Bryan Kowal
cdbb3688b8 Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
Former-commit-id: 9dd01b7aa4 [formerly 07408178a8] [formerly 5811585229] [formerly 41f4075e6f [formerly 5811585229 [formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]]
Former-commit-id: 41f4075e6f
Former-commit-id: 023dd6e87a45202d9e0ada7c2ab1ebac1e398460 [formerly aabc22cc2e]
Former-commit-id: edaa5339d7
2013-05-15 15:37:16 -05:00
Ben Steffensmeier
6afa65fd07 Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 84e531ba2c [formerly 89fe0b301d] [formerly 080b43444a] [formerly bbe2667522 [formerly 080b43444a [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]]
Former-commit-id: bbe2667522
Former-commit-id: 2d0c00b44c52062e4bb1a079d156e9a7a0b2bbdf [formerly f813b40379]
Former-commit-id: b3a2cd22c7
2013-05-15 15:35:02 -05:00
Nate Jensen
fb7be885b0 Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: 25c2e983c1 [formerly c75bfeb9a5] [formerly 9c2b6bad3e] [formerly f4b8c0dc60 [formerly 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]]
Former-commit-id: f4b8c0dc60
Former-commit-id: 9069cdd6843363f31f735d05691b1d9c3ac3ae91 [formerly 0234e6788b]
Former-commit-id: 6caa681ed3
2013-05-15 14:44:30 -05:00
Richard Peter
54bde542cd Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 9112e3b2b0 [formerly 186f7169af] [formerly 286ec23fab] [formerly bcbe24f489 [formerly 286ec23fab [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]]
Former-commit-id: bcbe24f489
Former-commit-id: 7f3ecaa744db0e047ec3e78cd18a3055a56c4668 [formerly ce6452daac]
Former-commit-id: 589fcada8b
2013-05-15 14:41:04 -05:00
Nate Jensen
686ad54de8 Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: 058e32d421 [formerly bb307ed685] [formerly 35830d317d] [formerly 7f9ef5ce98 [formerly 35830d317d [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]]
Former-commit-id: 7f9ef5ce98
Former-commit-id: 209109c17ddec84f38f3a259f5a4ad89242e92a2 [formerly 4c7b2d73d3]
Former-commit-id: dbe24d00fd
2013-05-15 14:00:15 -05:00
David Gillingham
cde903747e Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

Former-commit-id: df43f4a624 [formerly 0cbf36df79] [formerly 9c688f7070] [formerly 84158e76c7 [formerly 9c688f7070 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]]]
Former-commit-id: 84158e76c7
Former-commit-id: a8636a4e98415e0e3d55ec975e4e04cbd7c92415 [formerly ca10ac1598]
Former-commit-id: 9f79748cd2
2013-05-15 13:56:53 -05:00
Nate Jensen
4b07083989 Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b

Former-commit-id: a0b1b9053a [formerly 86d3bf5a7c] [formerly 948e47a2c6] [formerly fecadf104b [formerly 948e47a2c6 [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]]
Former-commit-id: fecadf104b
Former-commit-id: 45cf8bb5f9314dc1648e43987c8690bb4bf5a8d8 [formerly ba3bda461c]
Former-commit-id: 9284c27ddd
2013-05-15 13:36:09 -05:00
Bryan Kowal
9380276341 Issue #2002 - do not include .gitignore files in the rpm
Former-commit-id: f2f288c6b5 [formerly 4132370301] [formerly 60ae5df378] [formerly 107055781d [formerly 60ae5df378 [formerly 33160e9835e8e153d60b76619b75e22bd3f75fc8]]]
Former-commit-id: 107055781d
Former-commit-id: bb8d7b3c8d6efce463993268a92f760caeb8a894 [formerly 7df8e11ed3]
Former-commit-id: 43db530ddb
2013-05-15 13:31:24 -05:00
Nate Jensen
5090118058 Merge "Issue #1927 - add quartz as a RadarServer build dependency" into development
Former-commit-id: 7ba3ba65ce [formerly 6952b172cf] [formerly 591eb2d6e2] [formerly b621d417e5 [formerly 591eb2d6e2 [formerly 5db35fcaef26b2817bfcd4a051f4c1f05d8fdcdd]]]
Former-commit-id: b621d417e5
Former-commit-id: 67c7b9f57a05eab1450a9b79f580931ffe0dd774 [formerly b9275b3c2b]
Former-commit-id: 93568fff0b
2013-05-15 13:02:58 -05:00
Ben Steffensmeier
676bd25f45 Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416

Former-commit-id: 61b468a9f5 [formerly 22b20b5f8e] [formerly b905ee013c] [formerly 1c3e60a5ff [formerly b905ee013c [formerly 836239896aace50e37896f6219015a75aea117b7]]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: 20ed4a4554d6c5b51d73a5b064aa0c228a1bc816 [formerly 8ea143a147]
Former-commit-id: cb335861c2
2013-05-15 12:50:08 -05:00