Nate Jensen
9621b9f8bf
Merge "Issue #2984 another attempt to fix build" into development
...
Former-commit-id: 7f56e20c035424ffb8507f56e20c035424ffb85026b20a770a26b20a770a0c82511428cf3e9e9020146d8259db
2014-04-15 13:27:29 -05:00
Nate Jensen
eb9fba0305
Issue #2984 another attempt to fix build
...
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: cb406ef865a2354a1d2acb406ef865a2354a1d2a09305d263e09305d263e3186527f1860b8b6e4ad529939f3d3
2014-04-15 13:16:17 -05:00
Richard Peter
c4edd6fd84
Issue #2726 : Fix context mappings for topics
...
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: f533275291ecbd0d5720f533275291ecbd0d57204ac996336e4ac996336ed40449dae935b8b8bc15100a0d3bbd
2014-04-15 12:49:15 -05:00
Richard Peter
64c9dbb764
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: 45e6301b914709e66b3445e6301b914709e66b34fa25d55384fa25d553847e3e0fb984fa5c0f71ad4ed2eb3b03
2014-04-15 11:50:28 -05:00
Nate Jensen
24e970b87a
Issue #2984 attempt to fix build
...
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: ce585ca9e44aaa7c7096ce585ca9e44aaa7c7096456359ab1a456359ab1a0177329d67f6b3c3c05fc5ad3ae2a2
2014-04-15 09:57:11 -05:00
Bryan Kowal
7bd9ea3d30
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: bb5acf7c11c125b5b053bb5acf7c11c125b5b0539829477ced9829477ced0f825df590ef789bf9120efd4c7c50
2013-09-30 18:00:31 -05:00
Everett Kladstrup
eb14f5a5fe
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: 2803eded49535248b69b2803eded49535248b69bfba53e9fe3fba53e9fe3b602d373576883cdc38908bbf8620a
2013-08-16 11:02:15 -05:00
Bryan Kowal
a3f3f45f4b
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: 7d7511af9b19d80d96c37d7511af9b19d80d96c3c0458d512dc0458d512df68943aeef6b305d4ea35b55bd8c72
2013-08-15 15:39:37 -05:00
Steve Harris
c05a6c8b50
13.5.1-4 baseline
...
Former-commit-id: c56be8a33270e4ff30a6c56be8a33270e4ff30a6e197f23ce3e197f23ce3640b022e84f658320357c183e08922
2013-06-28 09:46:25 -04:00
Richard Peter
9acddf6eeb
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: 0fa3bf800d744eb648560fa3bf800d744eb6485637645245e537645245e5be094a1745a7594f8c934b582fef50
2013-06-24 18:36:15 -05:00
Steve Harris
50d4376af7
13.5.1-3 baseline
...
Former-commit-id: d8176d4a4c63803c1424d8176d4a4c63803c142472d22a30c972d22a30c9deebdb874a810388f00a1e939939b5
2013-06-24 09:29:43 -04:00
Bryan Kowal
79c3662bb7
Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
...
Former-commit-id: 09e13b5413609c63570309e13b5413609c635703772460c8ae772460c8ae12f7039875b94fa4b0019fa7363600
2013-06-14 08:05:03 -05:00
Steve Harris
859965fc9d
13.5.1-1 baseline
...
Former-commit-id: 6384018950998961612c6384018950998961612cfe872355a7fe872355a70aab285b8a30ba1d634e146c5e8940
2013-06-10 15:17:17 -04:00
Nate Jensen
121dd032bf
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 7059967ae9caf414bab07059967ae9caf414bab0148b20f57c148b20f57c47d2bf99b972ed3e21b31fe16c9553
2013-05-29 12:06:15 -05:00
Bryan Kowal
a6ba3a9ba2
Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
...
Former-commit-id: 07408178a8581158522907408178a8581158522941f4075e6f41f4075e6fedaa5339d7aabc22cc2ee39c66a454
2013-05-15 15:37:16 -05:00
Bryan Kowal
b05b21401f
Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
...
Former-commit-id: 448518579acbe9b30266448518579acbe9b3026674b4bb089174b4bb08916b8538f7f57628860bfecb78a6af53
2013-03-19 13:27:38 -05:00
Bryan Kowal
4d50fec21f
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: f806c880d3d081a2afcdf806c880d3d081a2afcd4faf8aefbe4faf8aefbec4709b1bfb497bf33892cb5a2677b9
2013-02-28 18:09:25 -06:00
