Steve Harris
81a8604bfe
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: e154e58354b0621d90bcfd71e44f0fe154e58354b0621d90bcfd71e44f0fa23cecdb26fd71e44f0fa23cecdb265be2208aaf02105701a0e96e95b565e6ab1deba2feba54ac83
2013-03-26 10:12:34 -05:00
Ben Steffensmeier
bdab31e123
Issue #1804 Switch all radar decompressing to be in memory.
...
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221
Former-commit-id: d573574ac6ecf93b40cc4c3438e160d573574ac6ecf93b40cc4c3438e16085b509b13e4c3438e16085b509b13e681c4d87f15261f1f5675cb197eebd7bf75df8fdf84059441c
2013-03-20 16:37:47 -05:00
Max Schenkelberg
9b89da117c
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: d0b78507752611980ca44ed4ef8d71d0b78507752611980ca44ed4ef8d71e0ba97d5474ed4ef8d71e0ba97d5472aef608c3f5617dfaa676b1426dd34453ac440501073393fbb
2013-02-27 11:50:38 -06:00
Steve Harris
f8888e5294
Merge branch '13.2.1_delivery' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java
Former-commit-id: bf957a3bd789f3120c0c2c9c6b7ddebf957a3bd789f3120c0c2c9c6b7dde407d73a04f2c9c6b7dde407d73a04ff2b52084dc0ca985778ebbb637faf345760d8bef61a9f644d9
2013-01-18 10:52:29 -06:00
Brad Gonzales
f82711fd94
Issue #1448 Added app context checks to ArealQpeGenSrv MpeLightningSrv. Uncommented run_report_alarm call in run_alarm_whfs. Moved internal methods to private in MpeRUCFreezingLevel.
...
Amend: removed log statments from run_alarm_whfs based on review comments.
removed tab.
Change-Id: I05cd853814376bfb0ac61e3340210be928a35c57
Former-commit-id: 4c2cf80f5d1a3e27922631c48be1c54c2cf80f5d1a3e27922631c48be1c569eccc1d8031c48be1c569eccc1d802a12b30f0fa90db41abde1e50017366277097450379b354ffc
2013-01-16 15:23:53 -06:00
Bryan Kowal
d9c01fe8a0
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
...
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: 1414f0415bfba28ea69be2a12845d31414f0415bfba28ea69be2a12845d34db9c6c321e2a12845d34db9c6c32149b121ed3a38480e46b1c1330e8121290167ac1689cc2bdf57
2013-01-15 14:56:01 -06:00
Richard Peter
7d529beed2
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29d0a6ba23e5029ebaa63a95f0508c29d0a6ba23e5029ebaa63a328be6ac2b029ebaa63a328be6ac2b177a54d19a80bf1d7a286a5a0d7d09709af3b25e398b47967d
2013-01-09 17:55:05 -06:00
Brad Gonzales
14eeaf1177
Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
...
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d
Former-commit-id: 88a5c6b8ae4e44770674bcff2c134c88a5c6b8ae4e44770674bcff2c134c6ab74bb6abbcff2c134c6ab74bb6ab34edaff61f15b3a61287065ddf4d4acb35e0f5e85959f06dbd
2012-12-10 14:08:54 -06:00
Dustin Johnson
4bc4d95b21
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 7d0e4a6e758e69107b5a98d7beae507d0e4a6e758e69107b5a98d7beae5031d7d09c1098d7beae5031d7d09c10fe8a2a3b09e7a0f96a9abcf575966b4d9c945388931d94d1de
2012-11-01 13:36:06 -05:00
Brad Gonzales
bea7374337
Issue #1274 Added Token control for java code and scripts started by RFC Crons.
...
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.
Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().
Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc
Former-commit-id: 0a60448e8f75e77feb5868a3a985470a60448e8f75e77feb5868a3a9854744e9238fa968a3a9854744e9238fa9675a6f6b057807eca270253c19ae056fae286ad278fbf32245
2012-10-31 21:20:40 -05:00
Ben Steffensmeier
84ee3cecaa
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: 1a215cb42a4f503d3a1e6a9ff88b331a215cb42a4f503d3a1e6a9ff88b33c2934ae7a56a9ff88b33c2934ae7a524de7509329b8f2bcdbda77d2097f8dd5ab10b6186562637f0
2012-10-25 12:22:11 -05:00
Steve Harris
e42c12350b
12.11.1-3 baseline
...
Former-commit-id: a65c057df5196afa0e5f2d0c424713a65c057df5196afa0e5f2d0c4247135d796f775c2d0c4247135d796f775c7fcbb49a3e725b2f8ba55723fb0031bf1f88482bc25ebcdc41
2012-10-15 16:30:31 -05:00
Ben Steffensmeier
a2bdabd9a0
Issue #189 switch ohd to grid.
...
Former-commit-id: 86e20ce946682b7b88176879a8143686e20ce946682b7b88176879a81436f34fc897b86879a81436f34fc897b810321e7b481b8eb83696db20aec6672d17b3d636061859986b
2012-10-01 16:33:08 -05:00
Steve Harris
98059f9ef1
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54c77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac39428d9faed979f7fb0b17bd572824561cb9b5c2094ed2d928d328e
2012-08-21 15:27:03 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069750b7543dd67a5a683004767b0e069750b7543dd67a5a683002a216f333c67a5a683002a216f333c98d8b3f188a2a6a18faea4e519f3cd8cd5974f4c74b66d9683
2012-04-18 15:18:16 -05:00
Steve Harris
9340618732
12.3.1-10 baseline
...
Former-commit-id: 760ead20470e4128712b4068f5295f760ead20470e4128712b4068f5295f22bd792cd94068f5295f22bd792cd911e448aa398bc60b1e32ce3b74c6052e0f4b241b293563cfe7
2012-03-30 08:38:33 -05:00
David Gillingham
13b2df8c41
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: edde99f0b87e5ec12276e13850a2b6edde99f0b87e5ec12276e13850a2b6d433b7d4d6e13850a2b6d433b7d4d69cc2c09ae53c4e90e0bf2b5588bd1e2d82185a1d69adfe2e40
2012-03-13 12:31:38 -05:00
Matt Nash
515196cb86
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3580e2938d766be3bec40d8da2252c3580e2938d766be3bec40c83e5ff47466be3bec40c83e5ff474fa4cd88c9082300ccdcf21d2361f001faae4248421d2361f00bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67a02aeb236c9f19e3f712133dc97f67a02aeb236c9f19e3f71206a8b51d6d9f19e3f71206a8b51d6d9bb8decbcf8e80217e59377dcd10b93360eb6c5f377dcd10b9e2ecdcfe33
2012-01-06 08:55:05 -06:00
