Nate Jensen
0c82511428
Merge "Issue #2984 another attempt to fix build" into development
...
Former-commit-id: 7f56e20c035424ffb85026b20a770a26b20a770acf3e9e9020
2014-04-15 13:27:29 -05:00
Nate Jensen
3186527f18
Issue #2984 another attempt to fix build
...
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: cb406ef865a2354a1d2a09305d263e09305d263e60b8b6e4ad
2014-04-15 13:16:17 -05:00
Richard Peter
d40449dae9
Issue #2726 : Fix context mappings for topics
...
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: f533275291ecbd0d57204ac996336e4ac996336e35b8b8bc15
2014-04-15 12:49:15 -05:00
Richard Peter
7e3e0fb984
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: 45e6301b914709e66b34fa25d55384fa25d55384fa5c0f71ad
2014-04-15 11:50:28 -05:00
Nate Jensen
0177329d67
Issue #2984 attempt to fix build
...
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: ce585ca9e44aaa7c7096456359ab1a456359ab1af6b3c3c05f
2014-04-15 09:57:11 -05:00
Bryan Kowal
0f825df590
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: bb5acf7c11c125b5b0539829477ced9829477cedef789bf912
2013-09-30 18:00:31 -05:00
Everett Kladstrup
b602d37357
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: 2803eded49535248b69bfba53e9fe3fba53e9fe36883cdc389
2013-08-16 11:02:15 -05:00
Bryan Kowal
f68943aeef
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: 7d7511af9b19d80d96c3c0458d512dc0458d512d6b305d4ea3
2013-08-15 15:39:37 -05:00
Steve Harris
640b022e84
13.5.1-4 baseline
...
Former-commit-id: c56be8a33270e4ff30a6e197f23ce3e197f23ce3f658320357
2013-06-28 09:46:25 -04:00
Richard Peter
be094a1745
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: 0fa3bf800d744eb6485637645245e537645245e5a7594f8c93
2013-06-24 18:36:15 -05:00
Steve Harris
deebdb874a
13.5.1-3 baseline
...
Former-commit-id: d8176d4a4c63803c142472d22a30c972d22a30c9810388f00a
2013-06-24 09:29:43 -04:00
Bryan Kowal
12f7039875
Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
...
Former-commit-id: 09e13b5413609c635703772460c8ae772460c8aeb94fa4b001
2013-06-14 08:05:03 -05:00
Steve Harris
0aab285b8a
13.5.1-1 baseline
...
Former-commit-id: 6384018950998961612cfe872355a7fe872355a730ba1d634e
2013-06-10 15:17:17 -04:00
Nate Jensen
47d2bf99b9
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 7059967ae9caf414bab0148b20f57c148b20f57c72ed3e21b3
2013-05-29 12:06:15 -05:00
Bryan Kowal
edaa5339d7
Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
...
Former-commit-id: 07408178a8581158522941f4075e6f41f4075e6faabc22cc2e
2013-05-15 15:37:16 -05:00
Bryan Kowal
6b8538f7f5
Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
...
Former-commit-id: 448518579acbe9b3026674b4bb089174b4bb08917628860bfe
2013-03-19 13:27:38 -05:00
Bryan Kowal
c4709b1bfb
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: f806c880d3d081a2afcd4faf8aefbe4faf8aefbe497bf33892
2013-02-28 18:09:25 -06:00
