Commit graph

2858 commits

Author SHA1 Message Date
Bryan Kowal
bef3b4c74f Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
Former-commit-id: d8ce0f369c [formerly d8ce0f369c [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]
Former-commit-id: a070d28ecc
Former-commit-id: 7dd9b1e1c0
2013-05-17 18:21:03 -05:00
Richard Peter
969fa704e5 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: a33ddbd1a6 [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]
Former-commit-id: a9869f07ba
Former-commit-id: c47eb36e43
2013-05-17 10:33:18 -05:00
Bryan Kowal
3f4e377f05 Issue #1927 - handle common base until new build implementation
Former-commit-id: 63f57de31f [formerly 63f57de31f [formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]
Former-commit-id: 79816de308
Former-commit-id: 9ea4bab577
2013-05-16 23:56:47 -05:00
Max Schenkelberg
6adbb139ab Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: c421240835 [formerly c421240835 [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]
Former-commit-id: d07de0870f
Former-commit-id: a94469df82
2013-05-16 18:04:26 -05:00
Nate Jensen
3f2bb17ce4 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: 39543d7ee0 [formerly 39543d7ee0 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]
Former-commit-id: 6ef214f1b8
Former-commit-id: ffa74c3bdb
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
998330955a Issue #1869 Remove DataURI column from qc.
Former-commit-id: c0d8dad8ae [formerly c0d8dad8ae [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]
Former-commit-id: f2b11b8a49
Former-commit-id: 6353b7e04b
2013-05-16 17:48:37 -05:00
Nate Jensen
539959dfbf Merge "Issue #1989 disable camel JMX to speed up edex" into development
Former-commit-id: a5372205e6 [formerly a5372205e6 [formerly d9e7d87f7eb454e66ecd42446544fcec473e95b6]]
Former-commit-id: b710a7c288
Former-commit-id: e7001cfba5
2013-05-16 17:33:18 -05:00
Nate Jensen
75499add43 Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: bfcdcb607a [formerly bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]
Former-commit-id: d905453660
Former-commit-id: c3bafc88cd
2013-05-16 17:13:46 -05:00
Steve Harris
4827d8f1d9 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: 16ba74496d [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]
Former-commit-id: b76d359695
Former-commit-id: 26664e6615
2013-05-16 13:45:58 -05:00
Bryan Kowal
e95c2d36b4 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: 7e849f0af3 [formerly 7e849f0af3 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]
Former-commit-id: 22d4494918
Former-commit-id: 560fb81038
2013-05-16 11:01:40 -05:00
Bryan Kowal
d792059e3c Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
Former-commit-id: 1e726506e0 [formerly 1e726506e0 [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]
Former-commit-id: 39b12ee0fb
Former-commit-id: 37461e68dd
2013-05-16 11:00:47 -05:00
Max Schenkelberg
91d38b1e87 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: 67e0d17aed [formerly 67e0d17aed [formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]
Former-commit-id: 8b4d47c690
Former-commit-id: 0038138fdc
2013-05-16 10:54:52 -05:00
Nate Jensen
b9bfcead05 Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

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

Former-commit-id: 11c93f548e [formerly 11c93f548e [formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]
Former-commit-id: 43ec909008
Former-commit-id: 97cff7bf9c
2013-05-16 10:21:11 -05:00
Bryan Kowal
1a63d07768 Issue #1872 - merge 2002; do not include .gitignore files in the rpm
Former-commit-id: b0122e794e [formerly b0122e794e [formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]
Former-commit-id: 20fd227d99
Former-commit-id: 7ec8600dc1
2013-05-16 10:19:31 -05:00
Steve Harris
3f87ea1a15 13.4.1-9 baseline
Former-commit-id: bcf7f15c90 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: aff41713f9
Former-commit-id: 0766ae20dd
2013-05-16 11:12:07 -04:00
Nate Jensen
6408ef5425 Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 03f93712a2 [formerly 03f93712a2 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]
Former-commit-id: 367784bd99
Former-commit-id: e4b47d1eb9
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
3b5a3a8a3b Issue #1869 Switch acars back to original plot resource.
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: 51015cd592 [formerly 51015cd592 [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 4a8a5b16af
2013-05-15 18:22:25 -05:00
Richard Peter
da0fc8057c Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: fc5b621973 [formerly fc5b621973 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]
Former-commit-id: a073bf2702
Former-commit-id: 57698cc95b
2013-05-15 18:14:00 -05:00
Dustin Johnson
ab15adabe2 Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: 8eeb2f4f9c [formerly 8eeb2f4f9c [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]
Former-commit-id: d62e51ad7e
Former-commit-id: 00e9f3305d
2013-05-15 17:06:42 -05:00
Dustin Johnson
6db9b3f8d9 Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c

Former-commit-id: 8a9e1f643a [formerly 8a9e1f643a [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]
Former-commit-id: ef1e80b61f
Former-commit-id: b8d6f54206
2013-05-15 16:54:40 -05:00
Nate Jensen
8cffed1451 Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

Former-commit-id: 2abccdfe2b [formerly 2abccdfe2b [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]
Former-commit-id: 662fac5b31
Former-commit-id: ae5df55dba
2013-05-15 16:25:23 -05:00
Richard Peter
44b7de35fc Merge "Issue #1989 removing unused jars" into development
Former-commit-id: 303267be4d [formerly 303267be4d [formerly 544b8830ec6c95ff88726b1095662fac5438cfcb]]
Former-commit-id: ad43b7bab5
Former-commit-id: fb1197ecb7
2013-05-15 16:17:57 -05:00
Bryan Kowal
e39c66a454 Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
Former-commit-id: 5811585229 [formerly 5811585229 [formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]
Former-commit-id: 41f4075e6f
Former-commit-id: aabc22cc2e
2013-05-15 15:37:16 -05:00
Ben Steffensmeier
6333ed4841 Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 080b43444a [formerly 080b43444a [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]
Former-commit-id: bbe2667522
Former-commit-id: f813b40379
2013-05-15 15:35:02 -05:00
Nate Jensen
2b72b5c530 Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: 9c2b6bad3e [formerly 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]
Former-commit-id: f4b8c0dc60
Former-commit-id: 0234e6788b
2013-05-15 14:44:30 -05:00
Richard Peter
89fc805bfe Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 286ec23fab [formerly 286ec23fab [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]
Former-commit-id: bcbe24f489
Former-commit-id: ce6452daac
2013-05-15 14:41:04 -05:00
Nate Jensen
f7d304c51b Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: 35830d317d [formerly 35830d317d [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]
Former-commit-id: 7f9ef5ce98
Former-commit-id: 4c7b2d73d3
2013-05-15 14:00:15 -05:00
David Gillingham
fab4021ce4 Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

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

Former-commit-id: 948e47a2c6 [formerly 948e47a2c6 [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]
Former-commit-id: fecadf104b
Former-commit-id: ba3bda461c
2013-05-15 13:36:09 -05:00
Bryan Kowal
a2a6d0bdad Issue #2002 - do not include .gitignore files in the rpm
Former-commit-id: 60ae5df378 [formerly 60ae5df378 [formerly 33160e9835e8e153d60b76619b75e22bd3f75fc8]]
Former-commit-id: 107055781d
Former-commit-id: 7df8e11ed3
2013-05-15 13:31:24 -05:00
Nate Jensen
0a49169575 Merge "Issue #1927 - add quartz as a RadarServer build dependency" into development
Former-commit-id: 591eb2d6e2 [formerly 591eb2d6e2 [formerly 5db35fcaef26b2817bfcd4a051f4c1f05d8fdcdd]]
Former-commit-id: b621d417e5
Former-commit-id: b9275b3c2b
2013-05-15 13:02:58 -05:00
Ben Steffensmeier
ff9ce2b7c4 Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416

Former-commit-id: b905ee013c [formerly b905ee013c [formerly 836239896aace50e37896f6219015a75aea117b7]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: 8ea143a147
2013-05-15 12:50:08 -05:00
Richard Peter
69ce5d7529 Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: 0523d790f8 [formerly 0523d790f8 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]
Former-commit-id: 82ccd32ee0
Former-commit-id: b40e0ca1c9
2013-05-15 12:44:48 -05:00
Richard Peter
3e60ceec03 Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: f1d65e7028 [formerly f1d65e7028 [formerly ce880367eb70abdd85664841e3775142f6e28c50]]
Former-commit-id: 48b67522d5
Former-commit-id: aa3ef28527
2013-05-15 12:44:28 -05:00
Bryan Kowal
7692701168 Issue #1927 - add quartz as a RadarServer build dependency
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56

Former-commit-id: 047a3de7bd [formerly 047a3de7bd [formerly f3dc0db70d9c3c680b56c07f18c84e2fbc2daaa2]]
Former-commit-id: 99a5290083
Former-commit-id: 63fa948ba8
2013-05-15 12:38:02 -05:00
Bryan Kowal
59024f8dd7 Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
Former-commit-id: f9e77e90b7 [formerly f9e77e90b7 [formerly 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92]]
Former-commit-id: 0e3e3e891b
Former-commit-id: 0af34bbe4c
2013-05-15 11:55:56 -05:00
Ben Steffensmeier
7ce819184a Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: 62b85f3afe [formerly 62b85f3afe [formerly 71808a9d82233a395c5e5a394b0708b07405f553]]
Former-commit-id: dd320f2a56
Former-commit-id: 27b0b4a289
2013-05-15 11:45:51 -05:00
Dustin Johnson
8276c2a9c9 Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: 8a70a773d5 [formerly 8a70a773d5 [formerly f300554c735266999f57e0331eda63420e5a6ef3]]
Former-commit-id: c88be3579c
Former-commit-id: 8c26413d23
2013-05-15 10:50:53 -05:00
Dustin Johnson
c2c849fe7e Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267

Former-commit-id: e38e8d7dc5 [formerly e38e8d7dc5 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]]
Former-commit-id: e374011c49
Former-commit-id: 98d99250b2
2013-05-15 10:24:33 -05:00
Richard Peter
6cc24d855f Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: f1920eb8d9 [formerly f1920eb8d9 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]]
Former-commit-id: 47124d2411
Former-commit-id: f4974ebd19
2013-05-15 10:00:19 -05:00
Ben Steffensmeier
5dc7de691b Issue #1869 Remove DataURI column from bufrmos.
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e

Former-commit-id: 026a824e60 [formerly 026a824e60 [formerly 5b740e5d614d9cac2476335a0754ccd0e1185c84]]
Former-commit-id: fabbc29fe8
Former-commit-id: 3f540d16f0
2013-05-15 09:40:05 -05:00
Nate Jensen
4973acb807 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: 5280b54277 [formerly 5280b54277 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]
Former-commit-id: 4e63b88031
Former-commit-id: 1e059ee8d9
2013-05-15 09:22:16 -05:00
Nate Jensen
58eeca454a Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d

Former-commit-id: d894aca768 [formerly d894aca768 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]]
Former-commit-id: 958ed1f6a2
Former-commit-id: 1b62b066c9
2013-05-14 18:27:00 -05:00
Nate Jensen
dc98eb524f Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: a6f8174d0c [formerly a6f8174d0c [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]
Former-commit-id: 44cfe00b5e
Former-commit-id: e7f638ce3b
2013-05-14 16:36:47 -05:00
Nate Jensen
851885b8c5 Merge "Issue #1869 Get plots working without dataURI" into development
Former-commit-id: 6c42b5af64 [formerly 6c42b5af64 [formerly 3d4bbfa57651c97bc94d88ea83583a366a09200b]]
Former-commit-id: 661482f1dd
Former-commit-id: 301b294d66
2013-05-14 16:23:00 -05:00
Nate Jensen
925339b84c Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 08b9ce4c62 [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 6f1684b85c
Former-commit-id: 22c23492c4
2013-05-14 16:16:13 -05:00
Dustin Johnson
f625b26373 Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: 341ce0c8c2 [formerly 341ce0c8c2 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]
Former-commit-id: a5a0e3e280
Former-commit-id: 21e66394be
2013-05-14 15:48:58 -05:00
Dustin Johnson
aa591995c6 Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

Former-commit-id: db2e3cd9bb [formerly db2e3cd9bb [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]
Former-commit-id: fdf3ac7897
Former-commit-id: 085058e788
2013-05-14 15:34:08 -05:00
Ben Steffensmeier
8a1b518934 Issue #1869 Get plots working without dataURI
Former-commit-id: 79139629a6 [formerly 79139629a6 [formerly 855d95e8563c47e5601c80c9efe5006280bda76e]]
Former-commit-id: a84c975426
Former-commit-id: 2dfb65b594
2013-05-14 14:42:47 -05:00