Commit graph

1752 commits

Author SHA1 Message Date
Nate Jensen
04d6f6654d Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 99b4a21414
Former-commit-id: 927da5cffb
2013-05-29 14:49:43 -05:00
Dustin Johnson
605f2d6136 Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]
Former-commit-id: 66c941fc3f
Former-commit-id: 7ca6f18405
2013-05-29 09:27:30 -05:00
Mike Duff
0babd4d9b4 Issue #2016 - fix TS Trace toggle
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

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

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]
Former-commit-id: 0a9e7ed740
Former-commit-id: c76fa3bc2a
2013-05-29 09:02:47 -05:00
Nate Jensen
d7391928f9 Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
Former-commit-id: 256a67a9f9 [formerly 7c1e6e8b09 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]
Former-commit-id: 7c1e6e8b09
Former-commit-id: ba5e69c7ff
2013-05-28 15:43:31 -05:00
Nate Jensen
5748201316 Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
Former-commit-id: e846e539fb [formerly 053e37ee76 [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]
Former-commit-id: 053e37ee76
Former-commit-id: cba08666e6
2013-05-28 15:43:23 -05:00
Max Schenkelberg
98bdd5f786 Issue #1638 Fixed text box drawn to be correct size with padding around text
Amend: Fixed format string issues with topo resource and colorbar labels

Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114

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

Former-commit-id: 3f85aeb00a [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]
Former-commit-id: ed7b0fc8c5
Former-commit-id: bd8431b986
2013-05-28 14:30:26 -05:00
Roger Ferrel
24f1c70168 Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]
Former-commit-id: cbee731447
Former-commit-id: 365af6b7ce
2013-05-28 13:21:08 -05:00
Nate Jensen
e3caafe7ad Issue #2037 made imageMap concurrent to fix memory leak
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f

Former-commit-id: 68eba61c28 [formerly f77f350eb3 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]
Former-commit-id: f77f350eb3
Former-commit-id: 84444b6ba9
2013-05-28 09:21:57 -05:00
Dustin Johnson
c694d523db Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]
Former-commit-id: 2b1f75f702
Former-commit-id: f4ad0218f2
2013-05-28 06:43:35 -05:00
Mike Duff
e3804d48ec Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

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

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

Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a

Former-commit-id: a2148650b4 [formerly 8145305580 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]
Former-commit-id: 8145305580
Former-commit-id: b3d40951ba
2013-05-23 23:52:35 -05:00
Lee Venable
082df6ccd5 Issue #1964 - inital GUI creation
Change-Id: I47d58880066fa2ef284e8911390163624b873381

Former-commit-id: c3328077c8 [formerly ae020d3960 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]
Former-commit-id: ae020d3960
Former-commit-id: 4ecb65e4a2
2013-05-23 17:16:31 -05:00
Roger Ferrel
ff1dac4143 Issue #1966 Feature plugin for archive.
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

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

Former-commit-id: 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1978133177
Former-commit-id: b7cecb931e
2013-05-23 11:20:40 -05:00
Greg Armendariz
cabcb3e574 Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]
Former-commit-id: 2fe2b0c5fb
Former-commit-id: dc9623df11
2013-05-23 09:10:11 -05:00
Roger Ferrel
7c7f9c01a6 Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]
Former-commit-id: e55f73b4f7
Former-commit-id: d7e7a56b84
2013-05-23 07:36:15 -05:00
Bryan Kowal
fba4b33fe1 Issue #1927 - patch ant includegen task
Former-commit-id: 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]
Former-commit-id: 40e8f544ea
Former-commit-id: 575944f70d
2013-05-22 18:00:43 -05:00
Steve Harris
511f938c3f Merge branch 'omaha_13.4.1' into development
Former-commit-id: 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]
Former-commit-id: 8496832064
Former-commit-id: 570128b986
2013-05-22 16:13:08 -05:00
Steve Harris
df612396fb Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]
Former-commit-id: 097617fa26
Former-commit-id: dce0dc3692
2013-05-22 16:10:04 -05:00
Steve Harris
623f813923 13.4.1-12 baseline
Former-commit-id: e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: 6a97b4325a
Former-commit-id: 397bbf674a
2013-05-22 16:42:39 -04:00
Richard Peter
8fac7f2fd9 Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]
Former-commit-id: c9c1570960
Former-commit-id: 62c8176486
2013-05-21 13:07:51 -05:00
Richard Peter
efd545925e 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: 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]
Former-commit-id: 8aa4b0025c
Former-commit-id: 3d84e1dd53
2013-05-21 12:11:21 -05:00
Richard Peter
c40709229f Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]
Former-commit-id: 73372622f7
Former-commit-id: 4809b3c15b
2013-05-21 10:35:00 -05:00
Nate Jensen
deea93d7e7 Issue #2001 fix message handling
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: 960bc6db69 [formerly 1ab118958f [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]
Former-commit-id: 1ab118958f
Former-commit-id: 56309efafe
2013-05-21 10:26:18 -05:00
Dustin Johnson
150ae88eba Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]
Former-commit-id: 195cd5f210
Former-commit-id: fef73ac960
2013-05-21 08:19:34 -05:00
Steve Harris
65d8f51034 13.4.1-11 baseline
Former-commit-id: c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]
Former-commit-id: 2edee36158
Former-commit-id: d6319a2ca6
2013-05-21 09:19:25 -04:00
Ben Steffensmeier
5219bd8426 Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

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

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

