Commit graph

24 commits

Author SHA1 Message Date
mjames-upc
c921ec69d6 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n
Former-commit-id: f25e918e50
2015-09-03 15:48:53 -06:00
David Lovely
00a34f5d56 Omaha #4392 Fixed broker address substitution
Change-Id: Ib7ea0577e8d020ad2d94aa7ddbaa08459c9fa433

Former-commit-id: f2a6c66c50 [formerly 3b2a545d77 [formerly 6043b5052225fee426940fa8f32f54d8a265fba2]]
Former-commit-id: 3b2a545d77
Former-commit-id: b60b0e763e
2015-04-22 12:04:54 -05:00
David Lovely
e5019a23c9 Omaha #4392 Removed un-used JMX port configuration
Former-commit-id: 41a03c3a1d [formerly 42ce2e6521 [formerly f119953ea5cdecdf853301cd0b253ce734244942]]
Former-commit-id: 42ce2e6521
Former-commit-id: 701f6c96cb
2015-04-20 13:46:01 -05:00
David Lovely
118bca680a Omaha #4392 Updates to configure new QPID json file.
Former-commit-id: 9f488920a1 [formerly 531944303c [formerly ef2c2f94c7dc30fb0313ce8df295c52ea3c22e85]]
Former-commit-id: 531944303c
Former-commit-id: f2e5ab25dc
2015-04-16 09:03:21 -05:00
Bryan Kowal
90df3831bf Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters
that are no longer required by EDEX.

Change-Id: If0387c4f87054bbec898d8371d1b182a146c4c3f

Former-commit-id: 53f036b5a5 [formerly ce78f461a3] [formerly a61c35fcb5] [formerly 53f036b5a5 [formerly ce78f461a3] [formerly a61c35fcb5] [formerly fec755cc93 [formerly a61c35fcb5 [formerly e4623ff1a31816aefd717d2ae494e81441710b79]]]]
Former-commit-id: fec755cc93
Former-commit-id: 395122dc26 [formerly 601726b27c] [formerly eee6fef1c421700ddb8ab1f81c3a13446011c87e [formerly 4f82e0ba7d]]
Former-commit-id: 165dde9fcc7c2bb71d3b8fd1bacfd80915ecba7a [formerly e78304e1a7]
Former-commit-id: e5b68c6ae3
2014-08-14 10:39:09 -05:00
Bryan Kowal
53f036b5a5 Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters
that are no longer required by EDEX.

Change-Id: If0387c4f87054bbec898d8371d1b182a146c4c3f

Former-commit-id: fec755cc93 [formerly a61c35fcb5 [formerly e4623ff1a31816aefd717d2ae494e81441710b79]]
Former-commit-id: a61c35fcb5
Former-commit-id: ce78f461a3
2014-08-14 10:39:09 -05:00
Greg Armendariz
eaeee421e5 Issue #2754 - Remove logging calls
Change-Id: Ic95b84691dc5cf6cea454f2a70acc9da301eaf05

Former-commit-id: 09c7b0827a [formerly 47347f42ca] [formerly e0394c649c] [formerly 09c7b0827a [formerly 47347f42ca] [formerly e0394c649c] [formerly 2ec1248fcc [formerly e0394c649c [formerly e072739f937ae4f7440efa8290dc9078f5398d7f]]]]
Former-commit-id: 2ec1248fcc
Former-commit-id: d78463d7c0 [formerly 2e03bcff4b] [formerly ed894f91fabab3ccbfd771bbeb3fe7a4650f8144 [formerly e02caca466]]
Former-commit-id: 248c754464869a119f9931cb70528b695817d09a [formerly 47d3f2e498]
Former-commit-id: cad35882f8
2014-02-03 09:29:47 -06:00
Greg Armendariz
09c7b0827a Issue #2754 - Remove logging calls
Change-Id: Ic95b84691dc5cf6cea454f2a70acc9da301eaf05

