xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3084 commits 31 branches 40 tags 3.8 GiB
Commit graph

3084 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bryan Kowal
ea86a8ba59 Issue #1293 - remove hdffileid and create delta script to update existing databases 
- now in the 13.4.1 branch


Former-commit-id: 885dd56459 [formerly e92e2712da] [formerly 4cc9a742c8] [formerly c08190a586 [formerly 4cc9a742c8 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]]
Former-commit-id: c08190a586
Former-commit-id: 0bd4d2c02ecc3f80e814b1c7593bcf9ddb429c21 [formerly 55f234c2d1]
Former-commit-id: eea02ee972
 2013-04-08 14:04:05 -05:00
Steve Harris
45c85dd1c9 Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds 
Former-commit-id: 7266d7a21b [formerly 2711be871a] [formerly 53492c2902] [formerly 84370207a1 [formerly 53492c2902 [formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]]
Former-commit-id: 84370207a1
Former-commit-id: b59b7953bfb271cf949146d04a64ce7f94879dce [formerly 0105f15306]
Former-commit-id: 5f5dd9a031
 2013-04-08 13:47:34 -05:00
Greg Armendariz
86ebf238ec Issue #1872 - Add Jensen's build fix 
Former-commit-id: bde00389a1 [formerly 8b2d3f7b00] [formerly fba9de785d] [formerly 0e2b440b86 [formerly fba9de785d [formerly ea5a1fa7de2acd53dcdb510ed42326153857a146]]]
Former-commit-id: 0e2b440b86
Former-commit-id: 9a171344cbbd9bfea849b24b1159aabbe11ef8cd [formerly ea340322bb]
Former-commit-id: 274c0a9c26
 2013-04-08 12:26:20 -05:00
Dustin Johnson
73a8bb7a02 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: 3a6d9209df [formerly cef805e79a] [formerly 61346b1388] [formerly f3bdede2c8 [formerly 61346b1388 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]
Former-commit-id: f3bdede2c8
Former-commit-id: da2f137f6b51f8ac36c0d76f597f0c82e1dfd829 [formerly 8c52cd190f]
Former-commit-id: 4b4eb8e406
 2013-04-05 12:41:02 -05:00
Bryan Kowal
2fc926dc40 Issue #1873 - reduce EDEX shutdown time 
Former-commit-id: 18a90e6bca [formerly b252ca6506] [formerly bec051d00a] [formerly 82a1b0752e [formerly bec051d00a [formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]]
Former-commit-id: 82a1b0752e
Former-commit-id: d030cb4771604922e5386d6770711033242b5fef [formerly 3bd9819e59]
Former-commit-id: e05b72b17e
 2013-04-04 17:36:09 -05:00
Dustin Johnson
ba666a0216 Issue #1872 Fix compile errors 
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a

Former-commit-id: ff6f1dc67a [formerly ec85cdcf8c] [formerly 7cf482512d] [formerly 06e6d84273 [formerly 7cf482512d [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]]
Former-commit-id: 06e6d84273
Former-commit-id: 59856ee7614cee35d409908965a9a266ed5ee207 [formerly add67ae3dc]
Former-commit-id: 9531e50cac
 2013-04-04 16:44:57 -05:00
Bryan Kowal
a5d79669d7 Issue #1805 - restore the full nightly delta build. 
Former-commit-id: 8474243360 [formerly 1ebf50c7ed] [formerly 52be309cac] [formerly dc522ede44 [formerly 52be309cac [formerly 9dc700dbf0d7ff8347fda64bdd60879c267dd2f4]]]
Former-commit-id: dc522ede44
Former-commit-id: 13548041df738803ecba4e04334e549a9ebb19c1 [formerly 04e22df174]
Former-commit-id: 607d5b205d
 2013-04-04 16:16:53 -05:00
Roger Ferrel
ef8461965e 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: 50ffd4082b [formerly 90dae591a6] [formerly 998714524d] [formerly b00d64ec0a [formerly 998714524d [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]]
Former-commit-id: b00d64ec0a
Former-commit-id: 3ba9851638529124c64d3eb3b31a74ca7dd0db71 [formerly 8c5f3fb8f7]
Former-commit-id: 5c4a938c72
 2013-04-04 13:22:10 -05:00
Max Schenkelberg
c8e0d2ca98 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: a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly b042037a67 [formerly 6d0960c4ef [formerly ed981dc2487d169a502f7396520899fc55ff3299]]]
Former-commit-id: b042037a67
Former-commit-id: 79c9f6bf695445a8d8715c158cdad1b211214ced [formerly 1b81c79b13]
Former-commit-id: fb1a6e203b
 2013-04-04 13:21:35 -05:00
Mike Duff
54c3173f69 Issue #1830 - Don't allow base level config files for FFMP 
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: b96f951732 [formerly 57146e3c95] [formerly 42fa10a859] [formerly 15c4f53172 [formerly 42fa10a859 [formerly 33f7392176acf8da158f309451557edd677c7805]]]
Former-commit-id: 15c4f53172
Former-commit-id: e9f2c7d68b92623b0e477d83de8068a69aeaec7f [formerly dd5dc7f0d2]
Former-commit-id: c2e22945f6
 2013-04-04 13:20:28 -05:00
Bryan Kowal
c9666aa999 Issue #1750 - qpid updates for compatibility with operational servers 
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes

Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f

Conflicts:

	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0


Former-commit-id: dd911d33bc [formerly 7af4c80bab] [formerly 1000dac7ad] [formerly 1cea2404c8 [formerly 1000dac7ad [formerly e30dff6e530b247c01d6ff4cff826abcda92ff29]]]
Former-commit-id: 1cea2404c8
Former-commit-id: 9883b0093f4fbc3aaa265cddbe9d5db095bd7555 [formerly 22a2c082b8]
Former-commit-id: 8c20b1f4bc
 2013-04-04 13:20:13 -05:00
Bryan Kowal
5cb707736a Issue #1750 - include the qpidd service script in the rpm installations 
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 52fc0c66c2 [formerly 0d252800ee] [formerly a07f8076cf] [formerly 3454fd030b [formerly a07f8076cf [formerly 790804146d4eade073e3250e1b1cd95e313b1a96]]]
Former-commit-id: 3454fd030b
Former-commit-id: 61a29a2dc8e795045f30b007407d07cd9e3cc057 [formerly 3dadeb157d]
Former-commit-id: 59b2e35928
 2013-04-04 13:12:07 -05:00
Roger Ferrel
3ba7a255df Issue #1735 Performance improvments for LLWSData. 
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f

Former-commit-id: 23d3ab925d [formerly f6ccec22b0] [formerly 0b224e9b84] [formerly 54daec6dc6 [formerly 0b224e9b84 [formerly 55230d49b580be00dcd092c80dca3ee7e37563c3]]]
Former-commit-id: 54daec6dc6
Former-commit-id: a2309ab886cfb5a81042406997df735ce9256a80 [formerly d49314c184]
Former-commit-id: 57bc235dbd
 2013-04-04 13:11:59 -05:00
Dustin Johnson
94002b3be9 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: af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly 3c41127c42 [formerly 375f0801a2 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]
Former-commit-id: 3c41127c42
Former-commit-id: 1aa6cc2e6bc2ae28b658d5879fe7eb65cc4a7b70 [formerly 0dc74710ce]
Former-commit-id: 9a4f4431de
 2013-04-04 13:10:24 -05:00
Richard Peter
d1369dbf29 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: 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 814bff6ddb [formerly f77948929d [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]
Former-commit-id: 814bff6ddb
Former-commit-id: ce08d17392a7953ce37dadfeeddad3576552db03 [formerly 4337abd873]
Former-commit-id: e9fe732dac
 2013-04-04 13:03:41 -05:00
Bryan Kowal
ef26170029 Issue #1750 - add clean scriptlet to pgadmin3 rpm specification 
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 978f55d007 [formerly 8c68c8f9cb] [formerly 9a082dfd10b58ca1a85b6259b5266315368b5882 [formerly bfb14b4ad6]] [formerly 24dd9b550d [formerly bfb14b4ad6 [formerly f1551ef32c5e67358a60a6ba7d1ca2344afa0829]]]
Former-commit-id: 24dd9b550d
Former-commit-id: 2e41083816bf9b61d5576a771bb66626e85ceea0 [formerly 122c085a62]
Former-commit-id: 0a801c95ce
 2013-04-04 13:03:20 -05:00
Bryan Kowal
1147a05bcf 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: ce08162045 [formerly 991de38661] [formerly a8d4e8f6ec] [formerly 3d04b0f87b [formerly a8d4e8f6ec [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]]
Former-commit-id: 3d04b0f87b
Former-commit-id: 98c4ccb22060dd1661aa24f92d73ea9c175710d4 [formerly a154e3b3cd]
Former-commit-id: a214ee536a
 2013-04-04 13:03:08 -05:00
Roger Ferrel
e1d9065706 Issue #1807 Change DbQueryHandler to include order by informaton in the query. 
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 1fb0666a69 [formerly 24e5e7ff35] [formerly 4e607bc7bf] [formerly 2cd455764b [formerly 4e607bc7bf [formerly 79d768ff4df2d866aaea4dc8d2197cf190eb2809]]]
Former-commit-id: 2cd455764b
Former-commit-id: 2c437b337b3e7accdbe6bd644d0cb84ad0153430 [formerly 97fdbb2477]
Former-commit-id: df1c674ba0
 2013-04-04 13:02:58 -05:00
Bryan Kowal
710c23bd4c Issue #1805 - slightly modified viz feature build order 
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: 685123f51d [formerly 40dd190ecf] [formerly 40a4b38929] [formerly 8187df486a [formerly 40a4b38929 [formerly 7e6ffbe4447fcaf13cae49d16038d5edfa0cdfec]]]
Former-commit-id: 8187df486a
Former-commit-id: c293c242989b735cdbe96bb812cb793e886d8b66 [formerly 3c70c5be2b]
Former-commit-id: ee25f748c1
 2013-04-04 13:02:49 -05:00
Bryan Kowal
f666b664f9 Issue #1663 - updated libpq.so for the native hydro applications 
The following commands were used to complete the update:
- tar -xpf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so*
- tar -pf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so* --delete
- rm -fv ./edex/lib/native/linux32/*.so*
- cp -Pv /awips2/psql/lib/libpq*.so* ./edex/lib/native/linux32
- tar -uf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/*.so*

Change-Id: I7315109880c4813ede4f9d87877bc3ddf20cb7f1

Former-commit-id: 1998c1e1ca [formerly d899bea93a] [formerly 7dd4a88415] [formerly 28bd0a772f [formerly 7dd4a88415 [formerly 4febb7c32a33f18f17b29a166462a34fbe60edbb]]]
Former-commit-id: 28bd0a772f
Former-commit-id: 5169277b343e4593bec81e121f48f80dc5e3b077 [formerly b6f3aecdc5]
Former-commit-id: 1b815aa845
 2013-04-04 13:01:39 -05:00
Bryan Kowal
20d58ef413 Issue #1663 - name the default geometry column 
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: f81212d444 [formerly d35246ef31] [formerly 267b2c4dfa] [formerly 37d869ef60 [formerly 267b2c4dfa [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]]
Former-commit-id: 37d869ef60
Former-commit-id: f85c6a8bcab56873e52500a8858a7ccc31a3523f [formerly 6eec333843]
Former-commit-id: 1ce9d40711
 2013-04-04 13:01:09 -05:00
Greg Armendariz
f0957645ad Merge "Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE" into development 
Former-commit-id: 88a6a8abb3 [formerly 6e0ced27dc] [formerly d6d0e0131f] [formerly 71d400e09f [formerly d6d0e0131f [formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]]
Former-commit-id: 71d400e09f
Former-commit-id: db325a9270fe94f678cb6b219d0d78c03ac26ba9 [formerly d463555ca3]
Former-commit-id: f452a4582a
 2013-04-04 13:00:39 -05:00
David Gillingham
fd639744bf 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: aaddb9cd58 [formerly 5ae3fbd325] [formerly d24fcc85e2] [formerly 56235e370f [formerly d24fcc85e2 [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]]
Former-commit-id: 56235e370f
Former-commit-id: 0808d1706a10907ff236663e85686c504930a1cb [formerly 60e8146a18]
Former-commit-id: b97b1766ee
 2013-04-04 13:00:36 -05:00
Bryan Kowal
d6b11bacf0 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: 321660e016 [formerly 211307edfd] [formerly 9e99447eee] [formerly 4fd4786ae5 [formerly 9e99447eee [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]]
Former-commit-id: 4fd4786ae5
Former-commit-id: dced69266300d616b3126d8ab0a9ce82349c7fc0 [formerly fcc7b102ad]
Former-commit-id: d40863c38f
 2013-04-04 12:56:58 -05:00
Mike Duff
6024d7fb50 Issue #1646 - Format the output 
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: ea0cd457ac [formerly 2e424cd74a] [formerly 4ab07a31da] [formerly d5d4ed7327 [formerly 4ab07a31da [formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]]
Former-commit-id: d5d4ed7327
Former-commit-id: 44825e8261549149e51d6e8f7a6835db9fa371e9 [formerly aefbc4f54f]
Former-commit-id: 57fa0f2ef9
 2013-04-04 12:56:44 -05:00
Bryan Kowal
b4e684ad08 Issue #1864 - datadelivery and kml are now dependent on the core viz feature. 
Former-commit-id: c5afa1883b [formerly 70c8ed6bc0] [formerly 3fac666de5] [formerly 64c54f2110 [formerly 3fac666de5 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]]
Former-commit-id: 64c54f2110
Former-commit-id: 7caf86fef7ce3f92cf05af51e41bb90a5b3fbdaa [formerly 49ee55327d]
Former-commit-id: 6a66158097
 2013-04-04 12:48:59 -05:00
David Gillingham
bde4f4c03d 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: 493814adf5 [formerly 05f52e6e54] [formerly 055c36ea41] [formerly 0969f85246 [formerly 055c36ea41 [formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]]
Former-commit-id: 0969f85246
Former-commit-id: e974a975769591433b0e949683524759177531b9 [formerly 8859674c70]
Former-commit-id: 2038a703ac
 2013-04-04 12:46:21 -05:00
Bryan Kowal
9041cb18ca Issue #1750 - edexBridge will now set the QPID persistence flag 
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Conflicts:

	rpms/awips2.core/Installer.ldm/component.spec


Former-commit-id: bc227a5cb9 [formerly 6f8ef422c8] [formerly d585db3b99] [formerly 1e3e6e3f28 [formerly d585db3b99 [formerly e95b6ade25a28b440d7283b5d162ff88f3671378]]]
Former-commit-id: 1e3e6e3f28
Former-commit-id: 14e31ea1ce773ab9f5dfc2a8393ea15bfff7a2b5 [formerly fdf99a56b2]
Former-commit-id: 45ee1fd607
 2013-04-04 12:37:15 -05:00
Steve Harris
4fc654dbf8 Merge branch 'omaha_13.4.1' into development 
Former-commit-id: d331abc911 [formerly 8b5b1d286b] [formerly 56410d2a04] [formerly 731ed52cd6 [formerly 56410d2a04 [formerly 6e7c89a07a4105097de3ffa1b7522fdae93baa5b]]]
Former-commit-id: 731ed52cd6
Former-commit-id: fb00ce04ea7245e82984ca609d784ae6847ef288 [formerly a419f72b2d]
Former-commit-id: a400879732
 2013-04-04 12:01:23 -05:00
Steve Harris
bbfc0f76ef Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe]
Former-commit-id: 0f53c46d7a
 2013-04-04 11:58:50 -05:00
Steve Harris
1a2b88cd38 Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1 
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18

Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.product.awips/awips.product
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py

Former-commit-id: 55655fdab9 [formerly 3487a41532] [formerly ea34b1db1e] [formerly d98a119f4d [formerly ea34b1db1e [formerly 735ce03302b54116c8545daf043585fb16fabd11]]]
Former-commit-id: d98a119f4d
Former-commit-id: 81f4469f3483d2aa0d3f210a9122ae238b69e5a7 [formerly 1a91fd82ff]
Former-commit-id: 3ea89862c0
 2013-04-04 11:12:22 -05:00
Steve Harris
467ced2742 Merge AWIPS2 master branch (13.2.1-21) into master 
Former-commit-id: 0187ed0d28 [formerly bf8a149596] [formerly 0676aa710a] [formerly 19bb737425 [formerly 0676aa710a [formerly a5433b05559621bce842ce98f68f9fd151109531]]]
Former-commit-id: 19bb737425
Former-commit-id: 563240b9b66c1c3fb6cbe62be623fb578421eae0 [formerly 8c5538c10c]
Former-commit-id: bf75c6aa20
 2013-04-04 09:54:02 -05:00
Steve Harris
02eaa8f9be Merge branch 'master_13.2.1' into master 
Former-commit-id: 4f764d1bee [formerly c946213066] [formerly f0b9589c11] [formerly 9df0038ea3 [formerly f0b9589c11 [formerly 9d79a4e435d69849510f51b6ed8ac13f8eda438a]]]
Former-commit-id: 9df0038ea3
Former-commit-id: 869ae62b63ae4e331e1d7be46bb59b200970bb77 [formerly 10d1218035]
Former-commit-id: 18e517f361
 2013-04-04 10:51:40 -04:00
Steve Harris
527c41b81e Merge AWIPS2 master branch (13.2.1-19) into master 
All conflicts overridden by 'theirs' merge - all of AWIPS2 master

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: fcb5db91f4 [formerly 4b2462390e] [formerly 4861007a03] [formerly dab32b0413 [formerly 4861007a03 [formerly 9cab4557a50e2bcda09365a86b54e5e5613f0a57]]]
Former-commit-id: dab32b0413
Former-commit-id: 56fd104754441c4f44c1479b829750c7abdf97ba [formerly 4bb5d51847]
Former-commit-id: 8a7bb1f4c8
 2013-04-04 08:22:05 -05:00
Bryan Kowal
64dbc18c8e Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE 
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6

Former-commit-id: a8fe170b53 [formerly c448651065] [formerly 03a2e82b77] [formerly 8d3c98eb5d [formerly 03a2e82b77 [formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: fab6d44468dbf0db3894a28e8b00ea49184bb43e [formerly 5816ddaf77]
Former-commit-id: 12e9b9d75b
 2013-04-03 18:27:10 -05:00
Nate Jensen
91c6521d10 Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development 
Former-commit-id: 59f084426c [formerly f43ac8bbc3] [formerly 196012618bd9ee95a1de54a228f9df4a97196cf6 [formerly 79a9d76915]] [formerly 73d86e8926 [formerly 79a9d76915 [formerly eaabe1a4935051d003ed302de193cfb183118845]]]
Former-commit-id: 73d86e8926
Former-commit-id: 641d60c190b7ce188d34ee3d8a2f74fb6d1a5e54 [formerly c87d157cbd]
Former-commit-id: e74f83d83a
 2013-04-03 17:28:49 -05:00
Steve Harris
688327d314 13.2.1-21 baseline 
Former-commit-id: 50106822ea [formerly a86d44584d] [formerly cf6ce2cede4f08c2e7976543017c522cfdf73446 [formerly d4358b93dc]] [formerly 33bd359cfe [formerly d4358b93dc [formerly f80eddbb15e5ca1710c15d245957345d6f840546]]]
Former-commit-id: 33bd359cfe
Former-commit-id: 09e2a7d813b8cb62d46bd89be26006f9864a8721 [formerly 18d6fa4f4d]
Former-commit-id: 5c029bc4ac
 2013-04-03 18:08:41 -04:00
Steve Harris
3be498b2fc 13.2.1-20 baseline 
Former-commit-id: 3aa43b1b0d [formerly ad663b925c] [formerly 6a55bc5dff] [formerly 539faf0a71 [formerly 6a55bc5dff [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]]
Former-commit-id: 539faf0a71
Former-commit-id: 7dca551d593dd1f6e0032c2e45684997afece6da [formerly 12d4316b3a]
Former-commit-id: b062373048
 2013-04-03 18:05:39 -04:00
Steve Harris
fd2de8135b Merge branch 'master_13.2.1' into master 
'theirs merge' - took all all master_13.2.1

Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/META-INF/spring/viz.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/AbstractAliasLevelNode.java
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
	cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/Activator.java
	cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/GroupingComp.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/IStatsDisplay.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/SelectionManagerDlg.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsGraphDlg.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GridInfoDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointMetadataContainer.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	cots/org.junit/.classpath
	cots/org.junit/META-INF/MANIFEST.MF
	cots/org.junit/build.properties
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/bin/setup.env
	edexOsgi/build.edex/esb/bin/wrapper.conf
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/build.edex/esb/etc/registry.sh
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	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/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticTopoData.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/TopoAttributes.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_ECMWF-98.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_FSL-59.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NWSTG-8.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_RFC-9.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_RSMC-54.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_UKMET-74.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/AbstractPrivilegedLocalizationRequestHandler.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/StatusConstants.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/subgrid/SubGridDef.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LocalizationFile.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
	edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/NwsRoleData.java
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/UserXML.java
	edexOsgi/com.raytheon.uf.common.serialization.comm/src/com/raytheon/uf/common/serialization/comm/RequestRouter.java
	edexOsgi/com.raytheon.uf.common.sounding/utility/edex_static/base/python/RaobPyUtil.py
	edexOsgi/com.raytheon.uf.common.stats/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/AggregateRecord.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/GraphDataRequest.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/DataPoint.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/GraphData.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsBin.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsData.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/data/StatsEventData.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/util/UnitUtils.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/AbstractTimer.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/ITimer.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimerImpl.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
	edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
	edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/utility/common_static/base/roles/userRoles.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/data/StatsDataAccumulator.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/util/Archiver.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/util/ConfigLoader.java
	edexOsgi/com.raytheon.uf.edex.stats/utility/edex_static/base/stats/edexProcessStats.xml
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	ncep/gov.noaa.nws.ncep.viz.gempak.nativelib.linux32/libgpk_logs.so
	ncep/gov.noaa.nws.ncep.viz.gempak.nativelib.linux32/libgpk_nologs.so
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py

Former-commit-id: 9379905195 [formerly 953d1697a9] [formerly 8bf7abcd71] [formerly 04d398beb4 [formerly 8bf7abcd71 [formerly c5f3a5bc748e16681283e12823a254376e307c66]]]
Former-commit-id: 04d398beb4
Former-commit-id: 60b1575b82af8fe5f398bec6e14787f0de50259b [formerly 1801c8a0c9]
Former-commit-id: 29d0a059dd
 2013-04-03 17:38:24 -04:00
Steve Harris
b6f53af0bf Merge branch 'master_13.1.2' into master 
'theirs merge' - took all of master_13.1.2

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.parameter/build.properties
	edexOsgi/com.raytheon.uf.common.spatial/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml

Former-commit-id: 7a9ad0392e [formerly ec6f65d581] [formerly 20349e11b0] [formerly 4ff8c8967a [formerly 20349e11b0 [formerly b656a1ed430a571fbda029479ff457bb4405efc0]]]
Former-commit-id: 4ff8c8967a
Former-commit-id: e9b03748c5b3a0ff74a2cebeae786a2a00a71ef0 [formerly 6282e0fd39]
Former-commit-id: 49649155f2
 2013-04-03 17:17:32 -04:00
Steve Harris
b2de6fd4c1 Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1 
Former-commit-id: 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]
Former-commit-id: 327d05f3b5
Former-commit-id: 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456]
Former-commit-id: 0342b648b6
 2013-04-03 15:52:19 -05:00
Ron Anderson
0acc778948 Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1 
Former-commit-id: 492587b91c [formerly b880af3c48] [formerly de856db77a] [formerly c82968c1e6 [formerly de856db77a [formerly 53ace4843058424627c3b670caa77972ddbe01be]]]
Former-commit-id: c82968c1e6
Former-commit-id: d6c6f95496edc22dcabb64db1fe0138d9b9dfabb [formerly 237e414b5d]
Former-commit-id: a633b96fdf
 2013-04-03 15:25:52 -05:00
Richard Peter
dcc6ca7202 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: 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 6d73e25290 [formerly d282a49b6f [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]
Former-commit-id: 6d73e25290
Former-commit-id: dc7cbd6d3f910f10adee39b3fe760360f1e82888 [formerly 64dc5c4d23]
Former-commit-id: 8ac6ae3539
 2013-04-03 15:14:17 -05:00
Richard Peter
bddc4b1bdf Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1 
Former-commit-id: f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly cbbd9ab90d [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]
Former-commit-id: cfcacd20e9
Former-commit-id: a8e4b972144335b974c48d4fadd8845f75b550f0 [formerly 58908a0fd7]
Former-commit-id: d973d83519
 2013-04-03 15:13:26 -05:00
Steve Harris
a196ebc11b 13.3.1-18 baseline 
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]
Former-commit-id: 0edd049e3b
 2013-04-03 14:58:29 -05:00
Nate Jensen
62eb52e295 Issue #1855 fix python threading in GFE procedures and smart tools 
Change-Id: I6420338991c1961ce63ff944b516925f83a12994

Former-commit-id: 52e83d902b [formerly 5c830c3c9c] [formerly e3462292ab] [formerly fe24e34163 [formerly e3462292ab [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]]
Former-commit-id: fe24e34163
Former-commit-id: 27fc586eb36f76446b7be74d68ec2819f9554038 [formerly e18e798a94]
Former-commit-id: 1c6643e7de
 2013-04-03 14:33:24 -05:00
Lee Venable
49fc55ce03 Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1 
Former-commit-id: bd785bf5a4 [formerly c8549e67d6] [formerly 3c5ad3f05ae8b9a69baf559e5cc805bf532d11ce [formerly 40b8ecf27d]] [formerly ff910d99fc [formerly 40b8ecf27d [formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]]
Former-commit-id: ff910d99fc
Former-commit-id: dc127c10f9c848a58411f7df06f86982131e3a2d [formerly 36a15b3be1]
Former-commit-id: 3d129d4526
 2013-04-03 14:14:41 -05:00
Nate Jensen
0a783718a9 Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1 
Former-commit-id: 3334d9b065 [formerly a109ec4601] [formerly dbbad421db] [formerly 1bc148b468 [formerly dbbad421db [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]]
Former-commit-id: 1bc148b468
Former-commit-id: 61a33575090f1b95703ee5ebf2af09b0f2f1fa1c [formerly ec8cdfd8f0]
Former-commit-id: 2d4dc636ce
 2013-04-03 14:13:14 -05:00
Nate Jensen
10b70e4222 Issue #1562 max's fix for topo with custom colormaps 
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: 869f5498f6 [formerly d64e0a2a39] [formerly 057a929903] [formerly 6c711f037c [formerly 057a929903 [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]
Former-commit-id: 6c711f037c
Former-commit-id: a8d505a73fefb71d965eb0d0a4c7619632647528 [formerly 616612e550]
Former-commit-id: 6ca17c5a2a
 2013-04-03 14:10:53 -05:00
Bryan Kowal
ea6a9687f7 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: 981638c532 [formerly d1663ea98b] [formerly e788c7b471] [formerly ee8c99ef6e [formerly e788c7b471 [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]]
Former-commit-id: ee8c99ef6e
Former-commit-id: 75de255c33338b2c6a36abb8a97bd7559baa6968 [formerly 344237d9ee]
Former-commit-id: b60bea920c
 2013-04-03 14:03:54 -05:00