Ben Steffensmeier
2807018fec
Issue #1961 Add ability to disable grib tables.
...
Former-commit-id: 63d20bc2e11b15b0d9161b15b0d916c46c523ba0
2013-04-30 14:29:21 -05:00
Steve Harris
03ff5cd82c
13.4.1-3 baseline
...
Former-commit-id: 86e96f378c54afedf61754afedf6173486902772
2013-04-29 12:25:07 -05:00
Ron Anderson
b2b1d4f953
Issue #1939 Fix deadlock at CAVE start up.
...
Change-Id: Ic3a0f527cdae7ee1abc32662c90d9594686d4bab
Former-commit-id: fcc157a91b6f2a6ce80c6f2a6ce80c2c2e2b4baa
2013-04-25 09:40:59 -05:00
Steve Harris
79567aac51
13.4.1-1 baseline
...
Former-commit-id: 00332e63052f517b77132f517b7713f95e0ad10b
2013-04-24 17:15:55 -05:00
Benjamin Phillippe
c6ee9830c2
Issue #1931 Implemented REST binding for registry
...
Change-Id: I604c02dc849e380f70e2d27fa1f2b30dadcf0776
Former-commit-id: 3d2e073dd79065ebcb659065ebcb659a7971c872
2013-04-22 13:17:53 -05:00
Dustin Johnson
b878da6a26
Issue #1932 Allow yajsw to kill the wrapped process after timeout in debug mode
...
Change-Id: If638edfbb0111fb7b58901584899a0523142c518
Former-commit-id: 86931a613a4128e761804128e7618043314cdd3c
2013-04-22 08:31:05 -05:00
Ron Anderson
f0e2bf8755
Issue #1787 Fixed to support changes to D2D grid location
...
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c
Former-commit-id: 4cd87f2726c233ce042dc233ce042d4ea01a29ce
2013-04-15 18:02:47 -05:00
Benjamin Phillippe
fa6cdf46db
Issue #1802 Implemented ebxml registry replication
...
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531
Former-commit-id: ec69cdeb44120906de78120906de78e3f3483b51
2013-04-12 11:27:45 -05:00
Bryan Kowal
45b8575578
Issue #1901 - EDEX will no longer automatically be killed during shutdown
...
Former-commit-id: 81423bdca136fa6f932b36fa6f932bfabebb7adf
2013-04-12 10:36:15 -05:00
Matt Nash
6f12e80c0d
Issue #1871 convert parameters to Strings and make sure to return them
...
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7
Former-commit-id: 6c488cee05cd77308faccd77308fac64323fc0af
2013-04-12 09:31:23 -05:00
Matt Nash
01e9ab8a06
Issue #1871 add default values for times so they don't need to be sent in from
...
Python, move getLatLonCoords()
Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1
Former-commit-id: b44ee446643af61d71173af61d71172ab1cf8abb
2013-04-12 09:31:16 -05:00
Steve Harris
58848dbf11
Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
Former-commit-id: 0fed14d76555d9909d6d55d9909d6d0d86b95f1b
2013-04-11 13:14:00 -05:00
Mike Duff
60a6fb451c
Issue #1786 - Initial checkin of https for thin client
...
Code review comments
Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e
Former-commit-id: 0a33734e6fb9abbcdf37b9abbcdf37f584e17aa7
2013-04-10 10:29:33 -05:00
Steve Harris
196767d525
13.3.1-19 baseline
...
Former-commit-id: abaf9f12f99be238bcc49be238bcc4dc9fef33a9
2013-04-09 08:37:12 -05:00
Steve Harris
7266d7a21b
Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
...
Former-commit-id: 84370207a153492c290253492c29022711be871a
2013-04-08 13:47:34 -05:00
Bryan Kowal
18a90e6bca
Issue #1873 - reduce EDEX shutdown time
...
Former-commit-id: 82a1b0752ebec051d00abec051d00ab252ca6506
2013-04-04 17:36:09 -05:00
Bryan Kowal
ce08162045
Issue #1663 - awips2-database will no longer install site-specific databases.
...
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
will be purged by the localization rpm once it is finished with them
Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6
Former-commit-id: 3d04b0f87ba8d4e8f6eca8d4e8f6ec991de38661
2013-04-04 13:03:08 -05:00
Bryan Kowal
f81212d444
Issue #1663 - name the default geometry column
...
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27
Former-commit-id: 37d869ef60267b2c4dfa267b2c4dfad35246ef31
2013-04-04 13:01:09 -05:00
David Gillingham
aaddb9cd58
Issue #1759 : Convert ifpnetCDF and iscMosaic to use more robust request
...
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.
Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
Former-commit-id: 56235e370fd24fcc85e2d24fcc85e25ae3fbd325
2013-04-04 13:00:36 -05:00
Bryan Kowal
321660e016
Issue #1663 - PostgreSQL Upgrade
...
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
* geos 3.3.7
* postgis 2.0.2
* proj 4.8.0
* gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers
Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8
Former-commit-id: 4fd4786ae59e99447eee9e99447eee211307edfd
2013-04-04 12:56:58 -05:00
Steve Harris
1b8e623c9b
13.3.1-17 baseline
...
Former-commit-id: a3fe998f8f7bf9966dcb7bf9966dcbf28b85d42f
2013-04-01 12:04:56 -05:00
Dustin Johnson
2e1cc96d01
Issue #1839 Change build.edex build.xml to support building work assignment features after main build
...
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9
Former-commit-id: 1365d5c9af3be6669f1b3be6669f1bce37e32e61
2013-03-28 11:43:24 -05:00
Steve Harris
02f49bc2e4
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 3073951b3d9a321b6ac89a321b6ac8069ee8a748
2013-03-27 22:16:15 -05:00
Steve Harris
bb88c2133a
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: d997aeaee42a0e399dc82a0e399dc8979d6a5d8c
2013-03-27 18:21:05 -05:00
Steve Harris
f9b3430485
13.3.1-14 baseline
...
Former-commit-id: 9fba973fd09022c500ce9022c500ce91a5e4578e
2013-03-27 17:59:34 -05:00
Dustin Johnson
5dbff646aa
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 1684507bdb52c27ec57f52c27ec57ffbcfdd0ca1
2013-03-27 15:38:36 -05:00
Richard Peter
485a15cc15
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: b75ceeeeb35287a3296b5287a3296b25d4905570
2013-03-26 20:55:42 -05:00
Steve Harris
690f451746
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 65df96a4195fcfaf43605fcfaf43604e54025fcd
2013-03-26 12:47:40 -05:00
David Gillingham
4c5493d607
Issue #1823 : Trigger SAT smart inits based only on sector id and physical element.
...
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79
Former-commit-id: bebfc603171df8d399191df8d39919ad357638b3
2013-03-26 10:33:42 -05:00
Steve Harris
e154e58354
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: a23cecdb26fd71e44f0ffd71e44f0fb0621d90bc
2013-03-26 10:12:34 -05:00
Mike Duff
f767014e9a
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
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
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
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/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: 9ebc7606b15d72795e1b5d72795e1bc1f7d33bb8
2013-03-26 09:19:39 -05:00
Richard Peter
559bc19ecd
Merge "Issue #1802 Refactored DD transaction management" into development
...
Former-commit-id: 5c92140024c3268aa02cc3268aa02cb3631390d2
2013-03-25 15:37:18 -05:00
Bryan Kowal
0cc63cbb21
Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
...
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment
Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc
Former-commit-id: 6758a9a50d9e647beded9e647beded09263dbf8c
2013-03-25 15:23:32 -05:00
Bryan Kowal
27aa8b21f4
Issue #1661 - yajsw will now log to both the console and log file indefinitely
...
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm
Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0
Former-commit-id: a6cd17feebc55efaadb0c55efaadb0541d096faf
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
15f5bc0cad
Issue #1802 Refactored DD transaction management
...
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39
Former-commit-id: af05feb5a7b10b1150beb10b1150be4675bed4c2
2013-03-25 15:15:38 -05:00
Steve Harris
6f374b35d0
13.3.1-12 baseline
...
Former-commit-id: aaac0b51e50be473728a0be473728abe96282207
2013-03-25 13:27:13 -05:00
Bryan Kowal
0ef2ee6e49
Issue #1663 - awips2-database will no longer install site-specific databases.
...
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
will be purged by the localization rpm once it is finished with them
Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6
Former-commit-id: 722d068105ab135933daab135933da4d3731bf6d
2013-03-21 09:50:48 -05:00
Steve Harris
b7994fb77b
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 0379be06d2e2496455b2e2496455b20055a3213d
2013-03-20 16:09:26 -05:00
Steve Harris
ea052b14bb
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: dc419068f0fa15f03e1bfa15f03e1ba9ced3a7ef
2013-03-20 16:06:20 -05:00
Steve Harris
76ea9120d8
13.3.1-10 baseline
...
Former-commit-id: 7078eec1b1073687d9a9073687d9a957f4676b6c
2013-03-20 15:53:01 -05:00
Steve Harris
8db22baf07
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: cb5ea76f9836df63be5c36df63be5c310474ae9b
2013-03-20 13:45:11 -05:00
Dave Hladky
2cfb8f5ee0
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: 3cdbfa3f2590f7f2110b90f7f2110bdc7b231bf0
2013-03-20 12:41:33 -05:00
Steve Harris
6ebecda008
13.3.1-9 baseline
...
Former-commit-id: f2b3fddfe2468ae82305468ae82305c7b2ef2d8c
2013-03-19 14:22:56 -05:00
Dustin Johnson
d1789b5141
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: 8363eba4095b4035fb115b4035fb11bc323d3f25
2013-03-19 13:09:48 -05:00
Dave Hladky
77472f704f
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: 81ad1ce2edddb23ae59fddb23ae59fd7e8709cde
2013-03-19 13:08:14 -05:00
Steve Harris
b64fbe549a
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: 7fcf9f1cb2b8f0635ad6b8f0635ad628ef804e1b
2013-03-18 16:52:00 -05:00
Steve Harris
3e69490ab2
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
...
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: c18b96dc4c1a999fee5a1a999fee5a27c418812f
2013-03-18 16:43:22 -05:00
Bryan Kowal
4f808edba3
Issue #1741 - what was once two is now one
...
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: 7fd035256db954bc17bfb954bc17bfa93dcff1b5
2013-03-18 16:36:33 -05:00
Steve Harris
dd30a5f940
13.3.1-8 baseline
...
Former-commit-id: c15b3ffe20f97d78994bf97d78994bbc9df0a8f9
2013-03-18 15:43:32 -05:00
Dustin Johnson
65f87506b7
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 43a9f608efecb0d2c826ecb0d2c826fff7e7983f
2013-03-15 11:51:58 -05:00
