Steve Harris
47cde9bd09
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 4c4c79036c36261cb095753a5213ab0cd7e56e65753a5213ab0cd7e56e65d5bcdb0015bca46a1354
2013-03-12 16:04:23 -05:00
Dave Hladky
eefd544e4b
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: e17f8e05115c65862b8fa1006667e04b08491880a1006667e04b084918806ea95002de155903d135
2013-03-12 15:48:34 -05:00
Steve Harris
0cec06c171
13.3.1-6 baseline
...
Former-commit-id: 4eef6862d62e110bd1513a4c7931e1566b677d093a4c7931e1566b677d094ed21b702b6fe4b16924
2013-03-12 08:35:45 -05:00
Steve Harris
1709c34b8f
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: afd934db356b13492420d5b80f9225aa0e9acefdd5b80f9225aa0e9acefdb9563da8a84a0b8772ec
2013-03-05 12:29:44 -06:00
Steve Harris
7ff64bf8cc
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 3ec20c168961a19a460b305dd7296957f42761d7305dd7296957f42761d7a8e1557c62b423579e4a
2013-03-05 12:27:49 -06:00
Steve Harris
aabd5cd51f
13.3.1-5 baseline
...
Former-commit-id: e4a1c61ad58123d5ac45a89221c75be26f7eb151a89221c75be26f7eb151a40c9136fea240379588
2013-03-05 10:47:06 -06:00
Bryan Kowal
553f988935
Issue #1750 - edexBridge will now set the QPID persistence flag
...
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98
Former-commit-id: b407a34461d484acbca03a8efd5edf8b4dce1c3d3a8efd5edf8b4dce1c3deba8ccc6cd0d9400b2ec
2013-03-04 17:58:04 -06:00
Bryan Kowal
0a93a4a25c
Issue #1739 - fix Wes2Bridge
...
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814
Former-commit-id: 18a778cb8c9022c53d5320d3c6bcaa86a1f16e3720d3c6bcaa86a1f16e37ed6e1003ff5958c0a876
2013-03-01 11:49:09 -06:00
Steve Harris
bca88ba9c7
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: f1f5359a2fc2327ce33dea50a5db77d123c044c3ea50a5db77d123c044c31c08acab3881f1fb83a0
2013-02-19 12:22:00 -06:00
Steve Harris
db02d32440
13.2.1-8 baseline
...
Former-commit-id: d176ec1f3818da2e93d7f81b382c04053156f02ef81b382c04053156f02ec6d584758f8cffb55371
2013-02-18 09:09:41 -06:00
Brad Gonzales
3e4338339b
Issue #1517 Added SPC Prob menu changes.
...
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 7cef72a46035cc853c74f459554e335bc6dd5498f459554e335bc6dd5498f3ef3092938fc5c18ebd
2013-02-04 08:52:33 -06:00
Steve Harris
41b14f0fa2
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: f207d282bcc218786986658bea377bec56acde81658bea377bec56acde816383bf8ed273d9455c65
2013-01-31 10:19:14 -06:00
Steve Harris
c9bc690eca
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e6093b159ee655d297f70505ed0a7260402725730505ed0a726040272573513d49939f75f6e61e6f
2013-01-29 15:57:21 -06:00
Steve Harris
03989493ae
13.2.1-3 baseline
...
Former-commit-id: b84acc06da283147571ff45120a1f47a739c6a5bf45120a1f47a739c6a5b3edfa1e0bedaca1c3e73
2013-01-29 15:52:43 -06:00
Bryan Kowal
a8d1496454
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: 792230a38ea960b342307116bb86effa511e980b7116bb86effa511e980baefeada9d6f4e7bead66
2013-01-29 09:51:54 -06:00
Steve Harris
0f4fcd0ba8
13.2.1-2 baseline
...
Former-commit-id: 74bfe9595c0006a2b6cb7a7f7c45cac3e4551dfa7a7f7c45cac3e4551dfa1153d80c5b251a9c0195
2013-01-25 09:07:12 -06:00
Steve Harris
d069467e81
13.2.1-3 baseline
...
Former-commit-id: 7d2e979c51a5a0da5c027435527b252b6ac028bd7435527b252b6ac028bdcc0fdef15c9d248cff7a
2013-01-23 11:24:17 -05:00
Steve Harris
ce726fadc7
13.2.1-2 baseline
...
Former-commit-id: a4fa438a4133bc5fd81683e9157df7328c6dccad83e9157df7328c6dccad47cc08ac79d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
1d1791b3b4
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb48d1aa77329771dfae6bc63f9bcae09771dfae6bc63f9bcae0f6670806bf8ed6a53113
2013-01-23 11:13:03 -05:00
Bryan Kowal
a9c31457b8
Issue #1490 - updated edex-environment
...
- actually include the modified files in the commit this time
- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot
Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d
Former-commit-id: 3a0114558b792c03d5f4b4964c0a199e33969536b4964c0a199e33969536b47d484e70bc757e5bc1
2013-01-18 12:44:37 -06:00
Roger Ferrel
96deac5f43
Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
...
Changes based on code review and added listener to GridManager and unit test.
Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650
Former-commit-id: 863bdb4d52972db123241cd076671c1e492b81ff1cd076671c1e492b81fff10521f86186d51634dc
2013-01-16 16:53:29 -06:00
Richard Peter
d880361e06
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 6e42fa32d3a966546e313fb7d96ec11dbb34523b3fb7d96ec11dbb34523b345dfd2ca979ef100838
2013-01-14 18:07:17 -06:00
Steve Harris
3d35fd52d5
13.2.1-1 baseline
...
Former-commit-id: 8dd688c8785dfe4d10f1e62172c8c781849e3cbbe62172c8c781849e3cbb8713dfc5cae34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
177a54d19a
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29d0a6ba23e5029ebaa63a328be6ac2b029ebaa63a328be6ac2b6a5a0d7d0980bf1d7a28
2013-01-09 17:55:05 -06:00
Steve Harris
fe763963e9
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49befd3392abe8e5f9e0e6c59969775ad8e5f9e0e6c59969775addbcae57f5782a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f03151208e5515c0c1d56f3a4ba416aeb3c0c1d56f3a4ba416aeb3941337c553cd4185ef5c
2013-01-06 14:32:24 -06:00
Roger Ferrel
50d3a97bcc
Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
...
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc
Former-commit-id: ecec7603df8c4e70fa9a0c5d10e66a43fd607a300c5d10e66a43fd607a306d4946290f07fbeb2928
2012-12-18 09:00:46 -06:00
Bryan Kowal
10960c5d62
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds
Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396
Former-commit-id: 8d50e956437fb4e993e6660a9b615ff39489c44c660a9b615ff39489c44cc44c4bd0618579adf932
2012-12-16 21:40:26 -06:00
Richard Peter
785b6c7bfe
Revert "Issue #1262:"
...
This reverts commit 333e7ab7d4bad53d1b7f949065210309702591142f31d21ac3c3da463f39a210f08acc0970259114a210f08acc80a95c53ba9d03a53fb59a7cfa2383f37f9484569a7cfa2383f37f94845648641ca26f2100b136a9
2012-12-16 20:37:21 -06:00
Bryan Kowal
333e7ab7d4
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
Former-commit-id: 2f31d21ac3c3da463f39a210f08acc0970259114a210f08acc09702591149490652103bad53d1b7f
2012-12-13 12:40:31 -06:00
Roger Ferrel
5cd4fc444b
Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
...
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4
Former-commit-id: 4dfc1531726929a73900b677a5ba3daefa650cdab677a5ba3daefa650cdaf64a99d554662d51cda1
2012-12-11 15:43:54 -06:00
Steve Harris
377804398b
Merge branch 'ss_builds' (12.12.1-12) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: d27c5237c34d4771ee3a43ddfe98c4f6988eefff43ddfe98c4f6988eefff6287b32e7df02c1ef71d
2012-12-11 08:45:53 -06:00
Steve Harris
79b0e973ef
12.12.1-12 baseline
...
Former-commit-id: 8b74846a1b89def5cf03e8e41630e86d610f8e8ae8e41630e86d610f8e8a7bb37caa2369ab975fab
2012-12-06 09:18:28 -06:00
Steve Harris
a45a7fe1bf
12.12.1-8 baseline
...
Former-commit-id: 8790caf84e2d338b4cec19962f41ba5093a7c44219962f41ba5093a7c442ee06a94735ff4131c2ee
2012-12-06 09:02:51 -06:00
Bryan Kowal
ddfb4e506c
Issue #1318 - updated ncep database rpm specification file
...
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832
Former-commit-id: b1b627e2c2cbef9ad78db60dda550cfe9dcaa216b60dda550cfe9dcaa21667c3c140e3fe9a06b9b9
2012-11-15 10:24:38 -06:00
Bryan Kowal
43764917d6
Issue #1318 - updated ncep database rpm specification file
...
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9
Former-commit-id: fec5563e4912667f618099399e880e24074da38399399e880e24074da3833d123e08a71842deff13
2012-11-15 09:26:46 -06:00
Dustin Johnson
08fd67e94a
Merge branch 'ss_builds' (12.12.1-4) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: 069c8d4788d27bce13c2bff32bbe580d1d663f41bff32bbe580d1d663f41e25b7c312b5d5dbe27e1
2012-11-14 14:41:57 -06:00
Steve Harris
4300583fc2
12.12.1-4 baseline
...
Former-commit-id: b968ab5135b91b7f0fae85130eb61157578da52185130eb61157578da521628ca9e5c6e35a321a8c
2012-11-14 14:19:20 -06:00
Steve Harris
98670f1cc2
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 1ee89387488fc896f7d4448dd1c35f00f3d51546448dd1c35f00f3d51546c8cac5291521ecd53719
2012-11-13 17:28:50 -06:00
Steve Harris
5365b72401
12.12.1-2 baseline
...
Former-commit-id: 7192b19284ed809a02dba8560580f86868eb9b23a8560580f86868eb9b23df89fe9bed111e7607cf
2012-11-13 17:14:24 -06:00
Steve Harris
3cb24c1d06
12.12.1-1 baseline
...
Former-commit-id: 8278cac143c2839cc86de4bd20a515e1498006c7e4bd20a515e1498006c7214fcd3b634f243de928
2012-11-07 12:41:20 -06:00
Dustin Johnson
fe8a2a3b09
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 7d0e4a6e758e69107b5a98d7beae5031d7d09c1098d7beae5031d7d09c10bcf575966be7a0f96a9a
2012-11-01 13:36:06 -05:00
Steve Harris
40de07be3a
Merge branch 'ss_builds' (12.11.1-7) into development
...
Former-commit-id: 3a9c6123d2d42e8373c6b7406a55cc38b9c03f5eb7406a55cc38b9c03f5e9d038186d1ae9c6d58dd
2012-10-23 16:43:09 -05:00
Steve Harris
320a29466d
12.11.1-7 baseline
...
Former-commit-id: 59e5b55b9640a5bc1683d8ca6b900579a5638de9d8ca6b900579a5638de9cfd228f0d7efba080b9c
2012-10-23 16:40:50 -05:00
Richard Peter
afe520cfaa
Merge "Issue #1265 remove pypies gzip handling" into development
...
Former-commit-id: d0f2925f45935ddb32243723250e50cd9306a5373723250e50cd9306a537c7894c5cdaaa26b2a623
2012-10-17 14:07:28 -05:00
Nate Jensen
5262954e46
Issue #1265 remove pypies gzip handling
...
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5
Former-commit-id: 4fc0bee3637874be59e7fa3e87549a2dac2f5ddefa3e87549a2dac2f5dde740146d8389dac98930f
2012-10-17 11:32:49 -05:00
Steve Harris
002e4e0e8b
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 37ab3d9e654ffbffe349a63b40b17a5e5c98b193a63b40b17a5e5c98b193be16909d2da3a79a1a82
2012-10-16 21:44:49 -05:00
Steve Harris
d88afce365
Merge branch 'ss_builds' (12.11.1-4) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
cave/com.raytheon.viz.gfe/help/localMapsConfig.html
cave/com.raytheon.viz.gfe/help/mapConfig.html
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
rpms/common/yum/arch.x86/comps.xml
Former-commit-id: c19835d4beda7a11fe974610ecc513751563e3314610ecc513751563e3310c0c1144c6d0e91329b4
2012-10-16 15:48:14 -05:00
Steve Harris
c9b563338a
12.11.1-4 baseline
...
Former-commit-id: 6e44abdba198171b5de9d3497e47eb6958b861f0d3497e47eb6958b861f0cbbdb231ce2c82d9cb07
2012-10-16 13:27:07 -05:00
Greg Armendariz
6e831af9c3
Merge changes Ibe8b9a97,If48f637e into development
...
* changes:
Issue #1252 - Checked in wrong file. Deleting it. Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
Issue #1252 - Updated with changes from Dale Morris
Former-commit-id: 24cfef13972d18d5791ad1772b3705b8de817d68d1772b3705b8de817d682c058c6b8a1c5bebe6a9
2012-10-16 12:59:00 -05:00
