Commit graph

1130 commits

Author SHA1 Message Date
Greg Armendariz
d25ec9c02c Issue #1872 - Add Jensen's build fix
Former-commit-id: 8b2d3f7b00 [formerly fba9de785d] [formerly 8b2d3f7b00 [formerly fba9de785d] [formerly 0e2b440b86 [formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]]
Former-commit-id: 0e2b440b86
Former-commit-id: 274c0a9c26 [formerly ea340322bb]
Former-commit-id: 190d2b79ad
2013-04-08 12:26:20 -05:00
Dustin Johnson
5958178516 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: cef805e79a [formerly 61346b1388] [formerly cef805e79a [formerly 61346b1388] [formerly f3bdede2c8 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]
Former-commit-id: f3bdede2c8
Former-commit-id: 4b4eb8e406 [formerly 8c52cd190f]
Former-commit-id: fefc0dca3b
2013-04-05 12:41:02 -05:00
Bryan Kowal
82db2880b7 Issue #1873 - reduce EDEX shutdown time
Former-commit-id: b252ca6506 [formerly bec051d00a] [formerly b252ca6506 [formerly bec051d00a] [formerly 82a1b0752e [formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]]
Former-commit-id: 82a1b0752e
Former-commit-id: e05b72b17e [formerly 3bd9819e59]
Former-commit-id: 0285965657
2013-04-04 17:36:09 -05:00
Dustin Johnson
bf97f2e7d2 Issue #1872 Fix compile errors
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a

Former-commit-id: ec85cdcf8c [formerly 7cf482512d] [formerly ec85cdcf8c [formerly 7cf482512d] [formerly 06e6d84273 [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]]
Former-commit-id: 06e6d84273
Former-commit-id: 9531e50cac [formerly add67ae3dc]
Former-commit-id: 64b2560d05
2013-04-04 16:44:57 -05:00
Roger Ferrel
59bb22e52b 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: 90dae591a6 [formerly 998714524d] [formerly 90dae591a6 [formerly 998714524d] [formerly b00d64ec0a [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]]
Former-commit-id: b00d64ec0a
Former-commit-id: 5c4a938c72 [formerly 8c5f3fb8f7]
Former-commit-id: da4b43a4fc
2013-04-04 13:22:10 -05:00
Max Schenkelberg
61f17d8d34 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: be574276f9 [formerly 6d0960c4ef] [formerly be574276f9 [formerly 6d0960c4ef] [formerly b042037a67 [formerly ed981dc2487d169a502f7396520899fc55ff3299]]]
Former-commit-id: b042037a67
Former-commit-id: fb1a6e203b [formerly 1b81c79b13]
Former-commit-id: 95e73c34f9
2013-04-04 13:21:35 -05:00
Dustin Johnson
ce87841d63 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: dbeffa91fe [formerly 375f0801a2] [formerly dbeffa91fe [formerly 375f0801a2] [formerly 3c41127c42 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]
Former-commit-id: 3c41127c42
Former-commit-id: 9a4f4431de [formerly 0dc74710ce]
Former-commit-id: 32da016541
2013-04-04 13:10:24 -05:00
Richard Peter
52533b4f49 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: 91d708eaac [formerly f77948929d] [formerly 91d708eaac [formerly f77948929d] [formerly 814bff6ddb [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]
Former-commit-id: 814bff6ddb
Former-commit-id: e9fe732dac [formerly 4337abd873]
Former-commit-id: 055440acda
2013-04-04 13:03:41 -05:00
Bryan Kowal
f785bd78aa 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: 991de38661 [formerly a8d4e8f6ec] [formerly 991de38661 [formerly a8d4e8f6ec] [formerly 3d04b0f87b [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]]
Former-commit-id: 3d04b0f87b
Former-commit-id: a214ee536a [formerly a154e3b3cd]
Former-commit-id: 040bf63b7f
2013-04-04 13:03:08 -05:00
Roger Ferrel
9125683187 Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

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

Former-commit-id: d35246ef31 [formerly 267b2c4dfa] [formerly d35246ef31 [formerly 267b2c4dfa] [formerly 37d869ef60 [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]]
Former-commit-id: 37d869ef60
Former-commit-id: 1ce9d40711 [formerly 6eec333843]
Former-commit-id: 8723415965
2013-04-04 13:01:09 -05:00
David Gillingham
cdba87a6f3 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: 5ae3fbd325 [formerly d24fcc85e2] [formerly 5ae3fbd325 [formerly d24fcc85e2] [formerly 56235e370f [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]]
Former-commit-id: 56235e370f
Former-commit-id: b97b1766ee [formerly 60e8146a18]
Former-commit-id: a49920c978
2013-04-04 13:00:36 -05:00
Bryan Kowal
aab6cce629 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: 211307edfd [formerly 9e99447eee] [formerly 211307edfd [formerly 9e99447eee] [formerly 4fd4786ae5 [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]]
Former-commit-id: 4fd4786ae5
Former-commit-id: d40863c38f [formerly fcc7b102ad]
Former-commit-id: 887b7d9c1a
2013-04-04 12:56:58 -05:00
Mike Duff
cbca9678b4 Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: 2e424cd74a [formerly 4ab07a31da] [formerly 2e424cd74a [formerly 4ab07a31da] [formerly d5d4ed7327 [formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]]
Former-commit-id: d5d4ed7327
Former-commit-id: 57fa0f2ef9 [formerly aefbc4f54f]
Former-commit-id: 0901f42fc9
2013-04-04 12:56:44 -05:00
David Gillingham
7eb15969fb 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: 05f52e6e54 [formerly 055c36ea41] [formerly 05f52e6e54 [formerly 055c36ea41] [formerly 0969f85246 [formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]]
Former-commit-id: 0969f85246
Former-commit-id: 2038a703ac [formerly 8859674c70]
Former-commit-id: 184bb9e966
2013-04-04 12:46:21 -05:00
Steve Harris
a7b174bfaf Merge branch 'omaha_13.3.1' into development
Former-commit-id: 9879b94de9 [formerly 8b607f8228] [formerly 9879b94de9 [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0f53c46d7a [formerly ed8c0487fe]
Former-commit-id: 7eda24c3b0
2013-04-04 11:58:50 -05:00
Steve Harris
dc0baf57ba Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 2bc12f7a23 [formerly 0f000f4485] [formerly 2bc12f7a23 [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]
Former-commit-id: 327d05f3b5
Former-commit-id: 0342b648b6 [formerly c7b9690456]
Former-commit-id: f22108c973
2013-04-03 15:52:19 -05:00
Richard Peter
75a2845464 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: 920ba0628c [formerly d282a49b6f] [formerly 920ba0628c [formerly d282a49b6f] [formerly 6d73e25290 [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]
Former-commit-id: 6d73e25290
Former-commit-id: 8ac6ae3539 [formerly 64dc5c4d23]
Former-commit-id: 0548ee285d
2013-04-03 15:14:17 -05:00
Richard Peter
aca16ca6f9 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
Former-commit-id: dd527a4ef2 [formerly cbbd9ab90d] [formerly dd527a4ef2 [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]
Former-commit-id: cfcacd20e9
Former-commit-id: d973d83519 [formerly 58908a0fd7]
Former-commit-id: d2dd57fee4
2013-04-03 15:13:26 -05:00
Steve Harris
fc009792e3 13.3.1-18 baseline
Former-commit-id: f3e79bcc9d [formerly a2b098d86d] [formerly f3e79bcc9d [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 0edd049e3b [formerly bf6c3b6762]
Former-commit-id: 044912d48b
2013-04-03 14:58:29 -05:00
Bryan Kowal
1aa28394c4 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: d1663ea98b [formerly e788c7b471] [formerly d1663ea98b [formerly e788c7b471] [formerly ee8c99ef6e [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]]
Former-commit-id: ee8c99ef6e
Former-commit-id: b60bea920c [formerly 344237d9ee]
Former-commit-id: 962755143e
2013-04-03 14:03:54 -05:00
Bryan Kowal
6ab8e23421 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: ad523b9cee [formerly 939ff752e8] [formerly ad523b9cee [formerly 939ff752e8] [formerly 42ab5f4244 [formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]]
Former-commit-id: 42ab5f4244
Former-commit-id: 93cd16508c [formerly 4fe7bace99]
Former-commit-id: e709933a4f
2013-04-03 14:03:18 -05:00
Ron Anderson
3be7ce8bab Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: 34c8aad559 [formerly 3a3cdcbf46] [formerly 34c8aad559 [formerly 3a3cdcbf46] [formerly b703b4779e [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]
Former-commit-id: b703b4779e
Former-commit-id: 0d57a752dc [formerly 065ba61389]
Former-commit-id: 2222201f43
2013-04-03 14:01:18 -05:00
Roger Ferrel
2cad51c18f 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: f8d1a13c38 [formerly 54cbf656e9] [formerly f8d1a13c38 [formerly 54cbf656e9] [formerly d2aae617b2 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]
Former-commit-id: d2aae617b2
Former-commit-id: 2b4b10d643 [formerly 7b829a2fec]
Former-commit-id: ad658b46bf
2013-04-03 12:48:18 -05:00
Greg Armendariz
e389a3bf6a Issue #1782 - Restoring #1813 & #1478
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: f1776b887d [formerly e5408c3807] [formerly f1776b887d [formerly e5408c3807] [formerly 54f56fde29 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]]
Former-commit-id: 54f56fde29
Former-commit-id: e3cf306ce4 [formerly 02e79dfe8a]
Former-commit-id: 9ca713f588
2013-04-02 15:00:26 -05:00
Nate Jensen
e0cb68cc06 Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: ab28523a09 [formerly f57358cff8] [formerly ab28523a09 [formerly f57358cff8] [formerly 8f9ec8dd2c [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 1ad5bb1a52 [formerly 374eed35b3]
Former-commit-id: d1f53fb57e
2013-04-02 14:29:15 -05:00
Dustin Johnson
e57b8314d8 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: 48a2002e68 [formerly c981b7250f] [formerly 48a2002e68 [formerly c981b7250f] [formerly 6129d86be4 [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]
Former-commit-id: 6129d86be4
Former-commit-id: 644ed2396d [formerly dd8f4d8454]
Former-commit-id: 15ed8a6f58
2013-04-01 15:35:51 -05:00
Max Schenkelberg
ee60a2a80c Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00

Former-commit-id: 9d032f3e84 [formerly b32fbad9c8] [formerly 9d032f3e84 [formerly b32fbad9c8] [formerly 547190329b [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]
Former-commit-id: 547190329b
Former-commit-id: ba262e2bc5 [formerly 635388a7ad]
Former-commit-id: 80b0f7c159
2013-04-01 12:41:50 -05:00
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: 736bb45741 [formerly 140765a43e] [formerly 736bb45741 [formerly 140765a43e] [formerly 437a04011a [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]
Former-commit-id: 437a04011a
Former-commit-id: 7b27767d7e [formerly 0b48e96314]
Former-commit-id: d0e61c59e8
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: 3b722f1076 [formerly 74a47b9bd9] [formerly 3b722f1076 [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: f85a1ab9ab [formerly a6dd28cc82]
Former-commit-id: 0fee31b1a8
2013-04-01 12:15:04 -05:00
Steve Harris
a112803c98 13.3.1-17 baseline
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7 [formerly 4afa41d4e7]
Former-commit-id: 50becef97f
2013-04-01 12:04:56 -05:00
Steve Harris
cc1ef45545 13.3.1-15 baseline
Former-commit-id: 4cf3ad6abb [formerly eb1dab3864] [formerly 4cf3ad6abb [formerly eb1dab3864] [formerly 3d8ed484be [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2bf790aae3 [formerly d3cec5d3cb]
Former-commit-id: 4204273f21
2013-04-01 11:33:20 -05:00
Max Schenkelberg
a29eff544b 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: a508e9c8cb [formerly 321a29ffa4] [formerly a508e9c8cb [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]
Former-commit-id: 51d976e5e2
Former-commit-id: 8de3a70962 [formerly 1c35a54a9f]
Former-commit-id: 01c2d29c1b
2013-04-01 10:19:36 -05:00
Ron Anderson
1eede44aac Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: cfb324f380 [formerly aeb451a37c] [formerly cfb324f380 [formerly aeb451a37c] [formerly 679bb01764 [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]
Former-commit-id: 679bb01764
Former-commit-id: d5e3976dc4 [formerly 96e8f63679]
Former-commit-id: 22f633b2a1
2013-03-29 10:07:37 -05:00
Greg Armendariz
9a8ce1af9e Fix merge issue
Former-commit-id: 611661ccc9 [formerly cd5da3a6c5] [formerly 611661ccc9 [formerly cd5da3a6c5] [formerly 5da06cadd7 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]
Former-commit-id: 5da06cadd7
Former-commit-id: dcd36e64a6 [formerly f0e1b80cd2]
Former-commit-id: 57eff9d7bf
2013-03-29 09:52:46 -05:00
Greg Armendariz
63d746dd77 Change package location of import
Former-commit-id: f778112c20 [formerly d533c5c08d] [formerly f778112c20 [formerly d533c5c08d] [formerly 27345f6edf [formerly c158a7540d23451b864a1464ab64882c3d45386d]]]
Former-commit-id: 27345f6edf
Former-commit-id: 05af592718 [formerly 089dfc87e6]
Former-commit-id: 87e37c990e
2013-03-29 09:09:32 -05:00
David Gillingham
4c1c4e665e 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: 170f252bdd [formerly 8a7c965eaa] [formerly 170f252bdd [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: fddd42615d [formerly dbec0fa00f]
Former-commit-id: 0b155a5788
2013-03-28 17:18:43 -05:00
Steve Harris
ef1e593ebd Issue #1782 - restore FFPMGenerator.java
Former-commit-id: f01b5fb849 [formerly e67dbb206e] [formerly f01b5fb849 [formerly e67dbb206e] [formerly 3953f8368b [formerly 813033f4a2b30a669646b288eb00959922f0e804]]]
Former-commit-id: 3953f8368b
Former-commit-id: bec6e9099f [formerly a74d22efc5]
Former-commit-id: 92aa705ebc
2013-03-28 16:06:54 -05:00
Max Schenkelberg
b30b72252b Issue #1638 Added persistIndex route that only persists and indexes
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae

Former-commit-id: d55e7a0eda [formerly e91406ab10] [formerly d55e7a0eda [formerly e91406ab10] [formerly a308b27c2f [formerly 3d386df8a1def460f81468154964603e7c1edbe8]]]
Former-commit-id: a308b27c2f
Former-commit-id: 623c49c3cc [formerly d9a481f542]
Former-commit-id: 58a5bebb80
2013-03-28 15:45:31 -05:00
Ron Anderson
bef17d4f03 Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 27e07ce4a9 [formerly 5bb47b7931] [formerly 27e07ce4a9 [formerly 5bb47b7931] [formerly b65ecfc151 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 33bcf5fee8 [formerly 3f2fa771d9]
Former-commit-id: 5eb1885dbd
2013-03-28 13:37:29 -05:00
Steve Harris
938243eb0b Revert "Replaced with formatted version"
This reverts commit 20c9d653c8 [formerly 054d8d263f] [formerly e074710e0a [formerly cf9b267283]] [formerly 18019c07a4] [formerly ff977fc882 [formerly b741680965] [formerly ff977fc882 [formerly b741680965] [formerly 18019c07a4 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]].


Former-commit-id: c51c9ea5df [formerly 29c5918428] [formerly c51c9ea5df [formerly 29c5918428] [formerly 8400028e11 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]
Former-commit-id: 8400028e11
Former-commit-id: 7bd478fc41 [formerly b614bf53f6]
Former-commit-id: 0074c522bb
2013-03-28 13:08:16 -05:00
Dustin Johnson
be22a59736 Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
Former-commit-id: 9bc6dd47b6 [formerly c618169639] [formerly 9bc6dd47b6 [formerly c618169639] [formerly 3991df64ff [formerly 88779a4fbd8078d81139b7555525142940999558]]]
Former-commit-id: 3991df64ff
Former-commit-id: 3896cf42f1 [formerly d900459ab4]
Former-commit-id: 9c4030ea37
2013-03-28 13:07:20 -05:00
Greg Armendariz
20c9d653c8 Replaced with formatted version
Former-commit-id: ff977fc882 [formerly b741680965] [formerly ff977fc882 [formerly b741680965] [formerly 18019c07a4 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]
Former-commit-id: 18019c07a4
Former-commit-id: e074710e0a [formerly cf9b267283]
Former-commit-id: 054d8d263f
2013-03-28 12:59:43 -05:00
Dustin Johnson
520b9f2a69 Merge "Issue #1802: Eliminated a call to new on StatsDao in AggregateManager" into development
Former-commit-id: 59393b633a [formerly 8583a5f785] [formerly 59393b633a [formerly 8583a5f785] [formerly 51bf00bf1c [formerly bf39f3c73e4de589855abda284c6d2d46543d283]]]
Former-commit-id: 51bf00bf1c
Former-commit-id: ee26b669e3 [formerly db5a8b9865]
Former-commit-id: 1cf371cd41
2013-03-28 12:25:12 -05:00
Dustin Johnson
a5009cb271 Issue #1840 Fix merge error that removed .classpath
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17

Former-commit-id: c2edf1dd89 [formerly ab42673848] [formerly c2edf1dd89 [formerly ab42673848] [formerly a4e4df02b0 [formerly 59977a0a652352a9128caaaf7d8f041b82941490]]]
Former-commit-id: a4e4df02b0
Former-commit-id: 85d6a19a5e [formerly 902986256d]
Former-commit-id: f135c0d948
2013-03-28 12:14:47 -05:00
Dustin Johnson
3850e46c2c Issue #1840 Fix merge error that removed .classpath
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e

Former-commit-id: 5e0073f1f9 [formerly 680d2984e1] [formerly 5e0073f1f9 [formerly 680d2984e1] [formerly 695c83669e [formerly f6b91884ba72412a8fad2608eca1490757df2c60]]]
Former-commit-id: 695c83669e
Former-commit-id: d0056996cd [formerly 25b6eb0eb9]
Former-commit-id: fddc41bb6e
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
cca60522c4 Issue #1802: Eliminated a call to new on StatsDao in AggregateManager
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce

Former-commit-id: ec880b7923 [formerly ed9cb5f8f6] [formerly ec880b7923 [formerly ed9cb5f8f6] [formerly 6640a65a51 [formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]]
Former-commit-id: 6640a65a51
Former-commit-id: af5827f1de [formerly c4496475a6]
Former-commit-id: 5ec3ffed77
2013-03-28 12:08:57 -05:00
Dustin Johnson
9d04ba83a5 Issue #1839 Change build.edex build.xml to support building work assignment features after main build
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9

Former-commit-id: ce37e32e61 [formerly 3be6669f1b] [formerly ce37e32e61 [formerly 3be6669f1b] [formerly 1365d5c9af [formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]]
Former-commit-id: 1365d5c9af
Former-commit-id: 1960bcbf11 [formerly 83f6fb720c]
Former-commit-id: f817dbe495
2013-03-28 11:43:24 -05:00
Ben Steffensmeier
67b3b92712 Issue #1821 recalculate 6 hours to be longer.
Former-commit-id: 61e0ca3b75 [formerly a9cec71222] [formerly 61e0ca3b75 [formerly a9cec71222] [formerly efbdd3aa8c [formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]]
Former-commit-id: efbdd3aa8c
Former-commit-id: e1a619e030 [formerly 403da9bfb9]
Former-commit-id: 94dcd159d4
2013-03-28 10:16:11 -05:00
Greg Armendariz
0ab3b9d7f9 Add source variable
Former-commit-id: ae09ebb11f [formerly 8800080d2a] [formerly ae09ebb11f [formerly 8800080d2a] [formerly d0d889f11d [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]]
Former-commit-id: d0d889f11d
Former-commit-id: 44fcd1a8db [formerly 24fea6f45d]
Former-commit-id: 344c5b41b3
2013-03-28 08:56:50 -05:00