Commit graph

2281 commits

Author SHA1 Message Date
Roger Ferrel
391ce5687b Issue #1790 Bug fixes for ticket 1353.
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc

Former-commit-id: e0c3e3b81f679985a048047b3e5aa69992577d78
2013-03-27 16:56:17 -05:00
Roger Ferrel
1093c020e6 Issue #1790 Fix dialog in current phase.
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b

Former-commit-id: 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54
2013-03-27 14:11:36 -05:00
Nate Jensen
f8e5534417 Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
Former-commit-id: 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac
2013-03-27 11:32:19 -05:00
Nate Jensen
b44db0bc2c Merge "Issue #1735 Performance improvments for LLWSData." into development
Former-commit-id: 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa
2013-03-26 16:28:38 -05:00
Steve Harris
65df96a419 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: 99cd1f52511023794d9dcb21c68720c4e47faec5
2013-03-26 12:47:40 -05:00
Steve Harris
9ff8a94193 Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 741a32d9209897e84da068626d28c7d7af47f9c1
2013-03-26 12:44:24 -05:00
Steve Harris
c65f3e68e5 13.3.1-13 baseline
Former-commit-id: 9c263e3ffc35677d7015158e06b64f376e7f801d
2013-03-26 12:43:07 -05:00
Steve Harris
305994e220 Merge "Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
Former-commit-id: b59167da8d42b23fadd19eb8f186d992a5c68bdd
2013-03-26 12:27:54 -05:00
David Gillingham
54511a95db Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb

Former-commit-id: 497aa460d6119f13bf6870b78454237252b68752
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
6edee13cdd Issue #1782 fix merge problems related to graphics API.
Former-commit-id: 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8
2013-03-26 12:06:45 -05:00
Ron Anderson
f65989454a Merge "Issue #1823: Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
Former-commit-id: 735c64e77a704ceae7f1a025c9cfc442f48f207e
2013-03-26 11:33:15 -05:00
Richard Peter
f062e43f8c Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development
Former-commit-id: 6c2e1cc597e14997f59c52c344ca7558139f2333
2013-03-26 10:53:50 -05:00
Ben Steffensmeier
7bde9f6d32 Issue #1821 Optimize FFG version query.
Former-commit-id: 6d75a1b79cfd46de69db2d3cb452711f3ea1254d
2013-03-26 10:37:40 -05:00
David Gillingham
bebfc60317 Issue #1823: Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14
2013-03-26 10:33:42 -05:00
Steve Harris
a23cecdb26 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: d0ce26b91945ae5388028c312cbafd314d57c0e6
2013-03-26 10:12:34 -05:00
Mike Duff
9ebc7606b1 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: 98d23aed31d7226576943b6da0b1a0bcdc1eef58
2013-03-26 09:19:39 -05:00
Ron Anderson
73678261b6 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: 8394ce66975f5915fd82dbc950ce43e5db3cfbe3
2013-03-25 17:53:46 -05:00
Lee Venable
05b4c2f913 Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: 65989516cda62a95cb7b6d67bea8aa20138def2a
2013-03-25 17:20:25 -05:00
Lee Venable
d10f1c818d Merge "Issue #1781 - Constrain the tabular TS query by time." into omaha_13.3.1
Former-commit-id: f0ed09e300f81dcf425df64aefcd33b670b7bdd5
2013-03-25 17:02:06 -05:00
Bryan Kowal
21fa510eaa Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: c96c45074c220140b8774e1fceeab2b79820f033
2013-03-25 16:52:33 -05:00
Mike Duff
88e75f4a90 Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: 027807d7e4ac171498f267759a4e34f75e1e4d46
2013-03-25 16:03:18 -05:00
Roger Ferrel
549650c05c Issue #1735 Performance improvments for LLWSData.
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f

