Commit graph

2280 commits

Author SHA1 Message Date
Roger Ferrel
d61226e023 Issue #1790 Fix dialog in current phase.
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b

Former-commit-id: a0a86f9b13 [formerly d69674d595] [formerly a0a86f9b13 [formerly d69674d595] [formerly 1093c020e6 [formerly 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54]]]
Former-commit-id: 1093c020e6
Former-commit-id: f66a80a2ae [formerly 68ba7cab75]
Former-commit-id: d504643687
2013-03-27 14:11:36 -05:00
Nate Jensen
614a1f7738 Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
Former-commit-id: 7f5b3d6f84 [formerly faf937d3b0] [formerly 7f5b3d6f84 [formerly faf937d3b0] [formerly f8e5534417 [formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]]
Former-commit-id: f8e5534417
Former-commit-id: ccf6175c43 [formerly a7548df695]
Former-commit-id: 9c7466b8e9
2013-03-27 11:32:19 -05:00
Nate Jensen
782c4b63dd Merge "Issue #1735 Performance improvments for LLWSData." into development
Former-commit-id: 5624e303a8 [formerly ff7631d847] [formerly 5624e303a8 [formerly ff7631d847] [formerly b44db0bc2c [formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]]
Former-commit-id: b44db0bc2c
Former-commit-id: 6d32957638 [formerly 314c5dcb2e]
Former-commit-id: 9353bd7d8b
2013-03-26 16:28:38 -05:00
Steve Harris
0bd1d5bdef Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 4e54025fcd [formerly 5fcfaf4360] [formerly 4e54025fcd [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]
Former-commit-id: 65df96a419
Former-commit-id: 5bb29627dc [formerly 346b97a39a]
Former-commit-id: fdd07bd72c
2013-03-26 12:47:40 -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
Steve Harris
f2c2f57cdd Merge "Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
Former-commit-id: 9ed8f85b79 [formerly 1f28f6b807] [formerly 9ed8f85b79 [formerly 1f28f6b807] [formerly 305994e220 [formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]]
Former-commit-id: 305994e220
Former-commit-id: ee009dc2d8 [formerly b1071636a7]
Former-commit-id: 74c886b604
2013-03-26 12:27:54 -05:00
David Gillingham
ebfc7f22b2 Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb

Former-commit-id: 6fe3d5dc28 [formerly c5c7e31983] [formerly 6fe3d5dc28 [formerly c5c7e31983] [formerly 54511a95db [formerly 497aa460d6119f13bf6870b78454237252b68752]]]
Former-commit-id: 54511a95db
Former-commit-id: 040dc9075c [formerly 6188c8bd40]
Former-commit-id: 9dd92e0fd2
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
d523d6371e Issue #1782 fix merge problems related to graphics API.
Former-commit-id: 0aad550439 [formerly 2b898e58c7] [formerly 0aad550439 [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]]
Former-commit-id: 6edee13cdd
Former-commit-id: f983e5d705 [formerly 76a6213807]
Former-commit-id: 3dbd9580c5
2013-03-26 12:06:45 -05:00
Ron Anderson
1c44fa5d4a Merge "Issue #1823: Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
Former-commit-id: f272034fde [formerly 57c919bc7b] [formerly f272034fde [formerly 57c919bc7b] [formerly f65989454a [formerly 735c64e77a704ceae7f1a025c9cfc442f48f207e]]]
Former-commit-id: f65989454a
Former-commit-id: 758b81f9a2 [formerly 510b090090]
Former-commit-id: 160779e86f
2013-03-26 11:33:15 -05:00
Richard Peter
4af3d6dafe Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development
Former-commit-id: 260b159f1b [formerly 0f15b13b86] [formerly 260b159f1b [formerly 0f15b13b86] [formerly f062e43f8c [formerly 6c2e1cc597e14997f59c52c344ca7558139f2333]]]
Former-commit-id: f062e43f8c
Former-commit-id: 88b147cb1b [formerly 02ecf31edb]
Former-commit-id: 323d0f69a6
2013-03-26 10:53:50 -05:00
Ben Steffensmeier
5e582f019c Issue #1821 Optimize FFG version query.
Former-commit-id: 54b9d0d949 [formerly 3049bc94c9] [formerly 54b9d0d949 [formerly 3049bc94c9] [formerly 7bde9f6d32 [formerly 6d75a1b79cfd46de69db2d3cb452711f3ea1254d]]]
Former-commit-id: 7bde9f6d32
Former-commit-id: ae27d029a1 [formerly 39259b1b0b]
Former-commit-id: 1ef06166db
2013-03-26 10:37:40 -05:00
David Gillingham
3b29423947 Issue #1823: Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: ad357638b3 [formerly 1df8d39919] [formerly ad357638b3 [formerly 1df8d39919] [formerly bebfc60317 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]]
Former-commit-id: bebfc60317
Former-commit-id: bf196a7782 [formerly 07487a27dc]
Former-commit-id: 45bf26aa00
2013-03-26 10:33:42 -05:00
Steve Harris
feba54ac83 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b0621d90bc [formerly fd71e44f0f] [formerly b0621d90bc [formerly fd71e44f0f] [formerly a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 02105701a0 [formerly e96e95b565]
Former-commit-id: e6ab1deba2
2013-03-26 10:12:34 -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
Ron Anderson
3750bb7dba Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
Former-commit-id: 6ab9303526 [formerly f4f180face] [formerly 6ab9303526 [formerly f4f180face] [formerly 73678261b6 [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]
Former-commit-id: 73678261b6
Former-commit-id: e4c4862938 [formerly 7e6b601a09]
Former-commit-id: 60c1c27225
2013-03-25 17:53:46 -05:00
Lee Venable
e03985901f Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: a84ef2d2c3 [formerly e467daec0c] [formerly a84ef2d2c3 [formerly e467daec0c] [formerly 05b4c2f913 [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]]
Former-commit-id: 05b4c2f913
Former-commit-id: b1ce5603a0 [formerly d73b44fa67]
Former-commit-id: b329abb111
2013-03-25 17:20:25 -05:00
Lee Venable
cde556ff50 Merge "Issue #1781 - Constrain the tabular TS query by time." into omaha_13.3.1
Former-commit-id: 952a8073fd [formerly 74188d09ad] [formerly 952a8073fd [formerly 74188d09ad] [formerly d10f1c818d [formerly f0ed09e300f81dcf425df64aefcd33b670b7bdd5]]]
Former-commit-id: d10f1c818d
Former-commit-id: aa4aecec66 [formerly a444924a18]
Former-commit-id: 78c361f7a8
2013-03-25 17:02:06 -05:00
Bryan Kowal
2d5d41e214 Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 233f2c54be [formerly c3936dd50e] [formerly 233f2c54be [formerly c3936dd50e] [formerly 21fa510eaa [formerly c96c45074c220140b8774e1fceeab2b79820f033]]]
Former-commit-id: 21fa510eaa
Former-commit-id: f8fafc8d4a [formerly db39a45c88]
Former-commit-id: 01d571a088
2013-03-25 16:52:33 -05:00
Mike Duff
ac7bb442f4 Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: 3d783c54be [formerly afd0de8b5b] [formerly 3d783c54be [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]]
Former-commit-id: 88e75f4a90
Former-commit-id: fc0b126eee [formerly b517ce9a9f]
Former-commit-id: 9a9d8f0503
2013-03-25 16:03:18 -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
Max Schenkelberg
7c4be8a559 Issue #1638 Made Map scales more generalized for use outside of D2D
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: dabffdbf79 [formerly fd375314cd] [formerly dabffdbf79 [formerly fd375314cd] [formerly e17d691400 [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]]
Former-commit-id: e17d691400
Former-commit-id: 8d1b555c39 [formerly 36e80c267e]
Former-commit-id: 237c742d44
2013-03-25 15:38:36 -05:00
Richard Peter
af956fe92d Merge "Issue #1802 Refactored DD transaction management" into development
Former-commit-id: b3631390d2 [formerly c3268aa02c] [formerly b3631390d2 [formerly c3268aa02c] [formerly 5c92140024 [formerly b8516f99386ded052745e766911094edfd57d7ec]]]
Former-commit-id: 5c92140024
Former-commit-id: 072bc7affc [formerly 351f08dba3]
Former-commit-id: bcb5b0b73e
2013-03-25 15:37:18 -05:00
Bryan Kowal
d5c958b2f8 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: 09263dbf8c [formerly 9e647beded] [formerly 09263dbf8c [formerly 9e647beded] [formerly 6758a9a50d [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]]
Former-commit-id: 6758a9a50d
Former-commit-id: 1eba8622d4 [formerly 4c02dabb3d]
Former-commit-id: e41f926ac2
2013-03-25 15:23:32 -05:00
Bryan Kowal
3728413ecf 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: 541d096faf [formerly c55efaadb0] [formerly 541d096faf [formerly c55efaadb0] [formerly a6cd17feeb [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]]
Former-commit-id: a6cd17feeb
Former-commit-id: 2093c6a495 [formerly c4cec34e47]
Former-commit-id: 99a3e25b3d
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
5e50d32bdb Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 4675bed4c2 [formerly b10b1150be] [formerly 4675bed4c2 [formerly b10b1150be] [formerly af05feb5a7 [formerly 534777d96a45b275abd9cc26818b7df200974595]]]
Former-commit-id: af05feb5a7
Former-commit-id: 541646148b [formerly 4d1a8805ab]
Former-commit-id: c250bda12b
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
7a334d3417 Issue #1821 Reshape grib data arrays in place to improve performance.
Former-commit-id: 5d01725fea [formerly 4621133ff1] [formerly 5d01725fea [formerly 4621133ff1] [formerly 75c8d46901 [formerly 30354883c5dff0fdbf196e7f405525451df1e81e]]]
Former-commit-id: 75c8d46901
Former-commit-id: e722fa0723 [formerly 04028b0136]
Former-commit-id: c48c98266d
2013-03-25 15:09:23 -05:00
Ben Steffensmeier
0e7c26008d Issue #1821 Make grib2 decoding more multithreaded
Former-commit-id: 842ee7a78f [formerly f824e298b6] [formerly 842ee7a78f [formerly f824e298b6] [formerly cf7d8378dd [formerly 4441b32d3ec153a2cf767b8e109c014f9efc3ed8]]]
Former-commit-id: cf7d8378dd
Former-commit-id: 53b0411753 [formerly f61630599f]
Former-commit-id: 35ecc7cbd2
2013-03-25 14:48:42 -05:00
Richard Peter
917621b347 Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development
Former-commit-id: c7dd6365d2 [formerly 7b8931ed16] [formerly c7dd6365d2 [formerly 7b8931ed16] [formerly 3239c176fa [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]]
Former-commit-id: 3239c176fa
Former-commit-id: 516bb024bb [formerly 911a371329]
Former-commit-id: fecf49708c
2013-03-25 14:45:06 -05:00
Jonathan Sanchez
d50e3af938 Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: 3ca4cc9dcf [formerly 06cd161d0e] [formerly 3ca4cc9dcf [formerly 06cd161d0e] [formerly ddcb4f3451 [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]]
Former-commit-id: ddcb4f3451
Former-commit-id: cd1095fb29 [formerly c9295e6762]
Former-commit-id: dad851857d
2013-03-25 14:41:55 -05:00
Lee Venable
efc8488ca4 Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
Former-commit-id: 5d7055ad53 [formerly 25cf1cacfd] [formerly 5d7055ad53 [formerly 25cf1cacfd] [formerly d1c84de620 [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]]
Former-commit-id: d1c84de620
Former-commit-id: 4caa21aa69 [formerly fc41aa82ca]
Former-commit-id: cc0debe027
2013-03-25 14:08:39 -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
72151c0e6a 13.3.1-11 baseline
Former-commit-id: 2edab61540 [formerly 9cdd90e382] [formerly 2edab61540 [formerly 9cdd90e382] [formerly 373d13df39 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]]
Former-commit-id: 373d13df39
Former-commit-id: 11baf4c2f0 [formerly d868003067]
Former-commit-id: b5e3a7dda6
2013-03-25 13:20:03 -05:00
Lee Venable
a2721b2b1f Merge "Issue #1818 - Added an isDisposed check to the Attributes Dialog open action" into omaha_13.3.1
Former-commit-id: ccceb78dbb [formerly 65c2791e1a] [formerly ccceb78dbb [formerly 65c2791e1a] [formerly 5c661c1891 [formerly e0923bcf2c95de163118e2f8f6667f9c84df1cb2]]]
Former-commit-id: 5c661c1891
Former-commit-id: 4177573a65 [formerly 531e26e097]
Former-commit-id: 1ffc4943b8
2013-03-25 12:53:10 -05:00
Jonathan Sanchez
08c9302110 Issue #1810 Accepted other values/types for useDirs.
Former-commit-id: 2d6be3d3da [formerly d00c88a38c] [formerly 2d6be3d3da [formerly d00c88a38c] [formerly b77ed18eb4 [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]]
Former-commit-id: b77ed18eb4
Former-commit-id: e01d47acfa [formerly 539c4dfa8e]
Former-commit-id: 6e02206355
2013-03-25 12:23:51 -05:00
Mike Duff
e126320f82 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: 86e0184414 [formerly 593cb668bf] [formerly 86e0184414 [formerly 593cb668bf] [formerly 7118f04843 [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]]
Former-commit-id: 7118f04843
Former-commit-id: fcb46897e3 [formerly c682fb2e9a]
Former-commit-id: 516965bea3
2013-03-24 12:21:51 -05:00
Dave Hladky
20a24d3e8c Issue #1813 Stats for FFMP were broken by memory updates.
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58

Former-commit-id: dee8d745a3 [formerly a53797bc2f] [formerly dee8d745a3 [formerly a53797bc2f] [formerly f2e13c8078 [formerly 314ec2517a0c5565f8423661cb744e04953f1830]]]
Former-commit-id: f2e13c8078
Former-commit-id: a997706b72 [formerly 05ae375e08]
Former-commit-id: fc7c4f2d90
2013-03-22 16:37:20 -05:00
Richard Peter
1084723e4b Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development
Former-commit-id: bb2be2d6a7 [formerly 1b7e9e41ce] [formerly bb2be2d6a7 [formerly 1b7e9e41ce] [formerly 3de0400969 [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]]
Former-commit-id: 3de0400969
Former-commit-id: d1b4d899be [formerly 50254dc8d1]
Former-commit-id: 66a28e9315
2013-03-22 16:26:52 -05:00
Dave Hladky
4eec5881e9 Issue #1817 BOX issue with only having HUC0 in template
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8

Former-commit-id: c2b9bd1024 [formerly 58a37d1e44] [formerly c2b9bd1024 [formerly 58a37d1e44] [formerly d114302b06 [formerly f0641a4771b6816944f38d1ec51b0356b983e2f4]]]
Former-commit-id: d114302b06
Former-commit-id: 150cd54602 [formerly 3cdd8f8ed2]
Former-commit-id: bc2a1a20e1
2013-03-22 16:21:45 -05:00
Dustin Johnson
eb0f12b15f Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
Former-commit-id: f5cc517f9a [formerly dcfbb43eb3] [formerly f5cc517f9a [formerly dcfbb43eb3] [formerly 8651ca3d76 [formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]]
Former-commit-id: 8651ca3d76
Former-commit-id: c55f2ce559 [formerly 0596d43d99]
Former-commit-id: dcc7e44250
2013-03-22 15:28:57 -05:00
Dustin Johnson
087e01d4e4 Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
Former-commit-id: ec42bd63ad [formerly 11478e870d] [formerly ec42bd63ad [formerly 11478e870d] [formerly ed017996a0 [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]]
Former-commit-id: ed017996a0
Former-commit-id: f274b8cd5b [formerly 9e63142576]
Former-commit-id: e4c51bad63
2013-03-22 15:28:20 -05:00
Max Schenkelberg
3ba217badb Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 07ae94c499 [formerly ea26d0de84] [formerly 07ae94c499 [formerly ea26d0de84] [formerly 126be0cfe5 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]
Former-commit-id: 126be0cfe5
Former-commit-id: 850c8995cc [formerly d20958ae92]
Former-commit-id: 34134b3c62
2013-03-22 10:54:44 -05:00
David Gillingham
75a6163bf3 Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 8438c5af87 [formerly 79a1520baf] [formerly 8438c5af87 [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: c8c7fb4129 [formerly c3ce4058a0]
Former-commit-id: 7a2c92efc7
2013-03-22 10:39:13 -05:00
Dustin Johnson
0c92ddab72 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 6fc42b0791 [formerly 8956d1ac17] [formerly 6fc42b0791 [formerly 8956d1ac17] [formerly 04cbd3a24e [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 53291f7130 [formerly 1b1bd69b89]
Former-commit-id: e39187c0ce
2013-03-22 10:04:21 -05:00
Lee Venable
9af40169f9 Merge "Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures. Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51" into omaha_13.3.1
Former-commit-id: 5c8230662d [formerly 489e04c235] [formerly 5c8230662d [formerly 489e04c235] [formerly c8523e9108 [formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]]
Former-commit-id: c8523e9108
Former-commit-id: a2e5e18810 [formerly 0d1cba8eae]
Former-commit-id: c733749c9f
2013-03-21 19:27:02 -05:00
Richard Peter
3a0627b5d1 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: ead48007cb [formerly 9fdeb37a48] [formerly ead48007cb [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: 4b386ccd1c [formerly 704bc86cf5]
Former-commit-id: 1cb743c14a
2013-03-21 18:21:53 -05:00
Nate Jensen
5f11e7d243 Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development
Former-commit-id: 5728a3e5b6 [formerly e4c1e86d55] [formerly 5728a3e5b6 [formerly e4c1e86d55] [formerly 44f8ba8943 [formerly 805fae0df3b82e1e16a931741d22bf7637e6aa06]]]
Former-commit-id: 44f8ba8943
Former-commit-id: fa0d772221 [formerly 84e8a30ad7]
Former-commit-id: 4a8974e6a0
2013-03-21 17:06:37 -05:00
Dustin Johnson
4d41fca019 Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
Amend:
  Add constant for "CAVE".
  Add preconditions on creating a subscription.

Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae

Former-commit-id: bd58534855 [formerly f8870c8946] [formerly bd58534855 [formerly f8870c8946] [formerly c4d4e37cad [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]]
Former-commit-id: c4d4e37cad
Former-commit-id: 09d1d7b6cf [formerly d58306a92e]
Former-commit-id: 0f4ec00790
2013-03-21 16:14:49 -05:00
Nate Jensen
0d0a93dd1c Merge "Issue #1808 perspective specific actions take priority" into development
Former-commit-id: 113da23467 [formerly d6d7b081cf] [formerly 113da23467 [formerly d6d7b081cf] [formerly 255b2dbd29 [formerly 0c710437147f3a1b242f93a4c63c2451d5724f3e]]]
Former-commit-id: 255b2dbd29
Former-commit-id: 7ce724d4fd [formerly 7821b86e87]
Former-commit-id: 5d0194d7a3
2013-03-21 15:07:57 -05:00
Greg Armendariz
f9d1bfbb48 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
Former-commit-id: 1e1aea8a40 [formerly 6af1a22e56] [formerly 1e1aea8a40 [formerly 6af1a22e56] [formerly 85113a66b6 [formerly 7403214a115b0b856f94da1e86288307af952d77]]]
Former-commit-id: 85113a66b6
Former-commit-id: 1884b6dce3 [formerly ccabddace6]
Former-commit-id: 559136f546
2013-03-21 12:55:59 -05:00