Steve Harris
14c9de2259
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: 98ddc22749f0e5cdb0f4f8f0084ee742486461d5
2013-04-01 12:15:04 -05:00
Steve Harris
3d8ed484be
13.3.1-15 baseline
...
Former-commit-id: 369cf4feaee63c96725cb6efc5774b8f6b8cbf08
2013-04-01 11:33:20 -05:00
Steve Harris
9fba973fd0
13.3.1-14 baseline
...
Former-commit-id: 0b52508caf520abeba4a75d38c9ed9130cc12c9e
2013-03-27 17:59:34 -05:00
Steve Harris
aaac0b51e5
13.3.1-12 baseline
...
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Ben Steffensmeier
86dffab17d
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 2c8170a332994405820a25d9052afd7bc8cbcd3f
2013-03-18 17:16:44 -05:00
Dave Hladky
5dc454c7ef
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753
2013-03-13 13:56:33 -05:00
Steve Harris
e12ed113ae
13.3.1-7 baseline
...
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
2013-03-13 09:50:28 -05:00
Dave Hladky
4b08491880
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: 71a04da8f5aa339146bb45cce71c7b295735f43f
2013-03-12 15:48:34 -05:00
Steve Harris
566b677d09
13.3.1-6 baseline
...
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
2013-03-12 08:35:45 -05:00
Steve Harris
6ec9e73035
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 52683c1ffba08b80b0d1f2b619161e108ca598b8
2013-02-25 15:58:48 -06:00
Steve Harris
2641d578e2
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c
2013-02-21 15:41:39 -06:00
Bryan Kowal
803397c7c7
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: a5d554c271b87fa6d6b264ebb677802b58ebb763
2013-02-21 13:55:28 -06:00
Steve Harris
d2a654625f
13.3.1-1 baseline
...
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
d123c044c3
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: 819f88fb8b26ec0a83164df82b31e9b824b49da8
2013-02-19 12:22:00 -06:00
Steve Harris
053156f02e
13.2.1-8 baseline
...
Former-commit-id: f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669
2013-02-18 09:09:41 -06:00
Ron Anderson
7c0a5d74bf
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc9ac54903107224633b4e18d5caa345649d8266
2013-02-15 09:03:41 -06:00
Steve Harris
de437bb4fc
Merge branch 'ss_builds' (13.2.1-7) into development
...
Former-commit-id: 62e4a9045e32eaaf1a52ff06d86f82d2693021bd
2013-02-12 15:30:10 -06:00
Steve Harris
6baff6a089
13.2.1-7 baseline
...
Former-commit-id: 85a6ac3debfd1691b5d44c547d76a7ae9e19523f
2013-02-12 15:27:30 -06:00
Steve Harris
9c23bf6e73
13.2.1-7 baseline
...
Former-commit-id: fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2
2013-02-12 14:51:26 -06:00
Steve Harris
5ee47e098d
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 30e1ae8f245a60c780fcc79f54795ece0b28088f
2013-02-06 11:12:01 -06:00
Steve Harris
6c6b53679b
Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 873c1773504d6dd9421b92f6193c32e477e4533c
2013-02-06 11:08:53 -06:00
Steve Harris
146fcc6da8
13.2.1-5 baseline
...
Former-commit-id: c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092
2013-02-06 11:02:32 -06:00
Bryan Kowal
5fea87f1dd
Issue #1577 - deploy-install and AWIPS II ant task updates
...
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring
Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f
Former-commit-id: 7659fb8044f3f4715c9ea7c875eda36b7c5dd136
2013-02-05 13:25:15 -06:00
Steve Harris
0d7f53b6f4
13.2.1-4 baseline
...
Former-commit-id: d4fd198979dbc5d77a6bf836685cb658e7ac6cfe
2013-01-31 11:40:31 -06:00
Steve Harris
c3e4551dfa
13.2.1-2 baseline
...
Former-commit-id: b8762009cb6f3bfa17984c2dcce65d5a48c6a844
2013-01-25 09:07:12 -06:00
Steve Harris
328c6dccad
13.2.1-2 baseline
...
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
c63f9bcae0
13.2.1-1 baseline
...
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
2013-01-23 11:13:03 -05:00
Steve Harris
86ea0b666e
13.1.2-10 baseline
...
Former-commit-id: 5a6d030d358519ca30fc37bf4a090a00557422a3
2013-01-18 10:37:25 -05:00
Bryan Kowal
5d769d8a8d
Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
...
Former-commit-id: 42a05fc36d0ba3036a7e056d8871f684abf986c9
2013-01-17 09:59:11 -06:00
Bryan Kowal
8c118e791b
Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
...
Former-commit-id: 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02
2013-01-15 18:46:46 -06:00
Bryan Kowal
d710e987e4
Issue #1469 - updated for compatibility with recent changes to Pypies.
...
Former-commit-id: 417ecdcc5b9907b95856571d5d03fa12099eb3f6
2013-01-15 16:09:42 -06:00
Bryan Kowal
4db9c6c321
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
...
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30
2013-01-15 14:56:01 -06:00
Richard Peter
b8e42dabc0
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: 90066bd215f4c547dfd483cec7c415c1e6fccece
2013-01-14 17:38:38 -06:00
Steve Harris
06b8eb8db0
13.1.2-8 baseline
...
Former-commit-id: c8797ef99646b2e093ad60cb9a6ee9643405a13f
2013-01-11 16:19:07 -05:00
Steve Harris
42189b5f88
13.1.2-7 baseline
...
Former-commit-id: 0c4514d3be8e7dee89a2abe903b51155a2895fd4
2013-01-11 16:12:09 -05:00
Ben Steffensmeier
a836aee481
Issue #1362 add null chack in nsharp mouse handler.
...
Former-commit-id: 4ae38765c9a6815050d30b307b4a364b617c49aa
2013-01-08 18:17:24 -06:00
Steve Harris
59969775ad
13.1.2-6 baseline
...
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
2013-01-06 14:55:11 -06:00
Steve Harris
4ba416aeb3
13.1.2-2 baseline
...
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Max Schenkelberg
7e3273db95
Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor.
...
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde
Former-commit-id: 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592
2012-12-20 17:14:34 -06:00
Steve Harris
f6988eefff
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: e733dd9d05d3704f86e2a711607a1834df1a56f2
2012-12-11 08:45:53 -06:00
Steve Harris
5093a7c442
12.12.1-8 baseline
...
Former-commit-id: 657c868c5e52717a6de00dc61892115d91ada1c4
2012-12-06 09:02:51 -06:00
Max Schenkelberg
ed77d56a84
Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
...
Amend: Added back in TimeMatchBasisCapability. Someday will need to figure out bundle migration since this unused class can never die
Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6
Former-commit-id: fa693a9bb802af2491c70c14aa7ab33485fb4915
2012-11-29 10:29:36 -06:00
Nate Jensen
31637efbbc
Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
...
Former-commit-id: 219d5cd37e412c47cf12eebb6849c5c233163f16
2012-11-14 16:09:00 -06:00
Dustin Johnson
0d1d663f41
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: 2f676ffcab1c9efa612a52283d05e56f9c748569
2012-11-14 14:41:57 -06:00
Steve Harris
57578da521
12.12.1-4 baseline
...
Former-commit-id: 4a7e3fabdef8d948216483965c1f62e5216bf362
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
2d864c3b09
Issue #189 changes to mappings and ncep merge from code review
...
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4
2012-11-14 12:22:53 -06:00
Ben Steffensmeier
fbed67a208
Issue #189 merge ncep changes to unified grid.
...
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: 99cf68672dcfbf23c89531279cb4fcd1254b0703
2012-11-08 14:34:55 -06:00
Dustin Johnson
1dbeb22893
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
...
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: c04f7dca6f980ab7f3d77825312ddc34ba3b188d
2012-11-08 09:57:16 -06:00
Steve Harris
e1498006c7
12.12.1-1 baseline
...
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Dustin Johnson
31d7d09c10
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: 89583d97c8823818f87dc1a234078d85ba7bea4a
2012-11-01 13:36:06 -05:00