Former-commit-id: 0c067f6bd45f0474708af1715278d21a2a963868
2013-03-25 15:41:01 -05:00
Max Schenkelberg
e17d691400 Issue #1638 Made Map scales more generalized for use outside of D2D
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: 1e5812d9796a77559d70392be18619a8f7316f2d
2013-03-25 15:38:36 -05:00
Richard Peter
5c92140024 Merge "Issue #1802 Refactored DD transaction management" into development
Former-commit-id: b8516f99386ded052745e766911094edfd57d7ec
2013-03-25 15:37:18 -05:00
Bryan Kowal
6758a9a50d 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: 8c8f3437723cf8ad931d3d149d547cac82cca9fb
2013-03-25 15:23:32 -05:00
Bryan Kowal
a6cd17feeb 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: 96edb01711d6c0f33cff0bfb03bb8c681884c1b3
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
af05feb5a7 Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 534777d96a45b275abd9cc26818b7df200974595
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
75c8d46901 Issue #1821 Reshape grib data arrays in place to improve performance.
Former-commit-id: 30354883c5dff0fdbf196e7f405525451df1e81e
2013-03-25 15:09:23 -05:00
Ben Steffensmeier
cf7d8378dd Issue #1821 Make grib2 decoding more multithreaded
Former-commit-id: 4441b32d3ec153a2cf767b8e109c014f9efc3ed8
2013-03-25 14:48:42 -05:00
Richard Peter
3239c176fa 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: a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155
2013-03-25 14:45:06 -05:00
Jonathan Sanchez
ddcb4f3451 Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: 2d58fc8149587bdc089db2b8a69f2a176c24ba23
2013-03-25 14:41:55 -05:00
Lee Venable
d1c84de620 Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
Former-commit-id: 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903
2013-03-25 14:08:39 -05:00
Steve Harris
aaac0b51e5 13.3.1-12 baseline
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
373d13df39 13.3.1-11 baseline
Former-commit-id: 81effd422de0285d345ebfd5c472c924ce261815
2013-03-25 13:20:03 -05:00
Lee Venable
5c661c1891 Merge "Issue #1818 - Added an isDisposed check to the Attributes Dialog open action" into omaha_13.3.1
Former-commit-id: e0923bcf2c95de163118e2f8f6667f9c84df1cb2
2013-03-25 12:53:10 -05:00
Jonathan Sanchez
b77ed18eb4 Issue #1810 Accepted other values/types for useDirs.
Former-commit-id: 7492d4e2ceea99c71f8040237610d95e45c1e78a
2013-03-25 12:23:51 -05:00
Mike Duff
7118f04843 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0
2013-03-24 12:21:51 -05:00
Dave Hladky
f2e13c8078 Issue #1813 Stats for FFMP were broken by memory updates.
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58

Former-commit-id: 314ec2517a0c5565f8423661cb744e04953f1830
2013-03-22 16:37:20 -05:00
Richard Peter
3de0400969 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: a009dd098e1a13ec445cbdc3757771f576d3acc0
2013-03-22 16:26:52 -05:00
Dave Hladky
d114302b06 Issue #1817 BOX issue with only having HUC0 in template
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8

Former-commit-id: f0641a4771b6816944f38d1ec51b0356b983e2f4
2013-03-22 16:21:45 -05:00
Dustin Johnson
8651ca3d76 Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
Former-commit-id: 7a5674416084a17bf2fbbbc666cba01bb7338eff
2013-03-22 15:28:57 -05:00
Dustin Johnson
ed017996a0 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: feee3e80a7b2aafd9ddf1af0802a829726f50a69
2013-03-22 15:28:20 -05:00
Max Schenkelberg
126be0cfe5 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: eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae
2013-03-22 10:54:44 -05:00
David Gillingham
4aeeb1ce25 Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872
2013-03-22 10:39:13 -05:00
Dustin Johnson
04cbd3a24e Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 126661592c42e16a07451868b87a33cff2a89cd1
2013-03-22 10:04:21 -05:00
Lee Venable
c8523e9108 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: d5231f950c637b8a094b0a60b25a629f0b3644fa
2013-03-21 19:27:02 -05:00
Richard Peter
4c3fcf3b67 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: c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4
2013-03-21 18:21:53 -05:00
Nate Jensen
44f8ba8943 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: 805fae0df3b82e1e16a931741d22bf7637e6aa06
2013-03-21 17:06:37 -05:00
Dustin Johnson
c4d4e37cad 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: 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2
2013-03-21 16:14:49 -05:00
Nate Jensen
255b2dbd29 Merge "Issue #1808 perspective specific actions take priority" into development
Former-commit-id: 0c710437147f3a1b242f93a4c63c2451d5724f3e
2013-03-21 15:07:57 -05:00