Bryan Kowal
d66c1a0d43
Omaha #3508 - remove references to yajsw in %files
...
Former-commit-id: 121f1068ca
[formerly 16a33efd8b
] [formerly 9e55db1c52
] [formerly 121f1068ca
[formerly 16a33efd8b
] [formerly 9e55db1c52
] [formerly 9e77b9635e
[formerly 9e55db1c52
[formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]]]
Former-commit-id: 9e77b9635e
Former-commit-id: e1a62ff167
[formerly 5644901634
] [formerly 9d2131c1c4195c68ae2b4242ce29d62a04093299 [formerly 7575599185
]]
Former-commit-id: 336cd43d4b46abfdcfc533ea65ab126e5d21c0c7 [formerly cc4ee08244
]
Former-commit-id: 3ec292bebb
2014-12-05 10:04:42 -06:00
Bryan Kowal
0c1ec8e447
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 2d7a7eff76
[formerly cf5353e368
] [formerly 71cf313666
] [formerly 2d7a7eff76
[formerly cf5353e368
] [formerly 71cf313666
] [formerly 0894efaaa3
[formerly 71cf313666
[formerly 9b36754ca610887a17666ceff2a1540b958913b6]]]]
Former-commit-id: 0894efaaa3
Former-commit-id: 77df8dc255
[formerly 3c95967633
] [formerly 9bb0a44417e13105470dc2e5a1115eb08b637a95 [formerly ccb7cead64
]]
Former-commit-id: c6b73d52be1b51f01ea0bed574f9958d08a3cbf9 [formerly d55f5e0c63
]
Former-commit-id: 8ac5284fff
2014-12-04 17:33:43 -06:00
Nate Jensen
4d5d6f8f16
Merge "Issue #2984 another attempt to fix build" into development
...
Former-commit-id: 8a1e3a9bef
[formerly 7f56e20c03
] [formerly 5424ffb850
] [formerly 8a1e3a9bef
[formerly 7f56e20c03
] [formerly 5424ffb850
] [formerly 26b20a770a
[formerly 5424ffb850
[formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]]]]
Former-commit-id: 26b20a770a
Former-commit-id: b63c42673f
[formerly 0c82511428
] [formerly 74e82875616825eaf646c27a93474963262f4aed [formerly cf3e9e9020
]]
Former-commit-id: 13c36f6664a1f7ee9c7010895e5ea62e71775f93 [formerly 146d8259db
]
Former-commit-id: 9621b9f8bf
2014-04-15 13:27:29 -05:00
Nate Jensen
7b1ac642f8
Issue #2984 another attempt to fix build
...
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: fc8be532a1
[formerly cb406ef865
] [formerly a2354a1d2a
] [formerly fc8be532a1
[formerly cb406ef865
] [formerly a2354a1d2a
] [formerly 09305d263e
[formerly a2354a1d2a
[formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]]]]
Former-commit-id: 09305d263e
Former-commit-id: f0ea970f51
[formerly 3186527f18
] [formerly c383e23eae82fa10b3e1724bbc784d32fdfd1fee [formerly 60b8b6e4ad
]]
Former-commit-id: 0ab807d694e5f70061683480aefc8ac501db90ab [formerly 529939f3d3
]
Former-commit-id: eb9fba0305
2014-04-15 13:16:17 -05:00
Richard Peter
c37f234cb0
Issue #2726 : Fix context mappings for topics
...
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: bb04dd7885
[formerly f533275291
] [formerly ecbd0d5720
] [formerly bb04dd7885
[formerly f533275291
] [formerly ecbd0d5720
] [formerly 4ac996336e
[formerly ecbd0d5720
[formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]]]
Former-commit-id: 4ac996336e
Former-commit-id: c54607083f
[formerly d40449dae9
] [formerly 39575ca8f26452d9d3cfc245c888d649d3dd6f86 [formerly 35b8b8bc15
]]
Former-commit-id: f983f06d0cbe33c9d1879ab4b7133d99f068533d [formerly 100a0d3bbd
]
Former-commit-id: c4edd6fd84
2014-04-15 12:49:15 -05:00
Richard Peter
47cfb79a36
Issue #2726 : Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files.
...
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d
Former-commit-id: 63c484cf14
[formerly 45e6301b91
] [formerly 4709e66b34
] [formerly 63c484cf14
[formerly 45e6301b91
] [formerly 4709e66b34
] [formerly fa25d55384
[formerly 4709e66b34
[formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]]]]
Former-commit-id: fa25d55384
Former-commit-id: a0c08e67ea
[formerly 7e3e0fb984
] [formerly 85a7299b471586523b314346c141f900d516f459 [formerly fa5c0f71ad
]]
Former-commit-id: 19bc4fe78d6b4e9b55f97726a5c86ede5865c5b3 [formerly 4ed2eb3b03
]
Former-commit-id: 64c9dbb764
2014-04-15 11:50:28 -05:00
Nate Jensen
e7c0adcec7
Issue #2984 attempt to fix build
...
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: f39f61518f
[formerly ce585ca9e4
] [formerly 4aaa7c7096
] [formerly f39f61518f
[formerly ce585ca9e4
] [formerly 4aaa7c7096
] [formerly 456359ab1a
[formerly 4aaa7c7096
[formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]]]
Former-commit-id: 456359ab1a
Former-commit-id: e91352d8a8
[formerly 0177329d67
] [formerly e7f43a47947a927cf841070a7c70e8a56b5e3f62 [formerly f6b3c3c05f
]]
Former-commit-id: b961f3c4a6052627f06cb10b2b1510dca127b34c [formerly c5ad3ae2a2
]
Former-commit-id: 24e970b87a
2014-04-15 09:57:11 -05:00
Bryan Kowal
87750ddaef
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 3b7573154c
[formerly bb5acf7c11
] [formerly c125b5b053
] [formerly 3b7573154c
[formerly bb5acf7c11
] [formerly c125b5b053
] [formerly 9829477ced
[formerly c125b5b053
[formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]
Former-commit-id: 9829477ced
Former-commit-id: f7009e8d15
[formerly 0f825df590
] [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730 [formerly ef789bf912
]]
Former-commit-id: 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531 [formerly 0efd4c7c50
]
Former-commit-id: 7bd9ea3d30
2013-09-30 18:00:31 -05:00
Everett Kladstrup
b04c00446e
Issue #2240 Fix incorrect environment assumptions
...
* using $awips_home as the prefix for java/python/psql causes
problems on edex-environment (wes2bridge) installs; where
$awips_home does not contain the java/python/psql installs, instead
they are located at /awips2
Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee
Former-commit-id: 07f18003f1
[formerly 2803eded49
] [formerly 535248b69b
] [formerly 07f18003f1
[formerly 2803eded49
] [formerly 535248b69b
] [formerly fba53e9fe3
[formerly 535248b69b
[formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f]]]]
Former-commit-id: fba53e9fe3
Former-commit-id: 38a8d8268f
[formerly b602d37357
] [formerly 0dd804a51c987294808ac793df221d81414a3689 [formerly 6883cdc389
]]
Former-commit-id: 66a7cbb8f8a1b79dd97f3b32a6e6dc557e9297f9 [formerly 08bbf8620a
]
Former-commit-id: eb14f5a5fe
2013-08-16 11:02:15 -05:00
Bryan Kowal
67a52cd7b0
Issue #2163 - remaining RHEL6 RPM changes
...
- Amend: update build.sh to build the full set of rpms
Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f
Conflicts:
rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
Former-commit-id: 23fb13a41c
[formerly 7d7511af9b
] [formerly 19d80d96c3
] [formerly 23fb13a41c
[formerly 7d7511af9b
] [formerly 19d80d96c3
] [formerly c0458d512d
[formerly 19d80d96c3
[formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]]]
Former-commit-id: c0458d512d
Former-commit-id: 2a9f4d41c9
[formerly f68943aeef
] [formerly b7074896173a8852588739234ce215ff22e0dba5 [formerly 6b305d4ea3
]]
Former-commit-id: ba3cdfa1c21458bf0f95c2202e0d7749db484d77 [formerly 5b55bd8c72
]
Former-commit-id: a3f3f45f4b
2013-08-15 15:39:37 -05:00
Steve Harris
9f5469bc6e
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly e197f23ce3
[formerly 70e4ff30a6
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901
[formerly 640b022e84
] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357
]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922
]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Richard Peter
7ef16a186e
Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
rpms/build/i386/build.sh
Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24
Former-commit-id: f47f42e31e
[formerly 0fa3bf800d
] [formerly 744eb64856
] [formerly f47f42e31e
[formerly 0fa3bf800d
] [formerly 744eb64856
] [formerly 37645245e5
[formerly 744eb64856
[formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7
[formerly be094a1745
] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93
]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50
]
Former-commit-id: 9acddf6eeb
2013-06-24 18:36:15 -05:00
Steve Harris
d3517d7c1d
13.5.1-3 baseline
...
Former-commit-id: a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly 72d22a30c9
[formerly 63803c1424
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0
[formerly deebdb874a
] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a
]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5
]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Bryan Kowal
b3ace41014
Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
...
Former-commit-id: 9c21691383
[formerly 09e13b5413
] [formerly 609c635703
] [formerly 9c21691383
[formerly 09e13b5413
] [formerly 609c635703
] [formerly 772460c8ae
[formerly 609c635703
[formerly 24d32835b66a8a84a19c9834fe1475e547dbc8c7]]]]
Former-commit-id: 772460c8ae
Former-commit-id: ddb583d40c
[formerly 12f7039875
] [formerly d925a95b4bc5f82d0d8f734d61d611daf38ff961 [formerly b94fa4b001
]]
Former-commit-id: 80d96fe0e2892410eb3ba1a425c3c81e9b4a5f75 [formerly 9fa7363600
]
Former-commit-id: 79c3662bb7
2013-06-14 08:05:03 -05:00
Steve Harris
97a4c59662
13.5.1-1 baseline
...
Former-commit-id: 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly fe872355a7
[formerly 998961612c
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410
[formerly 0aab285b8a
] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e
]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940
]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Nate Jensen
8e02ecb717
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 6a6484cbb2
[formerly 7059967ae9
] [formerly caf414bab0
] [formerly 6a6484cbb2
[formerly 7059967ae9
] [formerly caf414bab0
] [formerly 148b20f57c
[formerly caf414bab0
[formerly 19d32f4ffee269e244b77988f908a8e263374430]]]]
Former-commit-id: 148b20f57c
Former-commit-id: 043cc9f661
[formerly 47d2bf99b9
] [formerly 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3
]]
Former-commit-id: 3a1b89b6c0c6710bbfe86ce98af9d45d855ff058 [formerly 1fe16c9553
]
Former-commit-id: 121dd032bf
2013-05-29 12:06:15 -05:00
Bryan Kowal
0fcc9710db
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 9dd01b7aa4
[formerly 07408178a8
] [formerly 5811585229
] [formerly 41f4075e6f
[formerly 5811585229
[formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]]]
Former-commit-id: 41f4075e6f
Former-commit-id: cdbb3688b8
[formerly edaa5339d7
] [formerly 023dd6e87a45202d9e0ada7c2ab1ebac1e398460 [formerly aabc22cc2e
]]
Former-commit-id: 08c73a92e3555cbf97b0e5d192ab214be962489b [formerly e39c66a454
]
Former-commit-id: a6ba3a9ba2
2013-05-15 15:37:16 -05:00
Bryan Kowal
bb8b9b69da
Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
...
Former-commit-id: fa0f882050
[formerly 448518579a
] [formerly cbe9b30266
] [formerly fa0f882050
[formerly 448518579a
] [formerly cbe9b30266
] [formerly 74b4bb0891
[formerly cbe9b30266
[formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]]]
Former-commit-id: 74b4bb0891
Former-commit-id: c7403dffe2
[formerly 6b8538f7f5
] [formerly 3ba7c5a5f785e32de3db6c45c7f138af8ec9aa79 [formerly 7628860bfe
]]
Former-commit-id: d011da6f3e84b53833888641711e30f0f78af275 [formerly cb78a6af53
]
Former-commit-id: b05b21401f
2013-03-19 13:27:38 -05:00
Bryan Kowal
cfaaafbd5a
Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
...
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue
Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc
Former-commit-id: 875c17399a
[formerly f806c880d3
] [formerly d081a2afcd
] [formerly 875c17399a
[formerly f806c880d3
] [formerly d081a2afcd
] [formerly 4faf8aefbe
[formerly d081a2afcd
[formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: e005f18132
[formerly c4709b1bfb
] [formerly 7cd233f6e540666556c9d7a93a89b4d6dfd51ec6 [formerly 497bf33892
]]
Former-commit-id: a05976388b8f7d2005143e0d29a6962ef9b7b34e [formerly cb5a2677b9
]
Former-commit-id: 4d50fec21f
2013-02-28 18:09:25 -06:00