Dustin Johnson
ecb0d2c826
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 0e4c9f6ef22bf59f18ce3aab6539c52192539106
2013-03-15 11:51:58 -05:00
Dustin Johnson
9cd29d7625
Issue #1784 Update ColorMapParameters import for ncep plugins
...
Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8
Former-commit-id: 884757847d855af099219c8ef2715a6319913646
2013-03-13 08:45:54 -05:00
Steve Harris
753a5213ab
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: 7b68942012eaf060f364f1e474b2b93379e1b3d6
2013-03-12 16:04:23 -05:00
Dave Hladky
a1006667e0
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
3a4c7931e1
13.3.1-6 baseline
...
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
2013-03-12 08:35:45 -05:00
Ben Steffensmeier
f46686a6e2
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 7c24d10acae9dee7ec03edd471983e0b80d58092
2013-02-28 17:00:56 -06:00
Max Schenkelberg
0f1112fb3e
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: bd68a2e47f8c54d6e06e19ce3e29259c07926b8a
2013-02-27 12:26:32 -06:00
Max Schenkelberg
4ed4ef8d71
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b
2013-02-27 11:50:38 -06:00
Steve Harris
67f090638f
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 52683c1ffba08b80b0d1f2b619161e108ca598b8
2013-02-25 15:58:48 -06:00
Steve Harris
a0573644c4
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
a8fb04f41c
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
71e8990021
13.3.1-1 baseline
...
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
ea50a5db77
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
f81b382c04
13.2.1-8 baseline
...
Former-commit-id: f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669
2013-02-18 09:09:41 -06:00
Ron Anderson
a2a89fb4e7
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
cc2757790c
Merge branch 'ss_builds' (13.2.1-7) into development
...
Former-commit-id: 62e4a9045e32eaaf1a52ff06d86f82d2693021bd
2013-02-12 15:30:10 -06:00
Steve Harris
2fb5a31b98
13.2.1-7 baseline
...
Former-commit-id: 85a6ac3debfd1691b5d44c547d76a7ae9e19523f
2013-02-12 15:27:30 -06:00
Steve Harris
6fad5da5ed
13.2.1-7 baseline
...
Former-commit-id: fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2
2013-02-12 14:51:26 -06:00
Steve Harris
4bc8e9ab5c
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 30e1ae8f245a60c780fcc79f54795ece0b28088f
2013-02-06 11:12:01 -06:00
Steve Harris
a16ac7819c
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
232734091d
13.2.1-5 baseline
...
Former-commit-id: c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092
2013-02-06 11:02:32 -06:00
Bryan Kowal
7815b651bb
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
8f2e7d4437
13.2.1-4 baseline
...
Former-commit-id: d4fd198979dbc5d77a6bf836685cb658e7ac6cfe
2013-01-31 11:40:31 -06:00
Steve Harris
7a7f7c45ca
13.2.1-2 baseline
...
Former-commit-id: b8762009cb6f3bfa17984c2dcce65d5a48c6a844
2013-01-25 09:07:12 -06:00
Steve Harris
83e9157df7
13.2.1-2 baseline
...
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Steve Harris
9771dfae6b
13.2.1-1 baseline
...
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
2013-01-23 11:13:03 -05:00
Steve Harris
68dde17de2
13.1.2-10 baseline
...
Former-commit-id: 5a6d030d358519ca30fc37bf4a090a00557422a3
2013-01-18 10:37:25 -05:00
Bryan Kowal
a2f745ec54
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
2ed28bed93
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
02c16b6f3d
Issue #1469 - updated for compatibility with recent changes to Pypies.
...
Former-commit-id: 417ecdcc5b9907b95856571d5d03fa12099eb3f6
2013-01-15 16:09:42 -06:00
Bryan Kowal
e2a12845d3
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
1318f53902
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
e6217a17de
13.1.2-8 baseline
...
Former-commit-id: c8797ef99646b2e093ad60cb9a6ee9643405a13f
2013-01-11 16:19:07 -05:00
Steve Harris
4f86b07eb0
13.1.2-7 baseline
...
Former-commit-id: 0c4514d3be8e7dee89a2abe903b51155a2895fd4
2013-01-11 16:12:09 -05:00
Ben Steffensmeier
1186724fa8
Issue #1362 add null chack in nsharp mouse handler.
...
Former-commit-id: 4ae38765c9a6815050d30b307b4a364b617c49aa
2013-01-08 18:17:24 -06:00
Steve Harris
8e5f9e0e6c
13.1.2-6 baseline
...
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
2013-01-06 14:55:11 -06:00
Steve Harris
c0c1d56f3a
13.1.2-2 baseline
...
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
Max Schenkelberg
fabb9bbcff
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
43ddfe98c4
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
19962f41ba
12.12.1-8 baseline
...
Former-commit-id: 657c868c5e52717a6de00dc61892115d91ada1c4
2012-12-06 09:02:51 -06:00
Max Schenkelberg
b648c5828e
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
49c2079963
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
bff32bbe58
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
85130eb611
12.12.1-4 baseline
...
Former-commit-id: 4a7e3fabdef8d948216483965c1f62e5216bf362
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
2c8f3f09ac
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
e6b0751f5c
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
064ef82d1e
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
e4bd20a515
12.12.1-1 baseline
...
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Dustin Johnson
98d7beae50
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
Richard Peter
275398778f
Issue #1257 : Update PurgeRules to not be hard linked to path keys
...
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4
Former-commit-id: 73bca27407552c864765d5924e8609a253493f4c
2012-10-31 18:19:44 -05:00
