Commit graph

15 commits

Author SHA1 Message Date
Richard Peter
fd93b7d85e Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: 0c4ae068ad [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: da027298d4
2013-12-05 12:12:27 -06:00
Steve Harris
234ca267ed 14.1.1-12 baseline
Former-commit-id: b24d9c80b0 [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]
Former-commit-id: a3ec45a99f
Former-commit-id: 14421048af
2013-12-04 16:47:59 -05:00
Steve Harris
98ae84da42 14.1.1-4 baseline
Former-commit-id: bd95bb6a4e [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
2013-10-28 10:55:16 -04:00
Steve Harris
8d67ffede4 14.1.1-3 baseline
Former-commit-id: 94f24e0d8a [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 5739b4f832
Former-commit-id: 4a6a209aea
2013-10-28 10:46:02 -04:00
Bryan Kowal
cef35754ca Issue #2033 - windows build updates for etc directory deployment
Change-Id: Icfb30220639eeefe01a03479f0a5248dcb5cf928

Former-commit-id: c5f6540e3c [formerly c5f6540e3c [formerly d51012b2e5685e547d0d8f3b3ccd0f4c4640b9dc]]
Former-commit-id: 073fd49741
Former-commit-id: e3ad305202
2013-10-07 18:41:49 -05:00
Bryan Kowal
b72e77fdc0 Revert "Issue #2033 - msi build updates"
Undo copying localization into etc at build time.

This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef1] [formerly 7208eadbfb [formerly 7208eadbfb [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]].


Former-commit-id: 02e1055f19 [formerly 02e1055f19 [formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]
Former-commit-id: 3d6ff3f0fa
Former-commit-id: ac0b2bd9eb
2013-10-04 09:47:59 -05:00
Bryan Kowal
8660d4b9e7 Issue #2033 - msi build updates
Former-commit-id: 7208eadbfb [formerly 7208eadbfb [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]
Former-commit-id: e46254cef1
Former-commit-id: e76c20007a
2013-09-30 16:18:37 -05:00
Steve Harris
e2398f74e5 13.5.2-4 baseline
Former-commit-id: e3c935d48b [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: 58c6821427
Former-commit-id: abed443b59
2013-09-12 11:13:59 -04:00
Steve Harris
180e042b5d 13.5.2-2 baseline
Former-commit-id: 4a47fb97c5 [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 5de6d566f0
2013-08-29 15:01:29 -04:00
Bryan Kowal
029369f3d5 Issue #2198 - completely override the Path and PythonPath in the environment.
- PythonPath is specific to CAVE and will not normally be set
- What is currently set in Path is not relevant because we are running ported code


Former-commit-id: f5c3b89dd2 [formerly f5c3b89dd2 [formerly 1edbb1847a9dfda4fa7562972b70c8ca3f83f246]]
Former-commit-id: e1415e3689
Former-commit-id: 5458f6956b
2013-08-26 12:43:43 -05:00
Bryan Kowal
433efe1982 Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.


Former-commit-id: a1fccaa598 [formerly a1fccaa598 [formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]
Former-commit-id: 21cfeb1b83
Former-commit-id: 6cf776926c
2013-08-20 13:56:07 -05:00
Steve Harris
146c5e8940 13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
2013-06-10 15:17:17 -04:00
Steve Harris
b6fa9b4858 13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Steve Harris
8cd5974f4c 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Bryan Kowal
dd1c5cdee4 Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: 48b420cbb2 [formerly 48b420cbb2 [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]
Former-commit-id: ff44a81ceb
Former-commit-id: 5eb9afeb98
2012-01-23 12:36:13 -06:00