Steve Harris
ac6704c7e9
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
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/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 736bb45741140765a43e736bb45741140765a43e437a04011a437a04011a7b27767d7e0b48e96314d0e61c59e8
2013-04-01 12:19:04 -05:00
Steve Harris
e74f4ae39e
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: 3b722f107674a47b9bd93b722f107674a47b9bd914c9de225914c9de2259f85a1ab9aba6dd28cc820fee31b1a8
2013-04-01 12:15:04 -05:00
Steve Harris
cc1ef45545
13.3.1-15 baseline
...
Former-commit-id: 4cf3ad6abbeb1dab38644cf3ad6abbeb1dab38643d8ed484be3d8ed484be2bf790aae3d3cec5d3cb4204273f21
2013-04-01 11:33:20 -05:00
Steve Harris
f59f1f02b0
13.3.1-14 baseline
...
Former-commit-id: 91a5e4578e9022c500ce91a5e4578e9022c500ce9fba973fd09fba973fd0936e4adda22ca160caf08237fdadaa
2013-03-27 17:59:34 -05:00
Steve Harris
120fc26670
13.3.1-12 baseline
...
Former-commit-id: be962822070be473728abe962822070be473728aaaac0b51e5aaac0b51e5f80f98cee2bc439aee4ff1d156779a
2013-03-25 13:27:13 -05:00
Max Schenkelberg
a25ccc8c5c
Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
...
Change-Id: I177804512c34603bae0027edfa420de47d23138e
Former-commit-id: 43341e7ad3c6db3ce43b43341e7ad3c6db3ce43b26cfcd2af526cfcd2af5ec27a168582e10fd83f6924e27f51f
2013-03-20 14:10:52 -05:00
Steve Harris
352c267fc9
Merge branch 'omaha_13.3.1' into development
...
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 310474ae9b36df63be5c310474ae9b36df63be5ccb5ea76f98cb5ea76f98d00dc0d174104e6e79e86d4512fa3a
2013-03-20 13:45:11 -05:00
Ben Steffensmeier
f2466d6066
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 7b7b708eee6c741a9ab37b7b708eee6c741a9ab386dffab17d86dffab17d160b6a7040dfe8de96f2e176478c7a
2013-03-18 17:16:44 -05:00
Steve Harris
481cee4c74
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: 28ef804e1bb8f0635ad628ef804e1bb8f0635ad67fcf9f1cb27fcf9f1cb22a26783ba7900b9aadde22bb7ecd33
2013-03-18 16:52:00 -05:00
Dustin Johnson
83034c3f43
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: fff7e7983fecb0d2c826fff7e7983fecb0d2c82643a9f608ef43a9f608ef7adf94e9f61b82ad0dc4a08059dd34
2013-03-15 11:51:58 -05:00
Dave Hladky
b85e19282b
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 765be278bb38b952a220765be278bb38b952a2205dc454c7ef5dc454c7ef9e97fc9efe160e1594b8cb5ee4a7b8
2013-03-13 13:56:33 -05:00
Steve Harris
88b28c39c1
13.3.1-7 baseline
...
Former-commit-id: 97d2f521e4a72254cc7597d2f521e4a72254cc75e12ed113aee12ed113aeed5f1dbab631c0a97dca3084a860cd
2013-03-13 09:50:28 -05:00
Dustin Johnson
d3b84af419
Issue #1784 Update ColorMapParameters import for ncep plugins
...
Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8
Former-commit-id: a5e0b421b59cd29d7625a5e0b421b59cd29d76250932affd160932affd169f81b57ec064d8fc0ea3a63b1b96d6
2013-03-13 08:45:54 -05:00
Steve Harris
346b22b196
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: 36261cb095753a5213ab36261cb095753a5213ab0cd7e56e650cd7e56e65bca46a1354d5bcdb00155232592cfa
2013-03-12 16:04:23 -05:00
Dave Hladky
cdfbcc7136
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: 5c65862b8fa1006667e05c65862b8fa1006667e04b084918804b08491880155903d1356ea95002de29ed641a13
2013-03-12 15:48:34 -05:00
Steve Harris
c28f3aeb02
13.3.1-6 baseline
...
Former-commit-id: 2e110bd1513a4c7931e12e110bd1513a4c7931e1566b677d09566b677d096fe4b169244ed21b702bc6f379f59a
2013-03-12 08:35:45 -05:00
Ben Steffensmeier
866c873f71
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: d27d30c2dbf46686a6e2d27d30c2dbf46686a6e22ca86633d62ca86633d6334af0001b5068b18c6a0778375180
2013-02-28 17:00:56 -06:00
Max Schenkelberg
727602f011
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: c8a5f1a0070f1112fb3ec8a5f1a0070f1112fb3e38bba3705f38bba3705f41706c42f26ebc058df422a18ffe01
2013-02-27 12:26:32 -06:00
Max Schenkelberg
1073393fbb
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: 2611980ca44ed4ef8d712611980ca44ed4ef8d71e0ba97d547e0ba97d5475617dfaa676b1426dd34453ac44050
2013-02-27 11:50:38 -06:00
Steve Harris
9db68d0585
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 0a4564eb9767f090638f0a4564eb9767f090638f6ec9e730356ec9e73035e46625f8f20051276ad1140ae3191c
2013-02-25 15:58:48 -06:00
Steve Harris
b5d9e75b95
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: 64744fdb19a0573644c464744fdb19a0573644c42641d578e22641d578e24f155a183a33dd2589f1f3c3191a1c
2013-02-21 15:41:39 -06:00
Bryan Kowal
b88a24574b
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: 519ce2c0fba8fb04f41c519ce2c0fba8fb04f41c803397c7c7803397c7c7b2a0a7c148450e8e7a4c2a21f2624b
2013-02-21 13:55:28 -06:00
Steve Harris
8c828dbd75
13.3.1-1 baseline
...
Former-commit-id: 8ae397085e71e89900218ae397085e71e8990021d2a654625fd2a654625fe4435815c946d28be4a4b3b56830b0
2013-02-20 16:19:40 -06:00
Steve Harris
77a66598fe
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: c2327ce33dea50a5db77c2327ce33dea50a5db77d123c044c3d123c044c381f1fb83a01c08acab385a33182da5
2013-02-19 12:22:00 -06:00
Steve Harris
32ad300b47
13.2.1-8 baseline
...
Former-commit-id: 18da2e93d7f81b382c0418da2e93d7f81b382c04053156f02e053156f02e8cffb55371c6d584758fedac913af7
2013-02-18 09:09:41 -06:00
Ron Anderson
80df624bb3
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc7c9edb87a2a89fb4e7dc7c9edb87a2a89fb4e77c0a5d74bf7c0a5d74bfd69d628450e952a4f17945627edcc7
2013-02-15 09:03:41 -06:00
Steve Harris
cbb8dc6c73
Merge branch 'ss_builds' (13.2.1-7) into development
...
Former-commit-id: 760be15f59cc2757790c760be15f59cc2757790cde437bb4fcde437bb4fc7c5e57d6623690662bf7137e6e9d0e
2013-02-12 15:30:10 -06:00
Steve Harris
7b5e08d607
13.2.1-7 baseline
...
Former-commit-id: 3f271af1952fb5a31b983f271af1952fb5a31b986baff6a0896baff6a0892d04721c4bbac9b967aa7a97ba36cb
2013-02-12 15:27:30 -06:00
Steve Harris
2255fa6a05
13.2.1-7 baseline
...
Former-commit-id: 0b7287b1306fad5da5ed0b7287b1306fad5da5ed9c23bf6e739c23bf6e736780b60df56bfbfc8a5e94dd16659a
2013-02-12 14:51:26 -06:00
Steve Harris
a11c8dff6d
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: da43a7a8ca4bc8e9ab5cda43a7a8ca4bc8e9ab5c5ee47e098d5ee47e098db119d66cda3ad515e28fd73efe8e86
2013-02-06 11:12:01 -06:00
Steve Harris
f997ecea38
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: 14f23d4227a16ac7819c14f23d4227a16ac7819c6c6b53679b6c6b53679b48a0ffda4d28ddc9bad8f028c16f79
2013-02-06 11:08:53 -06:00
Steve Harris
f36867a520
13.2.1-5 baseline
...
Former-commit-id: a6b3cde1ff232734091da6b3cde1ff232734091d146fcc6da8146fcc6da87497a15e221c602ec3a7bb0759d5ad
2013-02-06 11:02:32 -06:00
Bryan Kowal
2afa604676
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: 81da18f8517815b651bb81da18f8517815b651bb5fea87f1dd5fea87f1ddefe288c82c99994d31512fafc6a34b
2013-02-05 13:25:15 -06:00
Steve Harris
5ae95b956b
13.2.1-4 baseline
...
Former-commit-id: ae2859d5a28f2e7d4437ae2859d5a28f2e7d44370d7f53b6f40d7f53b6f43f25b862c82998f750f40a4ef8c084
2013-01-31 11:40:31 -06:00
Steve Harris
eafa141b90
13.2.1-2 baseline
...
Former-commit-id: 0006a2b6cb7a7f7c45ca0006a2b6cb7a7f7c45cac3e4551dfac3e4551dfa251a9c01951153d80c5b27706b8dcb
2013-01-25 09:07:12 -06:00
Steve Harris
2779f5c6d9
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd81683e9157df733bc5fd81683e9157df7328c6dccad328c6dccadd9be4dce2147cc08ac79547c1dedd1
2013-01-23 11:18:44 -05:00
Steve Harris
08bf724a6c
13.2.1-1 baseline
...
Former-commit-id: 48d1aa77329771dfae6b48d1aa77329771dfae6bc63f9bcae0c63f9bcae08ed6a53113f6670806bf9146e727f9
2013-01-23 11:13:03 -05:00
Steve Harris
18b7633b70
13.1.2-10 baseline
...
Former-commit-id: 683193255d68dde17de2683193255d68dde17de286ea0b666e86ea0b666e39f9dc931ad148beb4ca5c488932d9
2013-01-18 10:37:25 -05:00
Bryan Kowal
dc85c1692b
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: 86bd4e3b3fa2f745ec5486bd4e3b3fa2f745ec545d769d8a8d5d769d8a8dd9832e846b2bb5377a4d0c5323fadb
2013-01-17 09:59:11 -06:00
Bryan Kowal
6dbe3e938f
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: 55550007cb2ed28bed9355550007cb2ed28bed938c118e791b8c118e791b1eb4e6d41e0a39b4ddf1e9e16abea2
2013-01-15 18:46:46 -06:00
Bryan Kowal
cd4624e79e
Issue #1469 - updated for compatibility with recent changes to Pypies.
...
Former-commit-id: 90b9cf980402c16b6f3d90b9cf980402c16b6f3dd710e987e4d710e987e48a7376ed6037d1aee96534518b7cf6
2013-01-15 16:09:42 -06:00
Bryan Kowal
89cc2bdf57
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: fba28ea69be2a12845d3fba28ea69be2a12845d34db9c6c3214db9c6c32138480e46b1c1330e8121290167ac16
2013-01-15 14:56:01 -06:00
Richard Peter
ef2dc06b69
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: ae3ea75cbf1318f53902ae3ea75cbf1318f53902b8e42dabc0b8e42dabc0fa6247baf7aa9e16b038096134d917
2013-01-14 17:38:38 -06:00
Steve Harris
92f1e9416c
13.1.2-8 baseline
...
Former-commit-id: b864fdc303e6217a17deb864fdc303e6217a17de06b8eb8db006b8eb8db07d0109a3493caf592e83066c14dcd2
2013-01-11 16:19:07 -05:00
Steve Harris
1ef10eaf2c
13.1.2-7 baseline
...
Former-commit-id: a8d90da9c04f86b07eb0a8d90da9c04f86b07eb042189b5f8842189b5f88f1256f2a9eb7f1dbe72b775a338b90
2013-01-11 16:12:09 -05:00
Ben Steffensmeier
1b9a9383c1
Issue #1362 add null chack in nsharp mouse handler.
...
Former-commit-id: b05bf7b6e21186724fa8b05bf7b6e21186724fa8a836aee481a836aee481a8b47461763a4661685a8fb09ab2cb
2013-01-08 18:17:24 -06:00
Steve Harris
b7f180d9d3
13.1.2-6 baseline
...
Former-commit-id: efd3392abe8e5f9e0e6cefd3392abe8e5f9e0e6c59969775ad59969775ad82a1ed77a4dbcae57f5705bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
f52ec0b0a0
13.1.2-2 baseline
...
Former-commit-id: 51208e5515c0c1d56f3a51208e5515c0c1d56f3a4ba416aeb34ba416aeb3cd4185ef5c941337c553b6fa9b4858
2013-01-06 14:32:24 -06:00
Max Schenkelberg
d0a39b6c17
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: 08160fff31fabb9bbcff08160fff31fabb9bbcff7e3273db957e3273db953a1106efa0904270b99b09f1499af9
2012-12-20 17:14:34 -06:00
Steve Harris
b0a60923c4
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: 4d4771ee3a43ddfe98c44d4771ee3a43ddfe98c4f6988eeffff6988eeffff02c1ef71d6287b32e7debcc9975c4
2012-12-11 08:45:53 -06:00
