Steve Harris
7eda24c3b0
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: 8b607f82288b607f82285c9a6b83cced8c0487fe
2013-04-04 11:58:50 -05:00
Steve Harris
f22108c973
Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
...
Former-commit-id: 0f000f44850f000f4485327d05f3b5c7b9690456
2013-04-03 15:52:19 -05:00
Steve Harris
044912d48b
13.3.1-18 baseline
...
Former-commit-id: a2b098d86da2b098d86dce6a06a7e3bf6c3b6762
2013-04-03 14:58:29 -05:00
Steve Harris
d0e61c59e8
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: 140765a43e140765a43e437a04011a0b48e96314
2013-04-01 12:19:04 -05:00
Steve Harris
0fee31b1a8
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: 74a47b9bd974a47b9bd914c9de2259a6dd28cc82
2013-04-01 12:15:04 -05:00
Steve Harris
4204273f21
13.3.1-15 baseline
...
Former-commit-id: eb1dab3864eb1dab38643d8ed484bed3cec5d3cb
2013-04-01 11:33:20 -05:00
Steve Harris
8237fdadaa
13.3.1-14 baseline
...
Former-commit-id: 9022c500ce9022c500ce9fba973fd02ca160caf0
2013-03-27 17:59:34 -05:00
Steve Harris
f1d156779a
13.3.1-12 baseline
...
Former-commit-id: 0be473728a0be473728aaaac0b51e5bc439aee4f
2013-03-25 13:27:13 -05:00
Max Schenkelberg
924e27f51f
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: c6db3ce43bc6db3ce43b26cfcd2af52e10fd83f6
2013-03-20 14:10:52 -05:00
Steve Harris
6d4512fa3a
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: 36df63be5c36df63be5ccb5ea76f98104e6e79e8
2013-03-20 13:45:11 -05:00
Ben Steffensmeier
e176478c7a
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 6c741a9ab36c741a9ab386dffab17ddfe8de96f2
2013-03-18 17:16:44 -05:00
Steve Harris
22bb7ecd33
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: b8f0635ad6b8f0635ad67fcf9f1cb2900b9aadde
2013-03-18 16:52:00 -05:00
Dustin Johnson
a08059dd34
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: ecb0d2c826ecb0d2c82643a9f608ef1b82ad0dc4
2013-03-15 11:51:58 -05:00
Dave Hladky
cb5ee4a7b8
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 38b952a22038b952a2205dc454c7ef160e1594b8
2013-03-13 13:56:33 -05:00
Steve Harris
3084a860cd
13.3.1-7 baseline
...
Former-commit-id: a72254cc75a72254cc75e12ed113ae31c0a97dca
2013-03-13 09:50:28 -05:00
Dustin Johnson
a63b1b96d6
Issue #1784 Update ColorMapParameters import for ncep plugins
...
Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8
Former-commit-id: 9cd29d76259cd29d76250932affd1664d8fc0ea3
2013-03-13 08:45:54 -05:00
Steve Harris
5232592cfa
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: 753a5213ab753a5213ab0cd7e56e65d5bcdb0015
2013-03-12 16:04:23 -05:00
Dave Hladky
29ed641a13
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: a1006667e0a1006667e04b084918806ea95002de
2013-03-12 15:48:34 -05:00
Steve Harris
c6f379f59a
13.3.1-6 baseline
...
Former-commit-id: 3a4c7931e13a4c7931e1566b677d094ed21b702b
2013-03-12 08:35:45 -05:00
Ben Steffensmeier
0778375180
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: f46686a6e2f46686a6e22ca86633d65068b18c6a
2013-02-28 17:00:56 -06:00
Max Schenkelberg
22a18ffe01
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: 0f1112fb3e0f1112fb3e38bba3705f6ebc058df4
2013-02-27 12:26:32 -06:00
Max Schenkelberg
453ac44050
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: 4ed4ef8d714ed4ef8d71e0ba97d5476b1426dd34
2013-02-27 11:50:38 -06:00
Steve Harris
140ae3191c
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 67f090638f67f090638f6ec9e730350051276ad1
2013-02-25 15:58:48 -06:00
Steve Harris
f3c3191a1c
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: a0573644c4a0573644c42641d578e233dd2589f1
2013-02-21 15:41:39 -06:00
Bryan Kowal
2a21f2624b
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: a8fb04f41ca8fb04f41c803397c7c7450e8e7a4c
2013-02-21 13:55:28 -06:00
Steve Harris
b3b56830b0
13.3.1-1 baseline
...
Former-commit-id: 71e899002171e8990021d2a654625f46d28be4a4
2013-02-20 16:19:40 -06:00
Steve Harris
5a33182da5
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: ea50a5db77ea50a5db77d123c044c31c08acab38
2013-02-19 12:22:00 -06:00
Steve Harris
edac913af7
13.2.1-8 baseline
...
Former-commit-id: f81b382c04f81b382c04053156f02ec6d584758f
2013-02-18 09:09:41 -06:00
Ron Anderson
45627edcc7
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: a2a89fb4e7a2a89fb4e77c0a5d74bfe952a4f179
2013-02-15 09:03:41 -06:00
Steve Harris
137e6e9d0e
Merge branch 'ss_builds' (13.2.1-7) into development
...
Former-commit-id: cc2757790ccc2757790cde437bb4fc3690662bf7
2013-02-12 15:30:10 -06:00
Steve Harris
7a97ba36cb
13.2.1-7 baseline
...
Former-commit-id: 2fb5a31b982fb5a31b986baff6a089bac9b967aa
2013-02-12 15:27:30 -06:00
Steve Harris
94dd16659a
13.2.1-7 baseline
...
Former-commit-id: 6fad5da5ed6fad5da5ed9c23bf6e736bfbfc8a5e
2013-02-12 14:51:26 -06:00
Steve Harris
d73efe8e86
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 4bc8e9ab5c4bc8e9ab5c5ee47e098d3ad515e28f
2013-02-06 11:12:01 -06:00
Steve Harris
f028c16f79
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: a16ac7819ca16ac7819c6c6b53679b28ddc9bad8
2013-02-06 11:08:53 -06:00
Steve Harris
bb0759d5ad
13.2.1-5 baseline
...
Former-commit-id: 232734091d232734091d146fcc6da81c602ec3a7
2013-02-06 11:02:32 -06:00
Bryan Kowal
2fafc6a34b
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: 7815b651bb7815b651bb5fea87f1dd99994d3151
2013-02-05 13:25:15 -06:00
Steve Harris
0a4ef8c084
13.2.1-4 baseline
...
Former-commit-id: 8f2e7d44378f2e7d44370d7f53b6f42998f750f4
2013-01-31 11:40:31 -06:00
Steve Harris
27706b8dcb
13.2.1-2 baseline
...
Former-commit-id: 7a7f7c45ca7a7f7c45cac3e4551dfa1153d80c5b
2013-01-25 09:07:12 -06:00
Steve Harris
547c1dedd1
13.2.1-2 baseline
...
Former-commit-id: 83e9157df783e9157df7328c6dccad47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
9146e727f9
13.2.1-1 baseline
...
Former-commit-id: 9771dfae6b9771dfae6bc63f9bcae0f6670806bf
2013-01-23 11:13:03 -05:00
Steve Harris
5c488932d9
13.1.2-10 baseline
...
Former-commit-id: 68dde17de268dde17de286ea0b666ed148beb4ca
2013-01-18 10:37:25 -05:00
Bryan Kowal
0c5323fadb
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: a2f745ec54a2f745ec545d769d8a8d2bb5377a4d
2013-01-17 09:59:11 -06:00
Bryan Kowal
e9e16abea2
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: 2ed28bed932ed28bed938c118e791b0a39b4ddf1
2013-01-15 18:46:46 -06:00
Bryan Kowal
34518b7cf6
Issue #1469 - updated for compatibility with recent changes to Pypies.
...
Former-commit-id: 02c16b6f3d02c16b6f3dd710e987e437d1aee965
2013-01-15 16:09:42 -06:00
Bryan Kowal
290167ac16
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: e2a12845d3e2a12845d34db9c6c321c1330e8121
2013-01-15 14:56:01 -06:00
Richard Peter
096134d917
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: 1318f539021318f53902b8e42dabc0aa9e16b038
2013-01-14 17:38:38 -06:00
Steve Harris
066c14dcd2
13.1.2-8 baseline
...
Former-commit-id: e6217a17dee6217a17de06b8eb8db03caf592e83
2013-01-11 16:19:07 -05:00
Steve Harris
775a338b90
13.1.2-7 baseline
...
Former-commit-id: 4f86b07eb04f86b07eb042189b5f88b7f1dbe72b
2013-01-11 16:12:09 -05:00
Ben Steffensmeier
8fb09ab2cb
Issue #1362 add null chack in nsharp mouse handler.
...
Former-commit-id: 1186724fa81186724fa8a836aee4813a4661685a
2013-01-08 18:17:24 -06:00
Steve Harris
05bdc0ecd2
13.1.2-6 baseline
...
Former-commit-id: 8e5f9e0e6c8e5f9e0e6c59969775addbcae57f57
2013-01-06 14:55:11 -06:00
