Commit graph

1143 commits

Author SHA1 Message Date
Matt Nash
054c9afeed Issue #1870 implement PathManager interface in Python to allow Python code to
get files

Change-Id: I0192c996533b1539194aaeba0213074bef8a4717

Former-commit-id: 4b23ec7c0a [formerly bf01f50e17 [formerly e3df8efa51ad95c952318b59edca702157a59856]]
Former-commit-id: bf01f50e17
Former-commit-id: 68892951c5
2013-04-12 07:55:56 -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: 0fed14d765 [formerly 55d9909d6d [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]
Former-commit-id: 55d9909d6d
Former-commit-id: 0d86b95f1b
2013-04-11 13:14:00 -05:00
Richard Peter
7816a9baa7 Merge "Issue #1874 - created external properties files for specifying the number of grib decode threads" into omaha_13.4.1
Former-commit-id: 7f25a86e4d [formerly a244fe0cd0 [formerly cd417d34a230322f80dd48eb59416c938697320d]]
Former-commit-id: a244fe0cd0
Former-commit-id: b29d274316
2013-04-10 16:57:38 -05:00
Bryan Kowal
d1799b4e0f Issue #1874 - created external properties files for specifying the number of grib decode threads
- there is now one property for the number of threads
- the property is now used to set the number of concurrent consumers

Change-Id: I5e0c39928d1f3b92ad2875e6b720c9dde1b779ff

Former-commit-id: b5994702dc [formerly eb04d2b85f [formerly deeab1e1074fec2d62e55760d9fe45ec7379b9f8]]
Former-commit-id: eb04d2b85f
Former-commit-id: 4ef22f8e93
2013-04-10 16:24:39 -05:00
Richard Peter
64f626df2f Merge "Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean" into omaha_13.4.1
Former-commit-id: a31dec3cc8 [formerly 060cf5b326 [formerly 203a91a2d673329199e9fecc8bf2f171bd524cc2]]
Former-commit-id: 060cf5b326
Former-commit-id: 429d562563
2013-04-10 14:40:36 -05:00
Ben Steffensmeier
aa7aa88ee5 Issue #1893 Switch machine to be LOCAL instead of using RuntimeMXBean
Former-commit-id: d0070fcec4 [formerly d727b93273 [formerly f9eb42deebaab88fb9f1bbee54537e62acdc72fa]]
Former-commit-id: d727b93273
Former-commit-id: 26b8938242
2013-04-10 14:09:47 -05:00
Mike Duff
60a6fb451c Issue #1786 - Initial checkin of https for thin client
Code review comments

Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e

Former-commit-id: 0a33734e6f [formerly b9abbcdf37 [formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]]
Former-commit-id: b9abbcdf37
Former-commit-id: f584e17aa7
2013-04-10 10:29:33 -05:00
Max Schenkelberg
cc26fc686f Issue #1638 Added cache of PluginDao objects in PluginFactory so they can safely cache data internally by not being recreated every store operation. Added default names to sample actions
Amend: Create copy on write for PluginFactory

Change-Id: I5373d1efadc1ab3c5e368a3caae55a5ff85a2d6f

Former-commit-id: b695de3698 [formerly 6e70b21f5f [formerly 4249c63fb4ee62862cb9bbaa36d47607ba6784e8]]
Former-commit-id: 6e70b21f5f
Former-commit-id: 1bec335fd7
2013-04-10 10:04:17 -05:00
Dustin Johnson
ba51d9a911 Issue #1826 Remove delivery/notify options for subscriptions
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509

Former-commit-id: 6bc69df127 [formerly 11fd2d676b [formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]
Former-commit-id: 11fd2d676b
Former-commit-id: f3526508f3
2013-04-09 11:40:25 -05:00
Steve Harris
196767d525 13.3.1-19 baseline
Former-commit-id: abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: 9be238bcc4
Former-commit-id: dc9fef33a9
2013-04-09 08:37:12 -05:00
Richard Peter
9cdbdbfd33 Merge "Issue #1293 - remove hdffileid and create delta script to update existing databases" into omaha_13.4.1
Former-commit-id: e95911f615 [formerly aba25dc7c4 [formerly ecf4556f6bf0b1ca13013a0f5143a0f840218a13]]
Former-commit-id: aba25dc7c4
Former-commit-id: 0abecda3d1
2013-04-08 14:20:09 -05:00
Bryan Kowal
885dd56459 Issue #1293 - remove hdffileid and create delta script to update existing databases
- now in the 13.4.1 branch


Former-commit-id: c08190a586 [formerly 4cc9a742c8 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]
Former-commit-id: 4cc9a742c8
Former-commit-id: e92e2712da
2013-04-08 14:04:05 -05:00
Steve Harris
7266d7a21b Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds
Former-commit-id: 84370207a1 [formerly 53492c2902 [formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]
Former-commit-id: 53492c2902
Former-commit-id: 2711be871a
2013-04-08 13:47:34 -05:00
Greg Armendariz
bde00389a1 Issue #1872 - Add Jensen's build fix
Former-commit-id: 0e2b440b86 [formerly fba9de785d [formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]
Former-commit-id: fba9de785d
Former-commit-id: 8b2d3f7b00
2013-04-08 12:26:20 -05:00
Dustin Johnson
3a6d9209df Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.

Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf

Former-commit-id: f3bdede2c8 [formerly 61346b1388 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]
Former-commit-id: 61346b1388
Former-commit-id: cef805e79a
2013-04-05 12:41:02 -05:00
Bryan Kowal
18a90e6bca Issue #1873 - reduce EDEX shutdown time
Former-commit-id: 82a1b0752e [formerly bec051d00a [formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]
Former-commit-id: bec051d00a
Former-commit-id: b252ca6506
2013-04-04 17:36:09 -05:00
Dustin Johnson
ff6f1dc67a Issue #1872 Fix compile errors
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a

Former-commit-id: 06e6d84273 [formerly 7cf482512d [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]
Former-commit-id: 7cf482512d
Former-commit-id: ec85cdcf8c
2013-04-04 16:44:57 -05:00
Roger Ferrel
50ffd4082b Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: b00d64ec0a [formerly 998714524d [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]
Former-commit-id: 998714524d
Former-commit-id: 90dae591a6
2013-04-04 13:22:10 -05:00
Max Schenkelberg
a5994b8983 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Conflicts:

	cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java


Former-commit-id: b042037a67 [formerly 6d0960c4ef [formerly ed981dc2487d169a502f7396520899fc55ff3299]]
Former-commit-id: 6d0960c4ef
Former-commit-id: be574276f9
2013-04-04 13:21:35 -05:00
Dustin Johnson
af4da9286b Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Conflicts:

	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/DefaultLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerHolder.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleDimension.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleLayer.java
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/res/spring/grib-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/src/com/raytheon/uf/edex/plugin/grib/ogc/GribLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/MetarLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/feature/Metar.java
	edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
	edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/styling/ColormapStyleProvider.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/util/ColorMapUtility.java


Former-commit-id: 3c41127c42 [formerly 375f0801a2 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]
Former-commit-id: 375f0801a2
Former-commit-id: dbeffa91fe
2013-04-04 13:10:24 -05:00
Richard Peter
1d7d360f2c Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: 814bff6ddb [formerly f77948929d [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]
Former-commit-id: f77948929d
Former-commit-id: 91d708eaac
2013-04-04 13:03:41 -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: 3d04b0f87b [formerly a8d4e8f6ec [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]
Former-commit-id: a8d4e8f6ec
Former-commit-id: 991de38661
2013-04-04 13:03:08 -05:00
Roger Ferrel
1fb0666a69 Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 2cd455764b [formerly 4e607bc7bf [formerly 79d768ff4df2d866aaea4dc8d2197cf190eb2809]]
Former-commit-id: 4e607bc7bf
Former-commit-id: 24e5e7ff35
2013-04-04 13:02:58 -05:00
Bryan Kowal
f81212d444 Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: 37d869ef60 [formerly 267b2c4dfa [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]
Former-commit-id: 267b2c4dfa
Former-commit-id: d35246ef31
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: 56235e370f [formerly d24fcc85e2 [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]
Former-commit-id: d24fcc85e2
Former-commit-id: 5ae3fbd325
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: 4fd4786ae5 [formerly 9e99447eee [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]
Former-commit-id: 9e99447eee
Former-commit-id: 211307edfd
2013-04-04 12:56:58 -05:00
Mike Duff
ea0cd457ac Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: d5d4ed7327 [formerly 4ab07a31da [formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]
Former-commit-id: 4ab07a31da
Former-commit-id: 2e424cd74a
2013-04-04 12:56:44 -05:00
David Gillingham
493814adf5 Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Conflicts:

	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF


Former-commit-id: 0969f85246 [formerly 055c36ea41 [formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]
Former-commit-id: 055c36ea41
Former-commit-id: 05f52e6e54
2013-04-04 12:46:21 -05:00
Steve Harris
4dfea33cdd Merge branch 'omaha_13.3.1' into development
Former-commit-id: 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]
Former-commit-id: 8b607f8228
Former-commit-id: 9879b94de9
2013-04-04 11:58:50 -05:00
Steve Harris
77c0dd0b55 Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]
Former-commit-id: 0f000f4485
Former-commit-id: 2bc12f7a23
2013-04-03 15:52:19 -05:00
Richard Peter
7d2b8a7576 Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
Former-commit-id: 6d73e25290 [formerly d282a49b6f [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]
Former-commit-id: d282a49b6f
Former-commit-id: 920ba0628c
2013-04-03 15:14:17 -05:00
Richard Peter
f0450ff6f2 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
Former-commit-id: cfcacd20e9 [formerly cbbd9ab90d [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]
Former-commit-id: cbbd9ab90d
Former-commit-id: dd527a4ef2
2013-04-03 15:13:26 -05:00
Steve Harris
e621424fcb 13.3.1-18 baseline
Former-commit-id: ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: a2b098d86d
Former-commit-id: f3e79bcc9d
2013-04-03 14:58:29 -05:00
Bryan Kowal
981638c532 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: ee8c99ef6e [formerly e788c7b471 [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]
Former-commit-id: e788c7b471
Former-commit-id: d1663ea98b
2013-04-03 14:03:54 -05:00
Bryan Kowal
2dbabffbe5 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: 42ab5f4244 [formerly 939ff752e8 [formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]
Former-commit-id: 939ff752e8
Former-commit-id: ad523b9cee
2013-04-03 14:03:18 -05:00
Ron Anderson
3e61a80508 Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: b703b4779e [formerly 3a3cdcbf46 [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]
Former-commit-id: 3a3cdcbf46
Former-commit-id: 34c8aad559
2013-04-03 14:01:18 -05:00
Roger Ferrel
e87e4c869d Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.

Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d

Former-commit-id: d2aae617b2 [formerly 54cbf656e9 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]
Former-commit-id: 54cbf656e9
Former-commit-id: f8d1a13c38
2013-04-03 12:48:18 -05:00
Greg Armendariz
b8e7d3644c Issue #1782 - Restoring #1813 & #1478
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: 54f56fde29 [formerly e5408c3807 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]
Former-commit-id: e5408c3807
Former-commit-id: f1776b887d
2013-04-02 15:00:26 -05:00
Nate Jensen
cb6cd91f06 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: 8f9ec8dd2c [formerly f57358cff8 [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]
Former-commit-id: f57358cff8
Former-commit-id: ab28523a09
2013-04-02 14:29:15 -05:00
Dustin Johnson
5b7fcb1ce2 Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
Amend:
   Use TimeUtil.newGmtCalendar() and remove whitespace only change
   Add TODO for point data types.

Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3

Former-commit-id: 6129d86be4 [formerly c981b7250f [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]
Former-commit-id: c981b7250f
Former-commit-id: 48a2002e68
2013-04-01 15:35:51 -05:00
Max Schenkelberg
a59484e232 Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]
Former-commit-id: b32fbad9c8
Former-commit-id: 9d032f3e84
2013-04-01 12:41:50 -05:00
Steve Harris
5ec1c01d3a 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: 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 140765a43e
Former-commit-id: 736bb45741
2013-04-01 12:19:04 -05:00
Steve Harris
d2d9195925 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: 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]
Former-commit-id: 74a47b9bd9
Former-commit-id: 3b722f1076
2013-04-01 12:15:04 -05:00
Steve Harris
1b8e623c9b 13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
2013-04-01 12:04:56 -05:00
Steve Harris
70fece2da1 13.3.1-15 baseline
Former-commit-id: 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: eb1dab3864
Former-commit-id: 4cf3ad6abb
2013-04-01 11:33:20 -05:00
Max Schenkelberg
6c1c9f25d5 Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments

Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835

Former-commit-id: 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]
Former-commit-id: 321a29ffa4
Former-commit-id: a508e9c8cb
2013-04-01 10:19:36 -05:00
Ron Anderson
ef06834e54 Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: 679bb01764 [formerly aeb451a37c [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]
Former-commit-id: aeb451a37c
Former-commit-id: cfb324f380
2013-03-29 10:07:37 -05:00
Greg Armendariz
466fa3fd41 Fix merge issue
Former-commit-id: 5da06cadd7 [formerly cd5da3a6c5 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]
Former-commit-id: cd5da3a6c5
Former-commit-id: 611661ccc9
2013-03-29 09:52:46 -05:00
Greg Armendariz
56f51657fd Change package location of import
Former-commit-id: 27345f6edf [formerly d533c5c08d [formerly c158a7540d23451b864a1464ab64882c3d45386d]]
Former-commit-id: d533c5c08d
Former-commit-id: f778112c20
2013-03-29 09:09:32 -05:00
David Gillingham
2ee53d54f5 Issue #1837: Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0

Former-commit-id: c9ed59b0e0 [formerly 8a7c965eaa [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]
Former-commit-id: 8a7c965eaa
Former-commit-id: 170f252bdd
2013-03-28 17:18:43 -05:00