Steve Harris
3fe3d35339
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
2015-02-11 15:53:38 -06:00
Fay.Liang
59f3f87190
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
Greg Armendariz
25cb96ec19
Omaha #3839 - Add script to /awips2/edex/bin/
...
Former-commit-id: c215890342be6fed80d614e0a5853e8ce816a7f2
2015-02-04 09:59:06 -06:00
Greg Armendariz
8c38289cf7
Omaha #4065 - Update EDEX RPM install to modify date stamp
...
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0
Former-commit-id: 83243af002e8ddfd15f899ff1ab3e511cf5a0af4
2015-02-03 10:12:54 -06:00
Fay.Liang
c6bd5d7675
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Qinglu.Lin
3b3780fd13
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
...
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864
2014-12-17 16:53:31 -05:00
Brian Clements
d2774cffc2
Issue #3935 prevent warning when using init.d script to stop edex
...
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03
Former-commit-id: b1034aa16b3393e6584038ebb80faf2a4e1a831f
2014-12-17 14:35:16 -06:00
Bryan Kowal
9e55db1c52
Omaha #3508 - remove references to yajsw in %files
...
Former-commit-id: 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9
2014-12-05 10:04:42 -06:00
Bryan Kowal
71cf313666
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 9b36754ca610887a17666ceff2a1540b958913b6
2014-12-04 17:33:43 -06:00
Nate Jensen
5424ffb850
Merge "Issue #2984 another attempt to fix build" into development
...
Former-commit-id: 00ab3a620f85859976144f9cdddd52f4bc46c063
2014-04-15 13:27:29 -05:00
Nate Jensen
a2354a1d2a
Issue #2984 another attempt to fix build
...
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: 38195dc5de31cefd435f507a3aa9f7f60965c0ff
2014-04-15 13:16:17 -05:00
Richard Peter
ecbd0d5720
Issue #2726 : Fix context mappings for topics
...
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: b3d978d0e22b371eaa826d856156ba5360ee7be9
2014-04-15 12:49:15 -05:00
Richard Peter
4709e66b34
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: dc798a7ca6badfcd6d732b43bb3e0175770398be
2014-04-15 11:50:28 -05:00
Nate Jensen
4aaa7c7096
Issue #2984 attempt to fix build
...
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9
2014-04-15 09:57:11 -05:00
Bryan Kowal
c125b5b053
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: 97612cb78e067c493f7b5a76a2a84d88c96a5094
2013-09-30 18:00:31 -05:00
Bryan Kowal
9415560b38
Issue #2163 - RHEL6 14.1.1 build updates
...
Former-commit-id: b0e47f4548c235a7cbaefc12e97264ce4c782fce
2013-09-03 13:46:19 -05:00
Everett Kladstrup
535248b69b
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: d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f
2013-08-16 11:02:15 -05:00
Bryan Kowal
19d80d96c3
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: 45adc2b64e9037273e1013631ba7a8fbef400c35
2013-08-15 15:39:37 -05:00
Greg Armendariz
7e09fa5a0b
13.5.1-6 baseline
...
Former-commit-id: 30b8d4c0ce425715ea44a394b4b4f143c64b416a
2013-07-10 10:04:22 -04:00
Steve Harris
70e4ff30a6
13.5.1-4 baseline
...
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Steve Harris
63803c1424
13.5.1-3 baseline
...
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
2013-06-24 09:29:43 -04:00
Steve Harris
998961612c
13.5.1-1 baseline
...
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
2edee36158
13.4.1-11 baseline
...
Former-commit-id: e414ae01ab52b3940647e46e22bba3b89790c142
2013-05-21 09:19:25 -04:00
Steve Harris
4c6ff79e71
13.4.1-7 baseline
...
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Steve Harris
0be473728a
13.3.1-12 baseline
...
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
83e9157df7
13.2.1-2 baseline
...
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
8e5f9e0e6c
13.1.2-6 baseline
...
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
2013-01-06 14:55:11 -06:00
Steve Harris
c0c1d56f3a
13.1.2-2 baseline
...
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Steve Harris
61f269f54c
12.9.1-5 baseline
...
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Steve Harris
31ae7ea218
12.9.1-1 baseline
...
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Steve Harris
fd2abfb6f1
12.8.1-5 baseline
...
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00
Steve Harris
16bf591a33
12.7.1-8 baseline
...
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
2012-07-19 16:20:40 -05:00
Steve Harris
b13cbb7e00
12.5.1-15 baseline
...
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
67a5a68300
12.4.1-4 baseline
...
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Bryan Kowal
1e3e31a657
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 6984db8c852a552867b1b8159637d96dcd83ab5a
2012-02-23 16:46:48 -06:00
Bryan Kowal
bae0cb555e
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 10339dcba7c9ae535766e5c5dddac57ddb3f99c4
2012-02-23 14:20:50 -06:00
Steve Harris
dcadf7baa4
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
2012-02-23 12:38:55 -06:00
Steve Harris
c8aae98741
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
94c2ea985b
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
2012-02-22 10:12:49 -06:00
Steve Harris
cabf9fd956
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
2012-02-20 13:03:39 -06:00
Bryan Kowal
10a0ca252d
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
2012-02-17 12:17:14 -06:00
Bryan Kowal
7ca62dc7d6
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c
2012-02-09 12:14:37 -06:00
Bryan Kowal
998337f9f4
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
...
Former-commit-id: bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462
2012-01-30 16:01:45 -06:00
Bryan Kowal
65e1e4ee0b
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: 56068aa96fa6daf113861476bf4b7aebe2021ca4
2012-01-20 13:38:00 -06:00
Matt Nash
66be3bec40
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
Bryan Kowal
43c3807a32
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 40f016a9f9e605b039d41ed44a59a269caf8a024
2012-01-18 16:00:45 -06:00
root
9f19e3f712
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
