Greg Armendariz
f23d42e977
13.5.1-6 baseline
...
Former-commit-id: e375a74bc8
[formerly 5894853996
] [formerly 7e09fa5a0b
] [formerly b9044b1195
[formerly 7e09fa5a0b
[formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7
]
Former-commit-id: 93b71934c0
2013-07-10 10:04:22 -04:00
Bryan Kowal
ae8c2c45d7
Issue #2164 - fix 13.6.1 qpid build for slf4j / log4j
...
Change-Id: Iac18215b017ea4b285f6435b3b492a85bacf5da7
Former-commit-id: bb72b77398
[formerly 32c997aa00
] [formerly 8dbd4df057b224e7dbada77a07f8bdad9e5560f6 [formerly c91e636399
]] [formerly 86c27863fe
[formerly c91e636399
[formerly 0d4ba397163e0a365178d5481e520011784104d9]]]
Former-commit-id: 86c27863fe
Former-commit-id: b33bf6be199d74747fbece34684c1b542a99bd8a [formerly 594835f311
]
Former-commit-id: 37504822a2
2013-07-08 10:43:14 -05:00
Bryan Kowal
3c0cb232c2
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: 93e2de5223
[formerly 1932480e2b
] [formerly f6412117e1
] [formerly 38aa7723c6
[formerly f6412117e1
[formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 2f3b48fdc497c9180ad73d6b0dbc1d60d2ff66f5 [formerly 32190c8848
]
Former-commit-id: 56c7afbc0f
2013-07-03 15:55:53 -05:00
Greg Armendariz
d5bea0fc06
13.5.1-5 baseline
...
Former-commit-id: ed9da994c7
[formerly 82aabf1066
] [formerly 492f92ef7b
] [formerly ea7ac37930
[formerly 492f92ef7b
[formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82
]
Former-commit-id: d899faec3d
2013-07-03 12:20:27 -04:00
Richard Peter
5bcfa6048d
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: 2368697938
[formerly edeb3e255b
] [formerly 162261c395
] [formerly 76bc31aa77
[formerly 162261c395
[formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: 86532f141a4385ff3262869d48ec5e99adacc4a2 [formerly d3017ca60f
]
Former-commit-id: f8213c16bd
2013-07-01 00:04:43 -05:00
Richard Peter
0da7509e6d
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: 4ee66ab1f0
[formerly da54766cc8
] [formerly 53258be797
] [formerly 582f38bdd4
[formerly 53258be797
[formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]]
Former-commit-id: 582f38bdd4
Former-commit-id: ba21e4d911005959317dc4193a88dd4c7ec1ee97 [formerly 1757da59ee
]
Former-commit-id: 69f8807963
2013-06-30 23:46:32 -05:00
Steve Harris
43bb696901
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435
[formerly c56be8a332
] [formerly 70e4ff30a6
] [formerly e197f23ce3
[formerly 70e4ff30a6
[formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357
]
Former-commit-id: 640b022e84
2013-06-28 09:46:25 -04:00
Roger Ferrel
4b10182a2e
Issue #1966 Initial Base configuration files for Dale Morris to test.
...
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1
Former-commit-id: 89d4d0e00f
[formerly 1e5d68fa1b
] [formerly 2cfff5c563
] [formerly c10f5c8d65
[formerly 2cfff5c563
[formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]]
Former-commit-id: c10f5c8d65
Former-commit-id: d9addb5bf5fa26124cfaff35dda1e82f91b54f70 [formerly ee52f0281c
]
Former-commit-id: 318de198e5
2013-06-25 13:44:30 -05:00
Richard Peter
bf6e4c1f71
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: cf29af8d65
[formerly ad353c34f9
] [formerly d262c02612
] [formerly b007d4a302
[formerly d262c02612
[formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]
Former-commit-id: b007d4a302
Former-commit-id: e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb
]
Former-commit-id: e03283ad4a
2013-06-24 18:51:56 -05:00
Richard Peter
46ee2f5dd7
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: f47f42e31e
[formerly 0fa3bf800d
] [formerly 744eb64856
] [formerly 37645245e5
[formerly 744eb64856
[formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93
]
Former-commit-id: be094a1745
2013-06-24 18:36:15 -05:00
Steve Harris
e1a5587dd0
13.5.1-3 baseline
...
Former-commit-id: a0ff6c20ea
[formerly d8176d4a4c
] [formerly 63803c1424
] [formerly 72d22a30c9
[formerly 63803c1424
[formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a
]
Former-commit-id: deebdb874a
2013-06-24 09:29:43 -04:00
Steve Harris
db134ca485
Merge branch 'omaha_13.5.1' into development
...
Former-commit-id: 61427728fe
[formerly 0166f071d6
] [formerly 1e5ef65d03
] [formerly cb95c711fd
[formerly 1e5ef65d03
[formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]]
Former-commit-id: cb95c711fd
Former-commit-id: 31d467e7a6f99e0bba292d2416450a09c0745a20 [formerly 33bbec83ea
]
Former-commit-id: cf11c28c9f
2013-06-18 09:04:11 -05:00
Bryan Kowal
f842640027
Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm
...
Former-commit-id: cb6073c9b1
[formerly 7739797147
] [formerly cddb77b77b
] [formerly 6d58e92913
[formerly cddb77b77b
[formerly 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc]]]
Former-commit-id: 6d58e92913
Former-commit-id: b65959681050b87644d70259b84677f21ae907a1 [formerly 8f6b0fef1a
]
Former-commit-id: 5bb6ea92a7
2013-06-17 15:46:23 -05:00
Steve Harris
324532d6ac
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: ba02238047
[formerly 12248cade1
] [formerly 43316cbff9
] [formerly 532d41787b
[formerly 43316cbff9
[formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]
Former-commit-id: 532d41787b
Former-commit-id: 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f
]
Former-commit-id: 251b3c1a9e
2013-06-17 15:29:01 -05:00
Steve Harris
0f83e19dab
13.5.1-2 baseline
...
Former-commit-id: 7fe15db2f8
[formerly bc60b22f00
] [formerly adb779323d
] [formerly 3386330894
[formerly adb779323d
[formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7
]
Former-commit-id: ccd66c0724
2013-06-17 15:01:22 -04:00
Bryan Kowal
ddb583d40c
Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
...
Former-commit-id: 9c21691383
[formerly 09e13b5413
] [formerly 609c635703
] [formerly 772460c8ae
[formerly 609c635703
[formerly 24d32835b66a8a84a19c9834fe1475e547dbc8c7]]]
Former-commit-id: 772460c8ae
Former-commit-id: d925a95b4bc5f82d0d8f734d61d611daf38ff961 [formerly b94fa4b001
]
Former-commit-id: 12f7039875
2013-06-14 08:05:03 -05:00
Bryan Kowal
9b357701e0
Issue #1850 - restore missing changeset; ensure ebxml is created in the metadata database
...
Former-commit-id: 50014d3504
[formerly cb325941aa
] [formerly 7ef3040d7a
] [formerly e31e16741c
[formerly 7ef3040d7a
[formerly 1187c6a5220952a7cd8a10361ff344b3d7a65a47]]]
Former-commit-id: e31e16741c
Former-commit-id: c3fc9ca0faadda4ee234471daf38e7d044d3f6a9 [formerly fc25b8179f
]
Former-commit-id: 66ea07f06d
2013-06-13 14:22:47 -05:00
Bryan Kowal
493a8edd2a
Issue #1924 - add spring extensions to awips2-groovy
...
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728
Former-commit-id: cf4ffaab21
[formerly 8198a78352
] [formerly 180e01cf4c
] [formerly dbe58fa63d
[formerly 180e01cf4c
[formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]]]
Former-commit-id: dbe58fa63d
Former-commit-id: 6087296d3ff5f4f2c0979e80d55a74fade6100df [formerly 44740b014b
]
Former-commit-id: a67872d4fc
2013-06-13 11:18:23 -05:00
Steve Harris
43b7a9b410
13.5.1-1 baseline
...
Former-commit-id: 5d99df9969
[formerly 6384018950
] [formerly 998961612c
] [formerly fe872355a7
[formerly 998961612c
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e
]
Former-commit-id: 0aab285b8a
2013-06-10 15:17:17 -04:00
Steve Harris
78f0921f63
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: a150d8b90b
[formerly 64cf1aedb1
] [formerly 571757b2a6
] [formerly 2327205cb7
[formerly 571757b2a6
[formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: bfd7bfea914d41fc958828fa95730a334190b2e1 [formerly 035d74b348
]
Former-commit-id: 8b78f538d3
2013-06-06 15:46:23 -05:00
Steve Harris
f7316ae4bd
13.4.1-14 baseline
...
Former-commit-id: ffcce90f3f
[formerly be236eb722
] [formerly c749e122eb
] [formerly 18b90226a2
[formerly c749e122eb
[formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: a7fc76319d4a743a6f6c8fc92e7f97e543ca980f [formerly dee685e3c7
]
Former-commit-id: cebc1ddb63
2013-06-06 15:15:27 -04:00
Richard Peter
a8780f26b5
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: c9c02248b3
[formerly f13177a981
] [formerly 192e5b9be8
] [formerly 9e3baaa87a
[formerly 192e5b9be8
[formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad
]
Former-commit-id: 9c3fe01efa
2013-06-04 14:06:53 -05:00
Bryan Kowal
e49087b23f
Issue #1952 - remove the hydroapps dependency on awips2-edex-native.
...
Change-Id: Ifba56c784bb2f54475010e3f449668e95e9d4f56
Former-commit-id: eb656f731c
[formerly 7a1c08bb13
] [formerly 46c9ba7c7b
] [formerly 67cd73c655
[formerly 46c9ba7c7b
[formerly 69358da7b7cfa6b05d3b20bc7f27a1796bb2c86b]]]
Former-commit-id: 67cd73c655
Former-commit-id: 9df212446234478c6e77b29334b635f74a7591eb [formerly f8e2a2f4f2
]
Former-commit-id: 86b88922da
2013-06-04 09:36:09 -05:00
Bryan Kowal
2f4e04a818
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: a2752092eb
[formerly ba097c8a48
] [formerly a78c84dcd7
] [formerly 203d886739
[formerly a78c84dcd7
[formerly b68957a08d64f697b373bb017e28ee5fa186ed82]]]
Former-commit-id: 203d886739
Former-commit-id: 41783f7e227512d37dd7ab56c04b1bec2805ea4f [formerly f63c05e5cf
]
Former-commit-id: e6da4debed
2013-05-31 11:47:09 -05:00
Roger Ferrel
7353c052ed
Issue #2054 Minor changes to 2 grib patterns in the pqact template.
...
Change-Id: Ide79c8cadccd76b95aab400fca545c6fa09addcf
Former-commit-id: 3bd85138cf
[formerly 3c4b351c75
] [formerly 85b9d9dea9
] [formerly 2f2c553089
[formerly 85b9d9dea9
[formerly 5d70b9a7258b9f1c6b20e4f7d9354af5bd379ab4]]]
Former-commit-id: 2f2c553089
Former-commit-id: d3eddf23547cafc9eba0b328fea23856199aef10 [formerly 593055e6c2
]
Former-commit-id: 13543ac79e
2013-05-30 14:34:54 -05:00
Steve Harris
70ecafa237
13.4.1-13 baseline
...
Former-commit-id: 9a7ef48967
[formerly e3b8086bd0
] [formerly 87b9712009
] [formerly de476791fb
[formerly 87b9712009
[formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]
Former-commit-id: de476791fb
Former-commit-id: 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf
]
Former-commit-id: 418f8aef56
2013-05-29 16:30:09 -04:00
Nate Jensen
043cc9f661
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 6a6484cbb2
[formerly 7059967ae9
] [formerly caf414bab0
] [formerly 148b20f57c
[formerly caf414bab0
[formerly 19d32f4ffee269e244b77988f908a8e263374430]]]
Former-commit-id: 148b20f57c
Former-commit-id: 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3
]
Former-commit-id: 47d2bf99b9
2013-05-29 12:06:15 -05:00
Bryan Kowal
b85da4c89f
Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
...
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8
Former-commit-id: a73d607544
[formerly 73dfc7a5e1
] [formerly bfd08efaa9
] [formerly 8061922b70
[formerly bfd08efaa9
[formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]]
Former-commit-id: 8061922b70
Former-commit-id: 7f883b486090bea47bbfeee228a09574a9b949d0 [formerly 83c1e3127e
]
Former-commit-id: 1469cb15d6
2013-05-22 22:34:45 -05:00
Steve Harris
d477564678
Merge branch 'omaha_13.4.1' into development
...
Former-commit-id: 511f938c3f
[formerly 570128b986
] [formerly 8496832064
] [formerly 3590310f17
[formerly 8496832064
[formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d
]
Former-commit-id: 389eefd1f9
2013-05-22 16:13:08 -05:00
Steve Harris
a6bb8b38dd
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: df612396fb
[formerly dce0dc3692
] [formerly 097617fa26
] [formerly 462652e31e
[formerly 097617fa26
[formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202
]
Former-commit-id: 026674d0b2
2013-05-22 16:10:04 -05:00
Steve Harris
fb41995981
13.4.1-12 baseline
...
Former-commit-id: 623f813923
[formerly 397bbf674a
] [formerly 6a97b4325a
] [formerly e53ada66b8
[formerly 6a97b4325a
[formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859
]
Former-commit-id: b745b332ae
2013-05-22 16:42:39 -04:00
Greg Armendariz
bb67a4fe0a
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
...
Former-commit-id: da4e717772
[formerly fce1512b37
] [formerly 20a9ad95e5
] [formerly eecbf2718a
[formerly 20a9ad95e5
[formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]]
Former-commit-id: eecbf2718a
Former-commit-id: faf103cebb41e879d86ec60b59e142420585d7d2 [formerly 525cd5c751
]
Former-commit-id: cd96d6d2e6
2013-05-21 12:24:19 -05:00
Richard Peter
ffe0b35085
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: efd545925e
[formerly 3d84e1dd53
] [formerly 8aa4b0025c
] [formerly 930ff50fb8
[formerly 8aa4b0025c
[formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf
]
Former-commit-id: 76f11f00ae
2013-05-21 12:11:21 -05:00
Bryan Kowal
1d462b582b
Issue #1952 - remove duplicate filesystem hierarchy
...
Former-commit-id: b14dd898ac
[formerly e9abe7185b
] [formerly 4b8868ca54
] [formerly 7027f97e2a
[formerly 4b8868ca54
[formerly 51d97b526a708d896c2935baeab27a0ae627960a]]]
Former-commit-id: 7027f97e2a
Former-commit-id: 82aa40c3c40fcbbba4f5844ff450074ef0571e57 [formerly 62d21498a6
]
Former-commit-id: 61a613b490
2013-05-21 11:09:57 -05:00
Richard Peter
8e252f89f0
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: c40709229f
[formerly 4809b3c15b
] [formerly 73372622f7
] [formerly 77a08ebd31
[formerly 73372622f7
[formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878
]
Former-commit-id: 21b87e9ea7
2013-05-21 10:35:00 -05:00
Steve Harris
5db95cce55
13.4.1-11 baseline
...
Former-commit-id: 65d8f51034
[formerly d6319a2ca6
] [formerly 2edee36158
] [formerly c0376ce9ed
[formerly 2edee36158
[formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48
]
Former-commit-id: 4d88863515
2013-05-21 09:19:25 -04:00
Bryan Kowal
1e095fc20b
Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
...
Former-commit-id: dd508d5bdd
[formerly db9b06cc9d
] [formerly eb54fa14ad0ff4cfcc795a392370b390ab7327ac [formerly d8ce0f369c
]] [formerly a070d28ecc
[formerly d8ce0f369c
[formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]
Former-commit-id: a070d28ecc
Former-commit-id: 6bbd21751b1aa7bfaacb409592f0ad2110b3d569 [formerly 7dd9b1e1c0
]
Former-commit-id: a52363e2df
2013-05-17 18:21:03 -05:00
Richard Peter
f186912fe1
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: d37ba352e2
[formerly 648a1b25ae
] [formerly a33ddbd1a6
] [formerly a9869f07ba
[formerly a33ddbd1a6
[formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43
]
Former-commit-id: aff520d61b
2013-05-17 10:33:18 -05:00
Bryan Kowal
0694a91485
Issue #1927 - handle common base until new build implementation
...
Former-commit-id: 3f924f74b8
[formerly 84c3c114a9
] [formerly c65cf6534415b98d0066b6b117c42063775cf382 [formerly 63f57de31f
]] [formerly 79816de308
[formerly 63f57de31f
[formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]]
Former-commit-id: 79816de308
Former-commit-id: f7807c86dc7b6a81272596cbb22664b42ab2bec4 [formerly 9ea4bab577
]
Former-commit-id: 5d21fa1fd7
2013-05-16 23:56:47 -05:00
Steve Harris
9b898a6478
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: f9535abb10
[formerly 87a31f9990
] [formerly 16ba74496d
] [formerly b76d359695
[formerly 16ba74496d
[formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615
]
Former-commit-id: b5d3ff1867
2013-05-16 13:45:58 -05:00
Bryan Kowal
4a6d46f29c
Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
...
Former-commit-id: 3abd701fa4
[formerly 17101171b6
] [formerly 1e726506e0
] [formerly 39b12ee0fb
[formerly 1e726506e0
[formerly 4d804cd0de708904368f0a26ed8421379278bddd]]]
Former-commit-id: 39b12ee0fb
Former-commit-id: a6b1893a7952d3070c7de78ed3013e85240b36c9 [formerly 37461e68dd
]
Former-commit-id: 3812567894
2013-05-16 11:00:47 -05:00
Bryan Kowal
fd6dec8c03
Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
...
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e
Former-commit-id: 443fa1a125
[formerly 2149099abb
] [formerly 7d4d2749ce57a39dd5830ef41c882fc46ec08cd7 [formerly 11c93f548e
]] [formerly 43ec909008
[formerly 11c93f548e
[formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]]
Former-commit-id: 43ec909008
Former-commit-id: 134ed31084c1662f1e828cda0c3059ae2bb2adf0 [formerly 97cff7bf9c
]
Former-commit-id: c03d61587c
2013-05-16 10:21:11 -05:00
Bryan Kowal
c7cd48449e
Issue #1872 - merge 2002; do not include .gitignore files in the rpm
...
Former-commit-id: 34c87d5256
[formerly c83d93b527
] [formerly b0122e794e
] [formerly 20fd227d99
[formerly b0122e794e
[formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]]
Former-commit-id: 20fd227d99
Former-commit-id: 125acc649473b68c049da6f9fe45530d4b3c3030 [formerly 7ec8600dc1
]
Former-commit-id: 8cba03d5a5
2013-05-16 10:19:31 -05:00
Steve Harris
7d55d0e959
13.4.1-9 baseline
...
Former-commit-id: 301821988e
[formerly 88eee9cbfa
] [formerly bcf7f15c90
] [formerly aff41713f9
[formerly bcf7f15c90
[formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd
]
Former-commit-id: 67a95d07d2
2013-05-16 11:12:07 -04:00
Bryan Kowal
cdbb3688b8
Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
...
Former-commit-id: 9dd01b7aa4
[formerly 07408178a8
] [formerly 5811585229
] [formerly 41f4075e6f
[formerly 5811585229
[formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]]
Former-commit-id: 41f4075e6f
Former-commit-id: 023dd6e87a45202d9e0ada7c2ab1ebac1e398460 [formerly aabc22cc2e
]
Former-commit-id: edaa5339d7
2013-05-15 15:37:16 -05:00
Bryan Kowal
9380276341
Issue #2002 - do not include .gitignore files in the rpm
...
Former-commit-id: f2f288c6b5
[formerly 4132370301
] [formerly 60ae5df378
] [formerly 107055781d
[formerly 60ae5df378
[formerly 33160e9835e8e153d60b76619b75e22bd3f75fc8]]]
Former-commit-id: 107055781d
Former-commit-id: bb8d7b3c8d6efce463993268a92f760caeb8a894 [formerly 7df8e11ed3
]
Former-commit-id: 43db530ddb
2013-05-15 13:31:24 -05:00
Bryan Kowal
92db4c4121
Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
...
Former-commit-id: e02ad5d555
[formerly e1794dd03f
] [formerly f9e77e90b7
] [formerly 0e3e3e891b
[formerly f9e77e90b7
[formerly 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92]]]
Former-commit-id: 0e3e3e891b
Former-commit-id: 464ade86d03b34790349312571541113105fb8b1 [formerly 0af34bbe4c
]
Former-commit-id: 1fccd55036
2013-05-15 11:55:56 -05:00
Steve Harris
fddef92bf3
13.4.1-8 baseline
...
Former-commit-id: 02dba50c00
[formerly 576a74fe0b
] [formerly 19866e7032
] [formerly c59b52a266
[formerly 19866e7032
[formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]
Former-commit-id: c59b52a266
Former-commit-id: c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39
]
Former-commit-id: 5465764527
2013-05-14 09:21:41 -04:00
Richard Peter
994357c357
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: 207c17d5af
[formerly 2c009eb618
] [formerly a12830f762
] [formerly c5040038d3
[formerly a12830f762
[formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]
Former-commit-id: c5040038d3
Former-commit-id: 4a7cd13915319fef7cf3e6405d041ffee0348571 [formerly bcf4dcc810
]
Former-commit-id: 6c09ab9bdf
2013-05-13 17:11:05 -05:00
Richard Peter
b2b66da141
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: b374309faf
[formerly 4ae23b93d9
] [formerly 8062c38b71
] [formerly ba590e2f93
[formerly 8062c38b71
[formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]
Former-commit-id: ba590e2f93
Former-commit-id: 845e355d3758a8223bad200d62847aef296e66cc [formerly 8e5929406c
]
Former-commit-id: faf22cc925
2013-05-13 16:33:50 -05:00