Commit graph

11 commits

Author SHA1 Message Date
Steve Harris
5be2208aaf 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: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]
Former-commit-id: 02105701a0
2013-03-26 10:12:34 -05:00
Bryan Kowal
f1b0e60b8e 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: 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 6758a9a50d [formerly 9e647beded [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]]
Former-commit-id: 6758a9a50d
Former-commit-id: b5e09dca5c13d2f76056db298c6ddcd8fba31a7e [formerly 4c02dabb3d]
Former-commit-id: 1eba8622d4
2013-03-25 15:23:32 -05:00
Bryan Kowal
5012e869e3 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: 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly a6cd17feeb [formerly c55efaadb0 [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]]
Former-commit-id: a6cd17feeb
Former-commit-id: 1710b26cc53566e26fc66c7ee6bcd14b0dbcbc08 [formerly c4cec34e47]
Former-commit-id: 2093c6a495
2013-03-25 15:23:31 -05:00
Bryan Kowal
5d1cab4bdb Issue #1809 - update for yajsw compatibility
Former-commit-id: 67f2ca23e7 [formerly 2411a400f4] [formerly dd8d462790] [formerly 0e46dc35e2 [formerly dd8d462790 [formerly ef772adffd15534b79ac36ac55ca0f8ac8b62677]]]
Former-commit-id: 0e46dc35e2
Former-commit-id: a5e7ec737f85d935d5bf1bfc470224d8f5ad6ec6 [formerly 585f7858bd]
Former-commit-id: 1f5e019852
2013-03-20 16:46:03 -05:00
Max Schenkelberg
b6a0a31731 Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 547c593dec [formerly ec40d261e5 [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]
Former-commit-id: 547c593dec
Former-commit-id: 5b67b8fa2777f5d1c1e3d2378514221879eea2b9 [formerly 13a4056335]
Former-commit-id: fc58e7431a
2013-02-27 16:19:58 -06:00
Bryan Kowal
285e192bd1 Issue #1577 - deploy-install and AWIPS II ant task updates
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring

Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f

Former-commit-id: 874d754543 [formerly 81da18f851] [formerly 7815b651bb] [formerly 5fea87f1dd [formerly 7815b651bb [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]]
Former-commit-id: 5fea87f1dd
Former-commit-id: 79a63957141ccebe7c30159fdecdcee461b2f5f5 [formerly 99994d3151]
Former-commit-id: efe288c82c
2013-02-05 13:25:15 -06:00
Bryan Kowal
a9c31457b8 Issue #1490 - updated edex-environment
- actually include the modified files in the commit this time

- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot

Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d

Former-commit-id: 3a0114558b [formerly 792c03d5f4] [formerly b4964c0a19] [formerly 9e33969536 [formerly b4964c0a19 [formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]]
Former-commit-id: 9e33969536
Former-commit-id: 912fb037ce61d59d861a7468a62b5455d51ea0aa [formerly b47d484e70]
Former-commit-id: bc757e5bc1
2013-01-18 12:44:37 -06:00
Richard Peter
177a54d19a Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]
Former-commit-id: 80bf1d7a28
2013-01-09 17:55:05 -06:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00
Steve Harris
64699fa90b 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
d9faed979f 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
2012-08-21 15:27:03 -05:00