Former-commit-id: 2ec1248fcc [formerly e0394c649c [formerly e072739f937ae4f7440efa8290dc9078f5398d7f]]
Former-commit-id: e0394c649c
Former-commit-id: 47347f42ca
2014-02-03 09:29:47 -06:00
Bryan Kowal
c8e49142f2 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4 [formerly 68181d3f62] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8]
Former-commit-id: fad82481c1
2013-12-16 16:39:10 -06:00
Bryan Kowal
b2550c873b Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]
Former-commit-id: 43008f4698
Former-commit-id: 0c3b22c8f2
2013-12-16 16:39:10 -06:00
Bryan Kowal
fc184536e0 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 93e2de5223 [formerly 1932480e2b] [formerly f6412117e1] [formerly 93e2de5223 [formerly 1932480e2b] [formerly f6412117e1] [formerly 38aa7723c6 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 3c0cb232c2 [formerly 56c7afbc0f] [formerly 2f3b48fdc497c9180ad73d6b0dbc1d60d2ff66f5 [formerly 32190c8848]]
Former-commit-id: 81c0dc9cc92256c552f8824baaacb4018e281a6a [formerly 22c2eef5ee]
Former-commit-id: f56e42195e
2013-07-03 15:55:53 -05:00
Bryan Kowal
93e2de5223 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 38aa7723c6 [formerly f6412117e1 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]
Former-commit-id: f6412117e1
Former-commit-id: 1932480e2b
2013-07-03 15:55:53 -05:00
Bryan Kowal
89b90b78b2 Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
Former-commit-id: 4e902e0a03 [formerly 6b7afdbb53] [formerly e7bc2fecc6] [formerly 4e902e0a03 [formerly 6b7afdbb53] [formerly e7bc2fecc6] [formerly c80ba9633e [formerly e7bc2fecc6 [formerly 70d82ca1c40d02b1918d539d57b342f59d67e12b]]]]
Former-commit-id: c80ba9633e
Former-commit-id: 4ca2eded54 [formerly 0292eb3b03] [formerly ec9c1249e88bc06c300e8cba09fe8b7a87a3502c [formerly 7cd6653d71]]
Former-commit-id: 0d83685a466bbfa61541c9b4486f9b0980ff4cb4 [formerly 7896fa119b]
Former-commit-id: 067fabb8eb
2013-05-09 19:51:32 -05:00
Bryan Kowal
4e902e0a03 Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
Former-commit-id: c80ba9633e [formerly e7bc2fecc6 [formerly 70d82ca1c40d02b1918d539d57b342f59d67e12b]]
Former-commit-id: e7bc2fecc6
Former-commit-id: 6b7afdbb53
2013-05-09 19:51:32 -05:00
Bryan Kowal
caa561a4cb Issue #1899 - edex-environment is now compatible with qpid 0.18.
- added change history

Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646

Former-commit-id: 04c1bca946 [formerly 64d9276e2e] [formerly 0924bfd726] [formerly 04c1bca946 [formerly 64d9276e2e] [formerly 0924bfd726] [formerly 86d8e511b5 [formerly 0924bfd726 [formerly a38c6c2014c3252b740ba434b44d09adbebb9991]]]]
Former-commit-id: 86d8e511b5
Former-commit-id: 68244041e7 [formerly cf71d24fff] [formerly 0225f396c0bb9b4bc44f8a3a438673280a30a3ff [formerly ff64a23deb]]
Former-commit-id: 1b947eb6a2a4a24f81407f08c14c3453f1c4ca73 [formerly af1d6136e4]
Former-commit-id: 822094bc7c
2013-04-18 14:06:53 -05:00
Bryan Kowal
04c1bca946 Issue #1899 - edex-environment is now compatible with qpid 0.18.
- added change history

Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646

Former-commit-id: 86d8e511b5 [formerly 0924bfd726 [formerly a38c6c2014c3252b740ba434b44d09adbebb9991]]
Former-commit-id: 0924bfd726
Former-commit-id: 64d9276e2e
2013-04-18 14:06:53 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
1b8e623c9b 13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
2013-04-01 12:04:56 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
6f374b35d0 13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
2013-03-25 13:27:13 -05:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
1d4d25b49b 13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
2013-01-06 14:55:11 -06:00
Steve Harris
9d4e230e7a 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529]
Former-commit-id: 5030894212
2012-09-11 16:00:38 -05:00
Steve Harris
0403e7d0a9 12.10.1-3 baseline
Former-commit-id: 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
2012-09-11 16:00:38 -05:00