Bryan Kowal
bd346aaa1b
Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j
...
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7
Former-commit-id: bb72b7739832c997aa00c91e636399bb72b7739832c997aa00c91e63639986c27863fec91e63639986c27863feae8c2c45d737504822a2594835f311e8885bf9c8d4f13dac41
2013-07-08 10:43:14 -05:00
Bryan Kowal
fc184536e0
Issue #2133 - qpid is now a wrapped java application; incremented qpid release
...
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf
Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58
Former-commit-id: 93e2de52231932480e2bf6412117e193e2de52231932480e2bf6412117e138aa7723c6f6412117e138aa7723c63c0cb232c256c7afbc0f32190c884822c2eef5eef56e42195e
2013-07-03 15:55:53 -05:00
Richard Peter
8396898d25
Merge branch 'omaha_13.5.1' (13.5.1-4) into development
...
Conflicts:
edexOsgi/build.edex/build.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
Former-commit-id: 2368697938edeb3e255b162261c3952368697938edeb3e255b162261c39576bc31aa77162261c39576bc31aa775bcfa6048df8213c16bdd3017ca60f3d6754337acca3d4c19b
2013-07-01 00:04:43 -05:00
Richard Peter
6434a4025d
Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
edexOsgi/com.raytheon.uf.common.archive/build.properties
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java
Former-commit-id: 4ee66ab1f0da54766cc853258be7974ee66ab1f0da54766cc853258be797582f38bdd453258be797582f38bdd40da7509e6d69f88079631757da59ee7ceb1bb9abda3eb1e75c
2013-06-30 23:46:32 -05:00
Steve Harris
9f5469bc6e
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435c56be8a33270e4ff30a62487a8b435c56be8a33270e4ff30a6e197f23ce370e4ff30a6e197f23ce343bb696901640b022e84f658320357c183e08922c05a6c8b50
2013-06-28 09:46:25 -04:00
Roger Ferrel
2033689544
Issue #1966 Initial Base configuration files for Dale Morris to test.
...
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1
Former-commit-id: 89d4d0e00f1e5d68fa1b2cfff5c56389d4d0e00f1e5d68fa1b2cfff5c563c10f5c8d652cfff5c563c10f5c8d654b10182a2e318de198e5ee52f0281cb681d073463419cbaddd
2013-06-25 13:44:30 -05:00
Richard Peter
f6e6c3c531
Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c
Former-commit-id: cf29af8d65ad353c34f9d262c02612cf29af8d65ad353c34f9d262c02612b007d4a302d262c02612b007d4a302bf6e4c1f71e03283ad4aaf1099b3fb8f49eea08fed15c2edcc
2013-06-24 18:51:56 -05:00
Richard Peter
7ef16a186e
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: f47f42e31e0fa3bf800d744eb64856f47f42e31e0fa3bf800d744eb6485637645245e5744eb6485637645245e546ee2f5dd7be094a1745a7594f8c934b582fef509acddf6eeb
2013-06-24 18:36:15 -05:00
Steve Harris
d3517d7c1d
13.5.1-3 baseline
...
Former-commit-id: a0ff6c20ead8176d4a4c63803c1424a0ff6c20ead8176d4a4c63803c142472d22a30c963803c142472d22a30c9e1a5587dd0deebdb874a810388f00a1e939939b550d4376af7
2013-06-24 09:29:43 -04:00
Steve Harris
b34492b4e1
Merge branch 'omaha_13.5.1' into development
...
Former-commit-id: 61427728fe0166f071d61e5ef65d0361427728fe0166f071d61e5ef65d03cb95c711fd1e5ef65d03cb95c711fddb134ca485cf11c28c9f33bbec83ea5343517c55e72ec1d8b6
2013-06-18 09:04:11 -05:00
Bryan Kowal
45515a8bca
Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm
...
Former-commit-id: cb6073c9b17739797147cddb77b77bcb6073c9b17739797147cddb77b77b6d58e92913cddb77b77b6d58e92913f8426400275bb6ea92a78f6b0fef1afcaf57d3166577b77663
2013-06-17 15:46:23 -05:00
Steve Harris
740f6fb8e0
Merge branch 'omaha_13.5.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
Former-commit-id: ba0223804712248cade143316cbff9ba0223804712248cade143316cbff9532d41787b43316cbff9532d41787b324532d6ac251b3c1a9ecb3e34813f316d2ec66701dee712d5
2013-06-17 15:29:01 -05:00
Steve Harris
4d75e573f4
13.5.1-2 baseline
...
Former-commit-id: 7fe15db2f8bc60b22f00adb779323d7fe15db2f8bc60b22f00adb779323d3386330894adb779323d33863308940f83e19dabccd66c07243926dc20f7332a74c4deafc02d5731
2013-06-17 15:01:22 -04:00
Bryan Kowal
b3ace41014
Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
...
Former-commit-id: 9c2169138309e13b5413609c6357039c2169138309e13b5413609c635703772460c8ae609c635703772460c8aeddb583d40c12f7039875b94fa4b0019fa736360079c3662bb7
2013-06-14 08:05:03 -05:00
Bryan Kowal
4ef7bff56a
Issue #1850 - restore missing changeset; ensure ebxml is created in the metadata database
...
Former-commit-id: 50014d3504cb325941aa7ef3040d7a50014d3504cb325941aa7ef3040d7ae31e16741c7ef3040d7ae31e16741c9b357701e066ea07f06dfc25b8179f3ee84e116ed28531c888
2013-06-13 14:22:47 -05:00
Bryan Kowal
b3ce027cf7
Issue #1924 - add spring extensions to awips2-groovy
...
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728
Former-commit-id: cf4ffaab218198a78352180e01cf4ccf4ffaab218198a78352180e01cf4cdbe58fa63d180e01cf4cdbe58fa63d493a8edd2aa67872d4fc44740b014b1463a537214d346ee4a1
2013-06-13 11:18:23 -05:00
Steve Harris
97a4c59662
13.5.1-1 baseline
...
Former-commit-id: 5d99df99696384018950998961612c5d99df99696384018950998961612cfe872355a7998961612cfe872355a743b7a9b4100aab285b8a30ba1d634e146c5e8940859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
f3ba607c69
Merge branch 'omaha_13.4.1' into development
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java
Former-commit-id: a150d8b90b64cf1aedb1571757b2a6a150d8b90b64cf1aedb1571757b2a62327205cb7571757b2a62327205cb778f0921f638b78f538d3035d74b348abfd0b9ead18fdb31920
2013-06-06 15:46:23 -05:00
Steve Harris
c57686831a
13.4.1-14 baseline
...
Former-commit-id: ffcce90f3fbe236eb722c749e122ebffcce90f3fbe236eb722c749e122eb18b90226a2c749e122eb18b90226a2f7316ae4bdcebc1ddb63dee685e3c78ec7524cbbd46b0413fb
2013-06-06 15:15:27 -04:00
Richard Peter
ba88ac2d5c
Merge branch 'omaha_13.4.1' (13.4.1-13) into development
...
Conflicts:
cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java
Former-commit-id: c9c02248b3f13177a981192e5b9be8c9c02248b3f13177a981192e5b9be89e3baaa87a192e5b9be89e3baaa87aa8780f26b59c3fe01efaae09db35ad13f64a7da822f6319986
2013-06-04 14:06:53 -05:00
Bryan Kowal
83a1fd41d0
Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
...
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56
Former-commit-id: eb656f731c7a1c08bb1346c9ba7c7beb656f731c7a1c08bb1346c9ba7c7b67cd73c65546c9ba7c7b67cd73c655e49087b23f86b88922daf8e2a2f4f236aa50007795a5349f85
2013-06-04 09:36:09 -05:00
Bryan Kowal
4ed6b1b4a8
Issue #2047 - initial commit of Java 1.7; rpm build can build both Java 6 and Java 7
...
- Amend: update 32-bit rpm build script
Change-Id: I23fae3f39e7fedb00b46fffb3aa1540dd87ed6b6
Former-commit-id: a2752092ebba097c8a48a78c84dcd7a2752092ebba097c8a48a78c84dcd7203d886739a78c84dcd7203d8867392f4e04a818e6da4debedf63c05e5cfc6f4a5455f3c1968bb5d
2013-05-31 11:47:09 -05:00
Roger Ferrel
8dcbb421f2
Issue #2054 Minor changes to 2 grib patterns in the pqact template.
...
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf
Former-commit-id: 3bd85138cf3c4b351c7585b9d9dea93bd85138cf3c4b351c7585b9d9dea92f2c55308985b9d9dea92f2c5530897353c052ed13543ac79e593055e6c2f2b4dd8aa165c96bcaf4
2013-05-30 14:34:54 -05:00
Steve Harris
7e31d1a9a1
13.4.1-13 baseline
...
Former-commit-id: 9a7ef48967e3b8086bd087b97120099a7ef48967e3b8086bd087b9712009de476791fb87b9712009de476791fb70ecafa237418f8aef56b58cf237bfc9155c1631176f4d392f
2013-05-29 16:30:09 -04:00
Nate Jensen
8e02ecb717
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 6a6484cbb27059967ae9caf414bab06a6484cbb27059967ae9caf414bab0148b20f57ccaf414bab0148b20f57c043cc9f66147d2bf99b972ed3e21b31fe16c9553121dd032bf
2013-05-29 12:06:15 -05:00
Bryan Kowal
c0683ac24d
Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
...
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8
Former-commit-id: a73d60754473dfc7a5e1bfd08efaa9a73d60754473dfc7a5e1bfd08efaa98061922b70bfd08efaa98061922b70b85da4c89f1469cb15d683c1e3127ef13a7f7ca527ad63100f
2013-05-22 22:34:45 -05:00
Steve Harris
6a5b97e11e
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: 511f938c3f570128b9868496832064511f938c3f570128b98684968320643590310f1784968320643590310f17d477564678389eefd1f90f9e0b343dc184d3177961debd93bf
2013-05-22 16:13:08 -05:00
Steve Harris
32c2d3e5e9
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: df612396fbdce0dc3692097617fa26df612396fbdce0dc3692097617fa26462652e31e097617fa26462652e31ea6bb8b38dd026674d0b2299690a202bd9b2e493e6dbe80b1af
2013-05-22 16:10:04 -05:00
Steve Harris
cf67535a3a
13.4.1-12 baseline
...
Former-commit-id: 623f813923397bbf674a6a97b4325a623f813923397bbf674a6a97b4325ae53ada66b86a97b4325ae53ada66b8fb41995981b745b332aebd4f93e8590d9e71aee271e13c4d4d
2013-05-22 16:42:39 -04:00
Greg Armendariz
e8e48bfc3a
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
...
Former-commit-id: da4e717772fce1512b3720a9ad95e5da4e717772fce1512b3720a9ad95e5eecbf2718a20a9ad95e5eecbf2718abb67a4fe0acd96d6d2e6525cd5c751065e9bd1f98c4a634c5a
2013-05-21 12:24:19 -05:00
Richard Peter
c8484145dd
Merge branch 'omaha_13.4.1' (13.4.1-11) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java
Former-commit-id: efd545925e3d84e1dd538aa4b0025cefd545925e3d84e1dd538aa4b0025c930ff50fb88aa4b0025c930ff50fb8ffe0b3508576f11f00ae81ae3ea8bf046de916fd7966576f23
2013-05-21 12:11:21 -05:00
Bryan Kowal
a8764771b3
Issue #1952 - remove duplicate filesystem hierarchy
...
Former-commit-id: b14dd898ace9abe7185b4b8868ca54b14dd898ace9abe7185b4b8868ca547027f97e2a4b8868ca547027f97e2a1d462b582b61a613b49062d21498a61052f6cd98f1b7607385
2013-05-21 11:09:57 -05:00
Richard Peter
27c6d6f318
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: c40709229f4809b3c15b73372622f7c40709229f4809b3c15b73372622f777a08ebd3173372622f777a08ebd318e252f89f021b87e9ea7427f54a87869e6ea48472a8115770f
2013-05-21 10:35:00 -05:00
Steve Harris
603bc2535a
13.4.1-11 baseline
...
Former-commit-id: 65d8f51034d6319a2ca62edee3615865d8f51034d6319a2ca62edee36158c0376ce9ed2edee36158c0376ce9ed5db95cce554d888635156df093ef482767fd893cd9f967c811
2013-05-21 09:19:25 -04:00
Bryan Kowal
d21a109185
Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
...
Former-commit-id: dd508d5bdddb9b06cc9dd8ce0f369cdd508d5bdddb9b06cc9dd8ce0f369ca070d28eccd8ce0f369ca070d28ecc1e095fc20ba52363e2df7dd9b1e1c0bef3b4c74f7425d2c695
2013-05-17 18:21:03 -05:00
Richard Peter
4a410e92b9
Merge branch 'omaha_13.4.1' (13.4.1-9) into development
...
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt
Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c
Former-commit-id: d37ba352e2648a1b25aea33ddbd1a6d37ba352e2648a1b25aea33ddbd1a6a9869f07baa33ddbd1a6a9869f07baf186912fe1aff520d61bc47eb36e43969fa704e5fb910196c0
2013-05-17 10:33:18 -05:00
Bryan Kowal
8b2615ae3c
Issue #1927 - handle common base until new build implementation
...
Former-commit-id: 3f924f74b884c3c114a963f57de31f3f924f74b884c3c114a963f57de31f79816de30863f57de31f79816de3080694a914855d21fa1fd79ea4bab5773f4e377f05bb0432ea77
2013-05-16 23:56:47 -05:00
Steve Harris
721e568859
Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Former-commit-id: f9535abb1087a31f999016ba74496df9535abb1087a31f999016ba74496db76d35969516ba74496db76d3596959b898a6478b5d3ff186726664e66154827d8f1d934145afafe
2013-05-16 13:45:58 -05:00
Bryan Kowal
1b865fa33c
Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
...
Former-commit-id: 3abd701fa417101171b61e726506e03abd701fa417101171b61e726506e039b12ee0fb1e726506e039b12ee0fb4a6d46f29c381256789437461e68ddd792059e3ce0a1431c69
2013-05-16 11:00:47 -05:00
Bryan Kowal
aeb613c15a
Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
...
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e
Former-commit-id: 443fa1a1252149099abb11c93f548e443fa1a1252149099abb11c93f548e43ec90900811c93f548e43ec909008fd6dec8c03c03d61587c97cff7bf9cc00e145831fc9f89b497
2013-05-16 10:21:11 -05:00
Bryan Kowal
6c802f2f8f
Issue #1872 - merge 2002; do not include .gitignore files in the rpm
...
Former-commit-id: 34c87d5256c83d93b527b0122e794e34c87d5256c83d93b527b0122e794e20fd227d99b0122e794e20fd227d99c7cd48449e8cba03d5a57ec8600dc11a63d07768c7a9750841
2013-05-16 10:19:31 -05:00
Steve Harris
202e373f01
13.4.1-9 baseline
...
Former-commit-id: 301821988e88eee9cbfabcf7f15c90301821988e88eee9cbfabcf7f15c90aff41713f9bcf7f15c90aff41713f97d55d0e95967a95d07d20766ae20dd3f87ea1a151730b6c41e
2013-05-16 11:12:07 -04:00
Bryan Kowal
0fcc9710db
Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
...
Former-commit-id: 9dd01b7aa407408178a858115852299dd01b7aa407408178a8581158522941f4075e6f581158522941f4075e6fcdbb3688b8edaa5339d7aabc22cc2ee39c66a454a6ba3a9ba2
2013-05-15 15:37:16 -05:00
Bryan Kowal
9e2e30d040
Issue #2002 - do not include .gitignore files in the rpm
...
Former-commit-id: f2f288c6b5413237030160ae5df378f2f288c6b5413237030160ae5df378107055781d60ae5df378107055781d938027634143db530ddb7df8e11ed3a2a6d0bdad9e9498b002
2013-05-15 13:31:24 -05:00
Bryan Kowal
1af23d1007
Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
...
Former-commit-id: e02ad5d555e1794dd03ff9e77e90b7e02ad5d555e1794dd03ff9e77e90b70e3e3e891bf9e77e90b70e3e3e891b92db4c41211fccd550360af34bbe4c59024f8dd784ed22cf52
2013-05-15 11:55:56 -05:00
Steve Harris
4b1a9ad438
13.4.1-8 baseline
...
Former-commit-id: 02dba50c00576a74fe0b19866e703202dba50c00576a74fe0b19866e7032c59b52a26619866e7032c59b52a266fddef92bf35465764527a1c4cd2a39395d21565f5bdcf5c0a1
2013-05-14 09:21:41 -04:00
Richard Peter
dd2ceed4ae
Merge branch 'omaha_13.4.1' (13.4.1-7) into development
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862
Former-commit-id: 207c17d5af2c009eb618a12830f762207c17d5af2c009eb618a12830f762c5040038d3a12830f762c5040038d3994357c3576c09ab9bdfbcf4dcc810f7470fbd8fc7755a649b
2013-05-13 17:11:05 -05:00
Richard Peter
8083ef6c71
Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
nativeLib/files.native/adapt/climate/bin/Linux/build_f6
nativeLib/files.native/adapt/climate/bin/Linux/create_climate
nativeLib/files.native/adapt/climate/bin/Linux/display_climate
nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
nativeLib/files.native/adapt/climate/bin/Linux/format_climate
nativeLib/files.native/adapt/climate/bin/Linux/init_climate
nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
nativeLib/files.native/edex/lib/native/linux32/libXm.so
nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
nativeLib/files.native/edex/lib/native/linux32/libecpg.so
nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
nativeLib/files.native/edex/lib/native/linux32/libjasper.so
nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
nativeLib/files.native/edex/lib/native/linux32/libtcl.so
nativeLib/files.native/edex/lib/native/linux32/libtk.so
rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e
Former-commit-id: b374309faf4ae23b93d98062c38b71b374309faf4ae23b93d98062c38b71ba590e2f938062c38b71ba590e2f93b2b66da141faf22cc9258e5929406c4b5869684b9623d4c82e
2013-05-13 16:33:50 -05:00
Steve Harris
a2c35a5f3f
13.4.1-7 baseline
...
Former-commit-id: 81bc07bff48072752c774c6ff79e7181bc07bff48072752c774c6ff79e718347bed50e4c6ff79e718347bed50e6e1e454a9fff7a21ac37b35027f661dffa6d3bdcc7c6ea343e
2013-05-13 12:58:10 -04:00
Bryan Kowal
424fd3b9a4
Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location
...
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58
Former-commit-id: 47ae8f74c23ad9637805584465752247ae8f74c23ad96378055844657522baa6b26c345844657522baa6b26c34f3411d8e5169622150f8eafa210750a73af7bdc08850ac004b
2013-05-09 16:46:04 -05:00
