Commit graph

1140 commits

Author SHA1 Message Date
Nate Jensen
6a6484cbb2 Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]
Former-commit-id: caf414bab0
Former-commit-id: 7059967ae9
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
ec9881b914 Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]
Former-commit-id: 4747f7d319
Former-commit-id: e16dc02a54
2013-05-29 10:34:22 -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
Nate Jensen
cf705759bd Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]
Former-commit-id: 82d6c03669
Former-commit-id: 808ab352c5
2013-05-29 09:20:53 -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
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
Max Schenkelberg
a91db9c1e3 Issue #1638 Added support for null search constraints for updates
Amend: Fixed comment, added SW history

Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515

Former-commit-id: 807e4501c8 [formerly 1bc4437154 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]
Former-commit-id: 1bc4437154
Former-commit-id: 21693d6913
2013-05-28 12:59:27 -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
Ben Steffensmeier
c2ca1551f6 Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]
Former-commit-id: 3b6156843e
Former-commit-id: cdf8e7daaa
2013-05-24 16:40:21 -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
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
Nate Jensen
d7f5eea402 Merge "Issue #1989 use camel's built-in DirectVm component" into development
Former-commit-id: 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]
Former-commit-id: b8f3307f50
Former-commit-id: 876d741ab8
2013-05-23 10:43:15 -05:00
Richard Peter
25ace04a31 Merge "Issue #1989 fix clustered routes suspending/starting" into development
Former-commit-id: 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]
Former-commit-id: 57933400b9
Former-commit-id: edd70dfe47
2013-05-23 10:10:51 -05:00
Nate Jensen
4ae00040e3 Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]
Former-commit-id: d74936ef3e
Former-commit-id: 65b9bafed7
2013-05-23 10:06:28 -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
Nate Jensen
516eca979e Issue #1989 fix clustered routes suspending/starting
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: a6d525ec96 [formerly 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]
Former-commit-id: 4ab1d90d67
Former-commit-id: 57e560b745
2013-05-22 16:39:24 -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
Benjamin Phillippe
feeb6126bb Issue #2022 Removed data delivery project from feature
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd

Former-commit-id: 3e9fe9892e [formerly 4d1252523e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]
Former-commit-id: 4d1252523e
Former-commit-id: 0308f217d6
2013-05-22 12:49:46 -05:00
David Gillingham
511098fffd Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]
Former-commit-id: 5cba0f5e40
Former-commit-id: 2555cf9819
2013-05-22 11:42:08 -05:00
Benjamin Phillippe
aab1aa57d4 Issue #2022 Added registry federation capabilities
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028

Former-commit-id: c3a376475b [formerly b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]
Former-commit-id: b9f2bde20e
Former-commit-id: 7a908bbeaf
2013-05-22 11:38:42 -05: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
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
Bryan Kowal
3a5ae717cb Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
Former-commit-id: e4874a873a [formerly 99ba7adfe7 [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]
Former-commit-id: 99ba7adfe7
Former-commit-id: 081d1c724a
2013-05-20 15:03:33 -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
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
Nate Jensen
2c6fbd0c68 Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: d905453660 [formerly bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]
Former-commit-id: bfcdcb607a
Former-commit-id: bc8d798973
2013-05-16 17:13:46 -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
Nate Jensen
b01f942e66 Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: ce2579a289 [formerly 1ecdd989df [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]
Former-commit-id: 1ecdd989df
Former-commit-id: 9f8654e4ff
2013-05-16 10:25:38 -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
Richard Peter
55bface874 Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: a073bf2702 [formerly fc5b621973 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]
Former-commit-id: fc5b621973
Former-commit-id: 9a8bc5871f
2013-05-15 18:14:00 -05:00
Dustin Johnson
29bdf1cf7e Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: d62e51ad7e [formerly 8eeb2f4f9c [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]
Former-commit-id: 8eeb2f4f9c
Former-commit-id: 28a4f02216
2013-05-15 17:06:42 -05:00
Dustin Johnson
38714c1547 Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c

Former-commit-id: ef1e80b61f [formerly 8a9e1f643a [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]
Former-commit-id: 8a9e1f643a
Former-commit-id: 695c64a9f4
2013-05-15 16:54:40 -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
Nate Jensen
25c2e983c1 Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: f4b8c0dc60 [formerly 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]
Former-commit-id: 9c2b6bad3e
Former-commit-id: c75bfeb9a5
2013-05-15 14:44:30 -05:00