Former-commit-id: 885b106652 [formerly 26e80bbd18 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]
Former-commit-id: 26e80bbd18
Former-commit-id: aa3b8c80f4
2013-05-20 17:27:15 -05:00
Dustin Johnson
095acb5ac3 Issue #2000 Subscription overlap configuration GUI
Amend:
  Peer review comments.

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 38249cd7b9 [formerly 5b62669f8e [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]
Former-commit-id: 5b62669f8e
Former-commit-id: 554347f17c
2013-05-20 17:12:47 -05:00
Richard Peter
0d7f36c84c Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 3d861eca69 [formerly 30a61c3e17 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]
Former-commit-id: 30a61c3e17
Former-commit-id: 8079561032
2013-05-20 14:48:47 -05:00
Steve Harris
294c127b0a 13.4.1-10 baseline
Former-commit-id: 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 9a403b3615
Former-commit-id: 68fe2134b8
2013-05-20 10:52:47 -04:00
Richard Peter
d37ba352e2 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: a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]
Former-commit-id: a33ddbd1a6
Former-commit-id: 648a1b25ae
2013-05-17 10:33:18 -05:00
Max Schenkelberg
71624ccda3 Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: d07de0870f [formerly c421240835 [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]
Former-commit-id: c421240835
Former-commit-id: 4d435d3dd5
2013-05-16 18:04:26 -05:00
Nate Jensen
c7868a028e 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: 6ef214f1b8 [formerly 39543d7ee0 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]
Former-commit-id: 39543d7ee0
Former-commit-id: 9a3f855a1a
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
c7b7f58de8 Issue #1869 Remove DataURI column from qc.
Former-commit-id: f2b11b8a49 [formerly c0d8dad8ae [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]
Former-commit-id: c0d8dad8ae
Former-commit-id: 89b4bd571a
2013-05-16 17:48:37 -05:00
Steve Harris
f9535abb10 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: b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]
Former-commit-id: 16ba74496d
Former-commit-id: 87a31f9990
2013-05-16 13:45:58 -05:00
Bryan Kowal
da601e2c35 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: 22d4494918 [formerly 7e849f0af3 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]
Former-commit-id: 7e849f0af3
Former-commit-id: dccc6e4a96
2013-05-16 11:01:40 -05:00
Max Schenkelberg
33f7156a45 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: 8b4d47c690 [formerly 67e0d17aed [formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]
Former-commit-id: 67e0d17aed
Former-commit-id: 62efca5041
2013-05-16 10:54:52 -05:00
Steve Harris
301821988e 13.4.1-9 baseline
Former-commit-id: aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: bcf7f15c90
Former-commit-id: 88eee9cbfa
2013-05-16 11:12:07 -04:00
Nate Jensen
3777b1bdec Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 367784bd99 [formerly 03f93712a2 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]
Former-commit-id: 03f93712a2
Former-commit-id: 5b4c91d734
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
da6bf90b2d Issue #1869 Switch acars back to original plot resource.
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: 1a1592ea3d [formerly 51015cd592 [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]
Former-commit-id: 51015cd592
Former-commit-id: 5a8118b5a8
2013-05-15 18:22:25 -05:00
Nate Jensen
a818b84f5f Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

Former-commit-id: 662fac5b31 [formerly 2abccdfe2b [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]
Former-commit-id: 2abccdfe2b
Former-commit-id: b7076f6947
2013-05-15 16:25:23 -05:00
Ben Steffensmeier
84e531ba2c Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: bbe2667522 [formerly 080b43444a [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]
Former-commit-id: 080b43444a
Former-commit-id: 89fe0b301d
2013-05-15 15:35:02 -05:00
Richard Peter
9112e3b2b0 Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: bcbe24f489 [formerly 286ec23fab [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]
Former-commit-id: 286ec23fab
Former-commit-id: 186f7169af
2013-05-15 14:41:04 -05:00
Nate Jensen
058e32d421 Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: 7f9ef5ce98 [formerly 35830d317d [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]
Former-commit-id: 35830d317d
Former-commit-id: bb307ed685
2013-05-15 14:00:15 -05:00