Nate Jensen
7f56e20c03
Merge "Issue #2984 another attempt to fix build" into development
...
Former-commit-id: 26b20a770a5424ffb850
2014-04-15 13:27:29 -05:00
Nate Jensen
cb406ef865
Issue #2984 another attempt to fix build
...
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: 09305d263ea2354a1d2a
2014-04-15 13:16:17 -05:00
Richard Peter
f533275291
Issue #2726 : Fix context mappings for topics
...
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: 4ac996336eecbd0d5720
2014-04-15 12:49:15 -05:00
Richard Peter
45e6301b91
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: fa25d553844709e66b34
2014-04-15 11:50:28 -05:00
Nate Jensen
ce585ca9e4
Issue #2984 attempt to fix build
...
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: 456359ab1a4aaa7c7096
2014-04-15 09:57:11 -05:00
Bryan Kowal
bb5acf7c11
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: 9829477cedc125b5b053
2013-09-30 18:00:31 -05:00
Everett Kladstrup
2803eded49
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: fba53e9fe3535248b69b
2013-08-16 11:02:15 -05:00
Bryan Kowal
7d7511af9b
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: c0458d512d19d80d96c3
2013-08-15 15:39:37 -05:00
Steve Harris
c56be8a332
13.5.1-4 baseline
...
Former-commit-id: e197f23ce370e4ff30a6
2013-06-28 09:46:25 -04:00
Richard Peter
0fa3bf800d
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: 37645245e5744eb64856
2013-06-24 18:36:15 -05:00
Steve Harris
d8176d4a4c
13.5.1-3 baseline
...
Former-commit-id: 72d22a30c963803c1424
2013-06-24 09:29:43 -04:00
Bryan Kowal
09e13b5413
Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
...
Former-commit-id: 772460c8ae609c635703
2013-06-14 08:05:03 -05:00
Steve Harris
6384018950
13.5.1-1 baseline
...
Former-commit-id: fe872355a7998961612c
2013-06-10 15:17:17 -04:00
Nate Jensen
7059967ae9
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 148b20f57ccaf414bab0
2013-05-29 12:06:15 -05:00
Bryan Kowal
07408178a8
Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
...
Former-commit-id: 41f4075e6f5811585229
2013-05-15 15:37:16 -05:00
Bryan Kowal
448518579a
Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
...
Former-commit-id: 74b4bb0891cbe9b30266
2013-03-19 13:27:38 -05:00
Bryan Kowal
f806c880d3
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: 4faf8aefbed081a2afcd
2013-02-28 18:09:25 -06:00
