Greg Armendariz
f6f9b823d8
Merge "Issue #2213 - create the primary and backup exportgrids directories for GFESuite" into development
...
Former-commit-id: 86902fe016dd65446e74c405a93ba0142affc9a4
2013-08-01 13:29:26 -05:00
Richard Peter
f97a27796d
Merge branch 'omaha_13.5.1' (13.5.1-8) into development
...
Conflicts:
RadarServer/build.rcm/build.xml
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java
Former-commit-id: d72693a1db1cd55392c7d171a67918e2bbe5daed
2013-07-31 12:54:12 -05:00
Bryan Kowal
894aeda688
Issue #2164 - re-enable the build of awips2-notification
...
Former-commit-id: 0c8b0a5d178b798b788a602b4053a864fa2f2286
2013-07-30 13:04:54 -05:00
Bryan Kowal
19a25a6222
Issue #2213 - create the primary and backup exportgrids directories for GFESuite
...
- Amend: no longer create the exportgrids tmp directory
Change-Id: Id8aba47244c21d2d7e114ac1af6a29b9a8cd7059
Former-commit-id: 33229fe48556e43fefc8d14c223c0c9ed31ca1b9
2013-07-29 17:57:31 -05:00
Steve Harris
dfbf9a5afe
13.5.1-8 baseline
...
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
2013-07-26 09:02:34 -04:00
Bryan Kowal
cccb37ebc0
Issue #2164 - disable build of awips2-notification temporarily.
...
Former-commit-id: 69f7d9afd3d61fe1a68b16b98d7d3a41d4fcc2c4
2013-07-24 12:45:29 -05:00
Greg Armendariz
df8dd8d71b
Issue #2214 - Correct syntax
...
Former-commit-id: 0b398665c539949a624b9d2e3e0b11dcd501044d
2013-07-23 09:08:53 -05:00
Bryan Kowal
7dcbe438e9
Issue #2206 - relocate ATBL directory change to 13.5
...
Former-commit-id: e6bc04f738a19c56563e81d1924969640223f843
2013-07-22 16:37:42 -05:00
Richard Peter
c6386e306f
Merge branch 'omaha_13.5.1' (13.5.1-7) into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
rpms/awips2.cave/deploy.builder/build.sh
Former-commit-id: 293586df88f53c2ddf6f7586bf71719298728022
2013-07-22 09:40:18 -05:00
Steve Harris
86ce1248c2
13.5.1-7 baseline
...
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
2013-07-18 12:07:22 -04:00
Bryan Kowal
1e8cd0b65e
Issue #2164 - fix 13.6.1 build
...
Former-commit-id: a3eb33bc1e71a6930f17c63a09c924289d9d84ed
2013-07-15 11:33:10 -05:00
Greg Armendariz
b9044b1195
13.5.1-6 baseline
...
Former-commit-id: 30b8d4c0ce425715ea44a394b4b4f143c64b416a
2013-07-10 10:04:22 -04:00
Bryan Kowal
86c27863fe
Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j
...
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7
Former-commit-id: 0d4ba397163e0a365178d5481e520011784104d9
2013-07-08 10:43:14 -05:00
Bryan Kowal
38aa7723c6
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: 24c451a8afbd1b406ee7f83997e0ab92f1625b89
2013-07-03 15:55:53 -05:00
Greg Armendariz
ea7ac37930
13.5.1-5 baseline
...
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
2013-07-03 12:20:27 -04:00
Richard Peter
76bc31aa77
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: 3ec3b75f720bc7622430f69a81ae566936be4363
2013-07-01 00:04:43 -05:00
Richard Peter
582f38bdd4
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: e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9
2013-06-30 23:46:32 -05:00
Steve Harris
e197f23ce3
13.5.1-4 baseline
...
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Roger Ferrel
c10f5c8d65
Issue #1966 Initial Base configuration files for Dale Morris to test.
...
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1
Former-commit-id: 34d765f948cf8cbebb0ab9745ef6803eecb8e968
2013-06-25 13:44:30 -05:00
Richard Peter
b007d4a302
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: 98e25be1049113faf4b2cde1eea38ce7e432b6de
2013-06-24 18:51:56 -05:00
Richard Peter
37645245e5
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: 24e3c900db35375045d2ec581772d0f3a7bf541c
2013-06-24 18:36:15 -05:00
Steve Harris
72d22a30c9
13.5.1-3 baseline
...
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
2013-06-24 09:29:43 -04:00
Steve Harris
cb95c711fd
Merge branch 'omaha_13.5.1' into development
...
Former-commit-id: bd6f53a77dade36b2fdc3057f5823562d5d11d4b
2013-06-18 09:04:11 -05:00
Bryan Kowal
6d58e92913
Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm
...
Former-commit-id: 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc
2013-06-17 15:46:23 -05:00
Steve Harris
532d41787b
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: df49d4d975e97a6b6c35e710dfd8244455eb21eb
2013-06-17 15:29:01 -05:00
Steve Harris
3386330894
13.5.1-2 baseline
...
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
2013-06-17 15:01:22 -04:00
Bryan Kowal
772460c8ae
Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
...
Former-commit-id: 24d32835b66a8a84a19c9834fe1475e547dbc8c7
2013-06-14 08:05:03 -05:00
Bryan Kowal
e31e16741c
Issue #1850 - restore missing changeset; ensure ebxml is created in the metadata database
...
Former-commit-id: 1187c6a5220952a7cd8a10361ff344b3d7a65a47
2013-06-13 14:22:47 -05:00
Bryan Kowal
dbe58fa63d
Issue #1924 - add spring extensions to awips2-groovy
...
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728
Former-commit-id: 550843c669cd2a10901c3e958f37f74e9bbd6332
2013-06-13 11:18:23 -05:00
Steve Harris
fe872355a7
13.5.1-1 baseline
...
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
2327205cb7
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: 43499d1a76f65804a5e74894cad3186765de3501
2013-06-06 15:46:23 -05:00
Steve Harris
18b90226a2
13.4.1-14 baseline
...
Former-commit-id: 0e4ca3ea4159ea0256e22f9814f0de85180a41fb
2013-06-06 15:15:27 -04:00
Richard Peter
9e3baaa87a
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: ed63eaede59b2b8d388d6fa03394f5e8d91c51dd
2013-06-04 14:06:53 -05:00
Bryan Kowal
67cd73c655
Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
...
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56
Former-commit-id: 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b
2013-06-04 09:36:09 -05:00
Bryan Kowal
203d886739
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: b68957a08d64f697b373bb017e28ee5fa186ed82
2013-05-31 11:47:09 -05:00
Roger Ferrel
2f2c553089
Issue #2054 Minor changes to 2 grib patterns in the pqact template.
...
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf
Former-commit-id: 5d70b9a7258b9f1c6b20e4f7d9354af5bd379ab4
2013-05-30 14:34:54 -05:00
Steve Harris
de476791fb
13.4.1-13 baseline
...
Former-commit-id: f79327d3865cb0fa7812d5fba896c1a46013badf
2013-05-29 16:30:09 -04:00
Nate Jensen
148b20f57c
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 19d32f4ffee269e244b77988f908a8e263374430
2013-05-29 12:06:15 -05:00
Bryan Kowal
8061922b70
Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
...
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8
Former-commit-id: 87f9ac72782df2bd133ac415a28d2c56a984cd07
2013-05-22 22:34:45 -05:00
Steve Harris
3590310f17
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: 702d49b30f4b86a120dd032394c314f5db6c985c
2013-05-22 16:13:08 -05:00
Steve Harris
462652e31e
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: eef8340cb8e904e4469e9c99271a34268ca2ce23
2013-05-22 16:10:04 -05:00
Steve Harris
e53ada66b8
13.4.1-12 baseline
...
Former-commit-id: 398b25dee65cd6154c467b657ced5c9d2bada11a
2013-05-22 16:42:39 -04:00
Greg Armendariz
eecbf2718a
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
...
Former-commit-id: 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3
2013-05-21 12:24:19 -05:00
Richard Peter
930ff50fb8
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: 8a78f99345016db3d38c0b846a8a6ccf77fb3e89
2013-05-21 12:11:21 -05:00
Bryan Kowal
7027f97e2a
Issue #1952 - remove duplicate filesystem hierarchy
...
Former-commit-id: 51d97b526a708d896c2935baeab27a0ae627960a
2013-05-21 11:09:57 -05:00
Richard Peter
77a08ebd31
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: 306527aa5e90782da8232acdce39b56358d10dd0
2013-05-21 10:35:00 -05:00
Steve Harris
c0376ce9ed
13.4.1-11 baseline
...
Former-commit-id: e414ae01ab52b3940647e46e22bba3b89790c142
2013-05-21 09:19:25 -04:00
Bryan Kowal
a070d28ecc
Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
...
Former-commit-id: 16613c208fee90c5a11b948f61f34e201402ff30
2013-05-17 18:21:03 -05:00
Richard Peter
a9869f07ba
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: d8543a8dc09565c12c3aebc21466ed43108a9c85
2013-05-17 10:33:18 -05:00
Bryan Kowal
79816de308
Issue #1927 - handle common base until new build implementation
...
Former-commit-id: 977de6e3ab58905fada220a766039ff6e014b9ec
2013-05-16 23:56:47 -05:00
