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

135 commits

Author SHA1 Message Date
Greg Armendariz
df0146764b 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: 6e0ced27dc [formerly d6d0e0131f] [formerly 6e0ced27dc [formerly d6d0e0131f] [formerly 71d400e09f [formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]]
Former-commit-id: 71d400e09f
Former-commit-id: f452a4582a [formerly d463555ca3]
Former-commit-id: d176c441e7
 2013-04-04 13:00:39 -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
Bryan Kowal
6032a8dd0c 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: c448651065 [formerly 03a2e82b77] [formerly c448651065 [formerly 03a2e82b77] [formerly 8d3c98eb5d [formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: 12e9b9d75b [formerly 5816ddaf77]
Former-commit-id: bd47c62789
 2013-04-03 18:27:10 -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
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
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
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
Steve Harris
53ee0151ca Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 069ee8a748 [formerly 9a321b6ac8] [formerly 069ee8a748 [formerly 9a321b6ac8] [formerly 3073951b3d [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]
Former-commit-id: 3073951b3d
Former-commit-id: 6e48567370 [formerly a4bf236cc7]
Former-commit-id: 90ec2d3fbf
 2013-03-27 22:16:15 -05:00
Steve Harris
f59f1f02b0 13.3.1-14 baseline 
Former-commit-id: 91a5e4578e [formerly 9022c500ce] [formerly 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 936e4adda2 [formerly 2ca160caf0]
Former-commit-id: 8237fdadaa
 2013-03-27 17:59:34 -05:00
Nate Jensen
2fe6904a03 Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1 
Former-commit-id: 807d8773ad [formerly f3fd91c311] [formerly 807d8773ad [formerly f3fd91c311] [formerly c895ee60fa [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]]
Former-commit-id: c895ee60fa
Former-commit-id: 30bd797879 [formerly 5701030750]
Former-commit-id: 79fddbcbf5
 2013-03-26 16:15:27 -05:00
Ben Steffensmeier
8d88fa1ba9 Issue #1791 Fix problems in SmartScript when there is no data. 
Former-commit-id: 9d9443644c [formerly 6870045005] [formerly 9d9443644c [formerly 6870045005] [formerly 18311b0d18 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]]
Former-commit-id: 18311b0d18
Former-commit-id: 6d17d01f8c [formerly 69879c51df]
Former-commit-id: b76bdc602d
 2013-03-26 14:46:11 -05:00
Steve Harris
0d88cd619b Merge branch 'master_13.3.1' into omaha_13.3.1 
Former-commit-id: 85104939ac [formerly e71c69c383] [formerly 85104939ac [formerly e71c69c383] [formerly 9ff8a94193 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 02147470db [formerly b926ff60b3]
Former-commit-id: 779adedea9
 2013-03-26 12:44:24 -05:00
Steve Harris
25a851cccf 13.3.1-13 baseline 
Former-commit-id: 792171756f [formerly c77a452f5a] [formerly 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]
Former-commit-id: c65f3e68e5
Former-commit-id: 4f2e9aec0d [formerly 822d05a709]
Former-commit-id: 7aa4f7b265
 2013-03-26 12:43:07 -05:00
Mike Duff
493014d466 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: c1f7d33bb8 [formerly 5d72795e1b] [formerly c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: b366778df0 [formerly 4c3011edce]
Former-commit-id: efec4d0365
 2013-03-26 09:19:39 -05:00
Roger Ferrel
b27d35b29c Issue #1735 Performance improvments for LLWSData. 
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f

Former-commit-id: b5fc495b61 [formerly feadd01ad9] [formerly b5fc495b61 [formerly feadd01ad9] [formerly 549650c05c [formerly 0c067f6bd45f0474708af1715278d21a2a963868]]]
Former-commit-id: 549650c05c
Former-commit-id: 912e5020d7 [formerly daecc7b7f4]
Former-commit-id: 7259166afe
 2013-03-25 15:41:01 -05:00
Steve Harris
120fc26670 13.3.1-12 baseline 
Former-commit-id: be96282207 [formerly 0be473728a] [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: f80f98cee2 [formerly bc439aee4f]
Former-commit-id: f1d156779a
 2013-03-25 13:27:13 -05:00
Steve Harris
961c0b56a7 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 0055a3213d [formerly e2496455b2] [formerly 0055a3213d [formerly e2496455b2] [formerly 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]
Former-commit-id: 0379be06d2
Former-commit-id: 8db98c2d71 [formerly 4fc2bb7bba]
Former-commit-id: a91fcf98a2
 2013-03-20 16:09:26 -05:00
Steve Harris
c129fed15e Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: a9ced3a7ef [formerly fa15f03e1b] [formerly a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: dc419068f0
Former-commit-id: f4e26fd94d [formerly 31044eabd1]
Former-commit-id: 8065161896
 2013-03-20 16:06:20 -05:00
Steve Harris
e6ab10cc26 13.3.1-10 baseline 
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: e9f0328808 [formerly 7c2e617d26]
Former-commit-id: f2cc967a4f
 2013-03-20 15:53:01 -05:00
Steve Harris
352c267fc9 Merge branch 'omaha_13.3.1' into development 
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: 310474ae9b [formerly 36df63be5c] [formerly 310474ae9b [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]
Former-commit-id: cb5ea76f98
Former-commit-id: d00dc0d174 [formerly 104e6e79e8]
Former-commit-id: 6d4512fa3a
 2013-03-20 13:45:11 -05:00
Dave Hladky
1aef08f449 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: dc7b231bf0 [formerly 90f7f2110b] [formerly dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: 01c6ff12a0 [formerly bd17b99bd1]
Former-commit-id: 8299b2872a
 2013-03-20 12:41:33 -05:00
Steve Harris
37beeaab69 13.3.1-9 baseline 
Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 7e96d841d9 [formerly 0375805e79]
Former-commit-id: 65f522fc87
 2013-03-19 14:22:56 -05:00
Bryan Kowal
50e884aab0 Issue #1805 - slightly modified viz feature build order 
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: 6106369d4c [formerly f325038538] [formerly 6106369d4c [formerly f325038538] [formerly f0eb7d3285 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]]
Former-commit-id: f0eb7d3285
Former-commit-id: fd68cd7a04 [formerly 54113e9b29]
Former-commit-id: 959e8b717f
 2013-03-18 18:15:26 -05:00
Steve Harris
481cee4c74 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 2a26783ba7 [formerly 900b9aadde]
Former-commit-id: 22bb7ecd33
 2013-03-18 16:52:00 -05:00
Steve Harris
9d4d1baefe Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
 2013-03-18 16:43:22 -05:00
Bryan Kowal
81ebbd5a5b Issue #1741 - what was once two is now one 
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: a93dcff1b5 [formerly b954bc17bf] [formerly a93dcff1b5 [formerly b954bc17bf] [formerly 7fd035256d [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]
Former-commit-id: 7fd035256d
Former-commit-id: 3e8d5449fc [formerly 66e2ed79ec]
Former-commit-id: 56f2b3f0c2
 2013-03-18 16:36:33 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline 
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
 2013-03-18 15:43:32 -05:00
Ben Steffensmeier
41e3ac3923 Issue #1793 Performance improvements for TCMWindTool 
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e

Former-commit-id: 7335a2336e [formerly 7aa8b2d3eb] [formerly 7335a2336e [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 055873318a368301fc966501b27001f5ace0bcae]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: e5b9e0ca46 [formerly 364d6fd9ee]
Former-commit-id: 153a7dbd7d
 2013-03-14 13:26:08 -05:00
Ron Anderson
39e2d27a89 Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1 
Former-commit-id: 0c881b4a85 [formerly 3b65608373] [formerly 0c881b4a85 [formerly 3b65608373] [formerly 61f74305e2 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]]
Former-commit-id: 61f74305e2
Former-commit-id: de14cd0baa [formerly a7b6e1689b]
Former-commit-id: b1088415cd
 2013-03-13 17:16:37 -05:00
Ben Steffensmeier
f012dd8b0a Issue #1791 Implement bulk getGrids to improve performance. 
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: 37bae0988b [formerly 4c150b0fd6] [formerly 37bae0988b [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]
Former-commit-id: 89eb902284
Former-commit-id: f5680beaa9 [formerly 7abf3cfb39]
Former-commit-id: 6d699f7713
 2013-03-13 17:09:20 -05:00
Dave Hladky
b85e19282b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 9e97fc9efe [formerly 160e1594b8]
Former-commit-id: cb5ee4a7b8
 2013-03-13 13:56:33 -05:00
Steve Harris
88b28c39c1 13.3.1-7 baseline 
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: ed5f1dbab6 [formerly 31c0a97dca]
Former-commit-id: 3084a860cd
 2013-03-13 09:50:28 -05:00
Steve Harris
346b22b196 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: bca46a1354 [formerly d5bcdb0015]
Former-commit-id: 5232592cfa
 2013-03-12 16:04:23 -05:00
Dave Hladky
cdfbcc7136 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: 155903d135 [formerly 6ea95002de]
Former-commit-id: 29ed641a13
 2013-03-12 15:48:34 -05:00
Steve Harris
c28f3aeb02 13.3.1-6 baseline 
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b]
Former-commit-id: c6f379f59a
 2013-03-12 08:35:45 -05:00
Roger Ferrel
241dfb9451 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. 
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 70bd9aafa7 [formerly 4deb731bd0] [formerly 70bd9aafa7 [formerly 4deb731bd0] [formerly b421c97d86 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: 0deb290c24 [formerly 334f2c4a57]
Former-commit-id: 0bbe51355e
 2013-03-11 13:00:44 -05:00
Roger Ferrel
408663b2b4 Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. 
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: a73687c1b8 [formerly 6744238fce] [formerly a73687c1b8 [formerly 6744238fce] [formerly 9e8472bab6 [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]]
Former-commit-id: 9e8472bab6
Former-commit-id: 7e5bb824d9 [formerly 3684c7efed]
Former-commit-id: a8436c76ad
 2013-03-11 11:16:22 -05:00
Steve Harris
2b489e4e40 Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec [formerly b9563da8a8]
Former-commit-id: 46d0c9fcee
 2013-03-05 12:29:44 -06:00
Richard Peter
80eafa9676 Issue #1740: Baseline cave monitoring script 
Former-commit-id: 1632bd2882 [formerly 163fb343de] [formerly 1632bd2882 [formerly 163fb343de] [formerly 783e9c1a25 [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]]
Former-commit-id: 783e9c1a25
Former-commit-id: e00d5344b1 [formerly 94d804a301]
Former-commit-id: 9c63bea9d2
 2013-03-01 16:17:25 -06:00
Bryan Kowal
4d50fec21f Issue #1739 - updates for recent CAVE and EDEX feature-refactoring 
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: f806c880d3 [formerly d081a2afcd] [formerly f806c880d3 [formerly d081a2afcd] [formerly 4faf8aefbe [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: c4709b1bfb [formerly 497bf33892]
Former-commit-id: cb5a2677b9
 2013-02-28 18:09:25 -06:00
Bryan Kowal
300e29bd30 Issue #1638 - fix the build; temporarily copy features that are not built until the build 
is capable of resolving its own dependencies.

Change-Id: Id6f31f6428178bf2174079e53f32ca522eeaa445

Former-commit-id: c099bc0df8 [formerly 30f59c4bcc] [formerly c099bc0df8 [formerly 30f59c4bcc] [formerly 4f30dbb2b8 [formerly e2c597978c6559a4ef1d5eebb00328584745dae1]]]
Former-commit-id: 4f30dbb2b8
Former-commit-id: ecda5fe131 [formerly 6a298318c5]
Former-commit-id: 7354f94d74
 2013-02-28 10:02:40 -06:00
Max Schenkelberg
3dcfc90510 Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance 
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 1769edc026 [formerly ec40d261e5] [formerly 1769edc026 [formerly ec40d261e5] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]
Former-commit-id: 547c593dec
Former-commit-id: fc58e7431a [formerly 13a4056335]
Former-commit-id: 0c8f3d2449
 2013-02-27 16:19:58 -06:00
Ron Anderson
59c7ee5120 Issue #1597 Code cleanup and logging improvement for GFE Performance metrics 
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: 541557e0b0 [formerly 77fbbb6a61]
Former-commit-id: 92abcad349
 2013-02-26 18:44:51 -06:00
Steve Harris
b5d9e75b95 Merge branch 'development' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
 2013-02-21 15:41:39 -06:00
Steve Harris
8c828dbd75 13.3.1-1 baseline 
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
 2013-02-20 16:19:40 -06:00
Steve Harris
77a66598fe Merge branch 'omaha_13.2.1' (13.2.1-8) into development 
Former-commit-id: c2327ce33d [formerly ea50a5db77] [formerly c2327ce33d [formerly ea50a5db77] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: 81f1fb83a0 [formerly 1c08acab38]
Former-commit-id: 5a33182da5
 2013-02-19 12:22:00 -06:00
Steve Harris
32ad300b47 13.2.1-8 baseline 
Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 8cffb55371 [formerly c6d584758f]
Former-commit-id: edac913af7
 2013-02-18 09:09:41 -06:00
Mike Duff
2aee18ea9d Issue #1584 - FFMP performance stats and performance logger 
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 897262630c [formerly 0b044dba9c] [formerly 897262630c [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 3e59308771 [formerly 079ec4b6dd]
Former-commit-id: 72f6e95a67
 2013-02-18 08:16:57 -06:00
Roger Ferrel
8e376de359 Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away. 
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8

Former-commit-id: bfb9f9f156 [formerly 2b509cf7de] [formerly bfb9f9f156 [formerly 2b509cf7de] [formerly e26689a487 [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]]
Former-commit-id: e26689a487
Former-commit-id: 951e5b237d [formerly e7bae3c272]
Former-commit-id: b47d03b1bc
 2013-02-13 16:45:52 -06:00