Brian.Dyke
9351315fd6
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: a0a879be7d
[formerly a8737e18f0
] [formerly a0a879be7d
[formerly a8737e18f0
] [formerly 3f1e12effc
[formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd
[formerly 66aacd6578
]
Former-commit-id: a23d371522
2014-05-30 10:46:25 -04:00
Richard Peter
94e0faa6c6
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
...
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.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.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 25df870b67
[formerly fa7d77ae97
] [formerly 25df870b67
[formerly fa7d77ae97
] [formerly 93c776022a
[formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656
[formerly 520dd57f02
]
Former-commit-id: 910464ea6a
2013-11-07 14:25:45 -06:00
Richard Peter
463f09984a
Issue #2499 : Fix build
...
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c
Former-commit-id: 15fd2f7a55
[formerly f3d8768b94
] [formerly 15fd2f7a55
[formerly f3d8768b94
] [formerly c09f68615c
[formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]
Former-commit-id: c09f68615c
Former-commit-id: 1b65a09a52
[formerly a653f9625a
]
Former-commit-id: 3c129fb138
2013-11-06 13:09:32 -06:00
Greg Armendariz
b601345c9f
13.5.1-6 baseline
...
Former-commit-id: 5894853996
[formerly 7e09fa5a0b
] [formerly 5894853996
[formerly 7e09fa5a0b
] [formerly b9044b1195
[formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 93b71934c0
[formerly 12a09f9aa7
]
Former-commit-id: ec2637676d
2013-07-10 10:04:22 -04:00
Richard Peter
cca3d4c19b
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: edeb3e255b
[formerly 162261c395
] [formerly edeb3e255b
[formerly 162261c395
] [formerly 76bc31aa77
[formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: f8213c16bd
[formerly d3017ca60f
]
Former-commit-id: 3d6754337a
2013-07-01 00:04:43 -05:00
Brad Gonzales
245de9c408
Issue #1965 added edex archive to the build.edex build.xml.
...
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b
Former-commit-id: 2d1c6a0ec5
[formerly ba661b9e39
] [formerly 2d1c6a0ec5
[formerly ba661b9e39
] [formerly add108398a
[formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]
Former-commit-id: add108398a
Former-commit-id: bc766efb7a
[formerly 5c9ce05ce3
]
Former-commit-id: c4daf04c32
2013-06-28 13:25:46 -05:00
Dustin Johnson
edcf1392be
Issue #2090 Create Data Provider Agent feature
...
Amend: Remove dataplugins feature from dataprovideragent
Change-Id: I7ff421d478ad060c67eaffd4a1b2b40209ed2901
Former-commit-id: fd61a1e056
[formerly e33cd9d00d
] [formerly fd61a1e056
[formerly e33cd9d00d
] [formerly 45600f3d55
[formerly 2147018ade8a96b4a89c6117e345d569b4d1af76]]]
Former-commit-id: 45600f3d55
Former-commit-id: e617f569ff
[formerly dfdfbe642b
]
Former-commit-id: 3a2f752a22
2013-06-12 15:41:32 -05:00
Steve Harris
859965fc9d
13.5.1-1 baseline
...
Former-commit-id: 6384018950
[formerly 998961612c
] [formerly 6384018950
[formerly 998961612c
] [formerly fe872355a7
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a
[formerly 30ba1d634e
]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00
Bryan Kowal
fe4d54960e
Issue #1967 - update ant build scripts for Eclipse 3.8 compatibility
...
Former-commit-id: 776757e8ba
[formerly 115a102f22
] [formerly 776757e8ba
[formerly 115a102f22
] [formerly eec15f77ae
[formerly b9b1cb41e5e55b3cd2534cd899d0b3fe4af01a96]]]
Former-commit-id: eec15f77ae
Former-commit-id: f9f79ccf65
[formerly 88c3cf3b48
]
Former-commit-id: c266fb1ef5
2013-05-07 17:54:30 -05:00
Steve Harris
a112803c98
13.3.1-17 baseline
...
Former-commit-id: f28b85d42f
[formerly 7bf9966dcb
] [formerly f28b85d42f
[formerly 7bf9966dcb
] [formerly a3fe998f8f
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7
[formerly 4afa41d4e7
]
Former-commit-id: 50becef97f
2013-04-01 12:04:56 -05:00
Dustin Johnson
9d04ba83a5
Issue #1839 Change build.edex build.xml to support building work assignment features after main build
...
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9
Former-commit-id: ce37e32e61
[formerly 3be6669f1b
] [formerly ce37e32e61
[formerly 3be6669f1b
] [formerly 1365d5c9af
[formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]]
Former-commit-id: 1365d5c9af
Former-commit-id: 1960bcbf11
[formerly 83f6fb720c
]
Former-commit-id: f817dbe495
2013-03-28 11:43:24 -05:00
Steve Harris
53ee0151ca
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 069ee8a748
[formerly 9a321b6ac8
] [formerly 069ee8a748
[formerly 9a321b6ac8
] [formerly 3073951b3d
[formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]
Former-commit-id: 3073951b3d
Former-commit-id: 6e48567370
[formerly a4bf236cc7
]
Former-commit-id: 90ec2d3fbf
2013-03-27 22:16:15 -05:00
Dustin Johnson
198fb2b6ae
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: fbcfdd0ca1
[formerly 52c27ec57f
] [formerly fbcfdd0ca1
[formerly 52c27ec57f
] [formerly 1684507bdb
[formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]
Former-commit-id: 1684507bdb
Former-commit-id: 2591041c9d
[formerly f27ebfbc1b
]
Former-commit-id: c5685dbe9f
2013-03-27 15:38:36 -05:00
Bryan Kowal
81ebbd5a5b
Issue #1741 - what was once two is now one
...
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: a93dcff1b5
[formerly b954bc17bf
] [formerly a93dcff1b5
[formerly b954bc17bf
] [formerly 7fd035256d
[formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]
Former-commit-id: 7fd035256d
Former-commit-id: 3e8d5449fc
[formerly 66e2ed79ec
]
Former-commit-id: 56f2b3f0c2
2013-03-18 16:36:33 -05:00
Max Schenkelberg
3dcfc90510
Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
...
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62
Former-commit-id: 1769edc026
[formerly ec40d261e5
] [formerly 1769edc026
[formerly ec40d261e5
] [formerly 547c593dec
[formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]
Former-commit-id: 547c593dec
Former-commit-id: fc58e7431a
[formerly 13a4056335
]
Former-commit-id: 0c8f3d2449
2013-02-27 16:19:58 -06:00
Steve Harris
2779f5c6d9
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd816
[formerly 83e9157df7
] [formerly 33bc5fd816
[formerly 83e9157df7
] [formerly 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21
[formerly 47cc08ac79
]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Steve Harris
f52ec0b0a0
13.1.2-2 baseline
...
Former-commit-id: 51208e5515
[formerly c0c1d56f3a
] [formerly 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c
[formerly 941337c553
]
Former-commit-id: b6fa9b4858
2013-01-06 14:32:24 -06:00
Steve Harris
35e34308c5
12.11.1-4 baseline
...
Former-commit-id: 98171b5de9
[formerly d3497e47eb
] [formerly 98171b5de9
[formerly d3497e47eb
] [formerly 6958b861f0
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07
[formerly cbbdb231ce
]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5
[formerly 72824561cb
]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00