Nate Jensen
0c82511428
Merge "Issue #2984 another attempt to fix build" into development
...
Former-commit-id: 7f56e20c03
[formerly 5424ffb850
] [formerly 26b20a770a
[formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]]
Former-commit-id: 26b20a770a
Former-commit-id: cf3e9e9020
2014-04-15 13:27:29 -05:00
Nate Jensen
3186527f18
Issue #2984 another attempt to fix build
...
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: cb406ef865
[formerly a2354a1d2a
] [formerly 09305d263e
[formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]]
Former-commit-id: 09305d263e
Former-commit-id: 60b8b6e4ad
2014-04-15 13:16:17 -05:00
Richard Peter
d40449dae9
Issue #2726 : Fix context mappings for topics
...
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: f533275291
[formerly ecbd0d5720
] [formerly 4ac996336e
[formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]
Former-commit-id: 4ac996336e
Former-commit-id: 35b8b8bc15
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: 45e6301b91
[formerly 4709e66b34
] [formerly fa25d55384
[formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]]
Former-commit-id: fa25d55384
Former-commit-id: fa5c0f71ad
2014-04-15 11:50:28 -05:00
Nate Jensen
0177329d67
Issue #2984 attempt to fix build
...
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: ce585ca9e4
[formerly 4aaa7c7096
] [formerly 456359ab1a
[formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]
Former-commit-id: 456359ab1a
Former-commit-id: f6b3c3c05f
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: bb5acf7c11
[formerly c125b5b053
] [formerly 9829477ced
[formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]
Former-commit-id: 9829477ced
Former-commit-id: ef789bf912
2013-09-30 18:00:31 -05:00
Bryan Kowal
751f005228
Issue #2163 - RHEL6 14.1.1 build updates
...
Former-commit-id: 17d652a8dd
[formerly 9415560b38
] [formerly ab3485a3ed
[formerly b0e47f4548c235a7cbaefc12e97264ce4c782fce]]
Former-commit-id: ab3485a3ed
Former-commit-id: 17b8ded082
2013-09-03 13:46:19 -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: 2803eded49
[formerly 535248b69b
] [formerly fba53e9fe3
[formerly d7f3cd19c3f2697b139e3d36ac7ee536947a2b6f]]
Former-commit-id: fba53e9fe3
Former-commit-id: 6883cdc389
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: 7d7511af9b
[formerly 19d80d96c3
] [formerly c0458d512d
[formerly 45adc2b64e9037273e1013631ba7a8fbef400c35]]
Former-commit-id: c0458d512d
Former-commit-id: 6b305d4ea3
2013-08-15 15:39:37 -05:00
Greg Armendariz
93b71934c0
13.5.1-6 baseline
...
Former-commit-id: 5894853996
[formerly 7e09fa5a0b
] [formerly b9044b1195
[formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]
Former-commit-id: b9044b1195
Former-commit-id: 12a09f9aa7
2013-07-10 10:04:22 -04:00
Steve Harris
640b022e84
13.5.1-4 baseline
...
Former-commit-id: c56be8a332
[formerly 70e4ff30a6
] [formerly e197f23ce3
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
2013-06-28 09:46:25 -04:00
Steve Harris
deebdb874a
13.5.1-3 baseline
...
Former-commit-id: d8176d4a4c
[formerly 63803c1424
] [formerly 72d22a30c9
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 72d22a30c9
Former-commit-id: 810388f00a
2013-06-24 09:29:43 -04:00
Steve Harris
0aab285b8a
13.5.1-1 baseline
...
Former-commit-id: 6384018950
[formerly 998961612c
] [formerly fe872355a7
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
2013-06-10 15:17:17 -04:00
Steve Harris
4d88863515
13.4.1-11 baseline
...
Former-commit-id: d6319a2ca6
[formerly 2edee36158
] [formerly c0376ce9ed
[formerly e414ae01ab52b3940647e46e22bba3b89790c142]]
Former-commit-id: c0376ce9ed
Former-commit-id: 6df093ef48
2013-05-21 09:19:25 -04:00
Steve Harris
ff7a21ac37
13.4.1-7 baseline
...
Former-commit-id: 8072752c77
[formerly 4c6ff79e71
] [formerly 8347bed50e
[formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 8347bed50e
Former-commit-id: b35027f661
2013-05-13 12:58:10 -04:00
Steve Harris
f80f98cee2
13.3.1-12 baseline
...
Former-commit-id: be96282207
[formerly 0be473728a
] [formerly aaac0b51e5
[formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Steve Harris
d9be4dce21
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd816
[formerly 83e9157df7
] [formerly 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
82a1ed77a4
13.1.2-6 baseline
...
Former-commit-id: efd3392abe
[formerly 8e5f9e0e6c
] [formerly 59969775ad
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
2013-01-06 14:55:11 -06:00
Steve Harris
cd4185ef5c
13.1.2-2 baseline
...
Former-commit-id: 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Steve Harris
7fb0b17bd5
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Steve Harris
aed7a644df
12.9.1-1 baseline
...
Former-commit-id: 8309193ce9
[formerly 31ae7ea218
] [formerly 79ce6cfd97
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
2012-08-15 13:59:00 -05:00
Steve Harris
dab00b12e6
12.8.1-5 baseline
...
Former-commit-id: 2653ddc2e3
[formerly fd2abfb6f1
] [formerly cd49ef3eda
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
2012-08-01 10:45:37 -05:00
Steve Harris
f2102bfb24
12.7.1-8 baseline
...
Former-commit-id: 11f96dbedd
[formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
2012-07-19 16:20:40 -05:00
Steve Harris
97c4db937e
12.5.1-15 baseline
...
Former-commit-id: 8552902906
[formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Steve Harris
a2a6a18fae
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Bryan Kowal
d4367098a7
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 475849bd91
[formerly 1e3e31a657
] [formerly c2cd292c32
[formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]
Former-commit-id: c2cd292c32
Former-commit-id: 49a30a5b1a
2012-02-23 16:46:48 -06:00
Bryan Kowal
fa23b673c4
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: 4881def0e9
[formerly bae0cb555e
] [formerly e135f4508d
[formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]
Former-commit-id: e135f4508d
Former-commit-id: 5c86773a77
2012-02-23 14:20:50 -06:00
Steve Harris
4eb1ef5b0f
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: 4981170462
[formerly dcadf7baa4
] [formerly 86e586befe
[formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: 86e586befe
Former-commit-id: 938dc5b21c
2012-02-23 12:38:55 -06:00
Steve Harris
b55a488ed8
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 8da36046de
[formerly c8aae98741
] [formerly 54be9660f1
[formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
610fdf3f4e
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 85075e6107
[formerly 94c2ea985b
] [formerly 9995d22e25
[formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
b12f5e5d75
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: d971880b98
[formerly cabf9fd956
] [formerly 5e9d2dd367
[formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 33483f3960
2012-02-20 13:03:39 -06:00
Bryan Kowal
cc8c6597a2
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 5754f9dfd8
[formerly 10a0ca252d
] [formerly 682c10767d
[formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 682c10767d
Former-commit-id: 2ba23624b4
2012-02-17 12:17:14 -06:00
Bryan Kowal
88b67b4977
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: a19dd6ff33
[formerly 7ca62dc7d6
] [formerly 1855bbcbee
[formerly 26243249e27ee347933748aa53e9436e32751d9c]]
Former-commit-id: 1855bbcbee
Former-commit-id: 27c4557e0a
2012-02-09 12:14:37 -06:00
Bryan Kowal
b271da085c
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
...
Former-commit-id: b6a8534258
[formerly 998337f9f4
] [formerly 2554090d0d
[formerly bd0cd789a4c6952aa61b9cef9e61e3f46c7ab462]]
Former-commit-id: 2554090d0d
Former-commit-id: 2745f9cac7
2012-01-30 16:01:45 -06:00
Bryan Kowal
9f6780c4dd
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: 4453ad2d10
[formerly 65e1e4ee0b
] [formerly ea1c82452b
[formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]
Former-commit-id: ea1c82452b
Former-commit-id: 7f1b468010
2012-01-20 13:38:00 -06:00
Matt Nash
82300ccdcf
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
Bryan Kowal
281be5e0b7
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 63f6f44fe1
[formerly 43c3807a32
] [formerly 9d64e1df12
[formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]
Former-commit-id: 9d64e1df12
Former-commit-id: 06187b93be
2012-01-18 16:00:45 -06:00
root
8e80217e59
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00