Richard Peter
3c8f6762fe
Merge "Issue #2240 Fix incorrect environment assumptions" into development
...
Former-commit-id: 8894c03f3db89e44ddc97d1ca897130670291687
2013-08-16 15:15:54 -05:00
Bryan Kowal
c113178a49
Issue #2164 - fix 13.6 aviation rpm
...
Former-commit-id: bbeb36de32df79731ace5b56d4d746b8057707f0
2013-08-16 14:21:03 -05:00
Bryan Kowal
197498e784
Issue #2164 - fix 13.6.1 CAVE build
...
Former-commit-id: eb249e6e879bcff4cbed17edde9307e5390d3619
2013-08-16 12:40:38 -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
Steve Harris
8484f03bb8
Merge branch 'omaha_13.5.1' (13.5.1-16) into development
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
nativeLib/edex_com/.cproject
Former-commit-id: e8580e78f408b796a1fea65167c43cc122a325bf
2013-08-15 12:50:08 -05:00
Richard Peter
5e5047cc4f
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: e1aa1aa51e2325b005604aa971e842bccfcd8375
2013-08-14 15:23:18 -05:00
Bryan Kowal
fc8c3f540d
Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
...
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function
Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3
Former-commit-id: af2882799bd08998d1321bac37beb2a7cecb4fb9
2013-08-14 11:21:33 -05:00
Bryan Kowal
4604653241
Issue #2164 - fix 13.6.1 build
...
Former-commit-id: 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371
2013-08-13 11:13:52 -05:00
Greg Armendariz
29b823fee4
13.5.1-13 baseline
...
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
2013-08-08 17:00:36 -04:00
Greg Armendariz
6fc06bb4e4
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
Steve Harris
97fe6a670f
13.5.1-9 baseline
...
Former-commit-id: 06a1dd45adedbe259f9c30ebf93f2f90017fe945
2013-08-01 09:20:23 -04:00
Richard Peter
26df62db53
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
2ce33f335a
Issue #2164 - re-enable the build of awips2-notification
...
Former-commit-id: 0c8b0a5d178b798b788a602b4053a864fa2f2286
2013-07-30 13:04:54 -05:00
Bryan Kowal
f5eac74b94
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
3bece5e5d0
13.5.1-8 baseline
...
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
2013-07-26 09:02:34 -04:00
Bryan Kowal
9ae7f63e26
Issue #2164 - disable build of awips2-notification temporarily.
...
Former-commit-id: 69f7d9afd3d61fe1a68b16b98d7d3a41d4fcc2c4
2013-07-24 12:45:29 -05:00
Greg Armendariz
62751f2af8
Issue #2214 - Correct syntax
...
Former-commit-id: 0b398665c539949a624b9d2e3e0b11dcd501044d
2013-07-23 09:08:53 -05:00
Bryan Kowal
bdcbf39a9a
Issue #2206 - relocate ATBL directory change to 13.5
...
Former-commit-id: e6bc04f738a19c56563e81d1924969640223f843
2013-07-22 16:37:42 -05:00
Richard Peter
15d1a6eab0
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
bf58a81b38
13.5.1-7 baseline
...
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
2013-07-18 12:07:22 -04:00
Bryan Kowal
df29ab238d
Issue #2164 - fix 13.6.1 build
...
Former-commit-id: a3eb33bc1e71a6930f17c63a09c924289d9d84ed
2013-07-15 11:33:10 -05:00
Greg Armendariz
7e09fa5a0b
13.5.1-6 baseline
...
Former-commit-id: 30b8d4c0ce425715ea44a394b4b4f143c64b416a
2013-07-10 10:04:22 -04:00
Bryan Kowal
c91e636399
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
f6412117e1
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
492f92ef7b
13.5.1-5 baseline
...
Former-commit-id: e0157ab61ca5f2a62d78993a27893778fa119c4f
2013-07-03 12:20:27 -04:00
Richard Peter
162261c395
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
53258be797
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
70e4ff30a6
13.5.1-4 baseline
...
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
2013-06-28 09:46:25 -04:00
Roger Ferrel
2cfff5c563
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
d262c02612
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
744eb64856
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
63803c1424
13.5.1-3 baseline
...
Former-commit-id: cc90f0c02410fef504ec9de389c07dfa41164247
2013-06-24 09:29:43 -04:00
Steve Harris
1e5ef65d03
Merge branch 'omaha_13.5.1' into development
...
Former-commit-id: bd6f53a77dade36b2fdc3057f5823562d5d11d4b
2013-06-18 09:04:11 -05:00
Bryan Kowal
cddb77b77b
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
43316cbff9
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
adb779323d
13.5.1-2 baseline
...
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
2013-06-17 15:01:22 -04:00
Bryan Kowal
609c635703
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
7ef3040d7a
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
180e01cf4c
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
998961612c
13.5.1-1 baseline
...
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
2013-06-10 15:17:17 -04:00
Steve Harris
571757b2a6
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
c749e122eb
13.4.1-14 baseline
...
Former-commit-id: 0e4ca3ea4159ea0256e22f9814f0de85180a41fb
2013-06-06 15:15:27 -04:00
Richard Peter
192e5b9be8
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
46c9ba7c7b
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
a78c84dcd7
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
85b9d9dea9
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
87b9712009
13.4.1-13 baseline
...
Former-commit-id: f79327d3865cb0fa7812d5fba896c1a46013badf
2013-05-29 16:30:09 -04:00
Nate Jensen
caf414bab0
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
bfd08efaa9
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
8496832064
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: 702d49b30f4b86a120dd032394c314f5db6c985c
2013-05-22 16:13:08 -05:00
