Richard Peter
b218c42551
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: c8e42bc4ae
[formerly ba577ff354
] [formerly b3b23647b4
] [formerly b3b23647b4
[formerly 0c4ae068ad
]] [formerly c8e42bc4ae
[formerly ba577ff354
] [formerly b3b23647b4
] [formerly b3b23647b4
[formerly 0c4ae068ad
]] [formerly a0b6ea8bb2
[formerly b3b23647b4
[formerly 0c4ae068ad
] [formerly a0b6ea8bb2
[formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: f82ffb09ae
[formerly 530b3bd588
] [formerly 60679a818a
] [formerly 760dcf122f206c1a059e2ae1bc1fe6dfedb8ff47 [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215] [formerly 60679a818a
[formerly da027298d4
]]]
Former-commit-id: ab3a026945d3ed98f11acdfbc661ef575858f342 [formerly 53e9784af497b834229cb70070f6499791f6f567] [formerly ae6e34be4b
[formerly fd93b7d85e
]]
Former-commit-id: ae6e34be4b
Former-commit-id: f362062048
2013-12-05 12:12:27 -06:00
Steve Harris
331d0dfe44
14.1.1-12 baseline
...
Former-commit-id: 55fbdca04f
[formerly f53eb87892
] [formerly 371d1ca63c
] [formerly 371d1ca63c
[formerly b24d9c80b0
]] [formerly 55fbdca04f
[formerly f53eb87892
] [formerly 371d1ca63c
] [formerly 371d1ca63c
[formerly b24d9c80b0
]] [formerly a3ec45a99f
[formerly 371d1ca63c
[formerly b24d9c80b0
] [formerly a3ec45a99f
[formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: e2cc80debe
[formerly 1e4b2bac7b
] [formerly 4e6f319422
] [formerly a824c99a6e079d9c557dc96a800f3e69390eb9a1 [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4] [formerly 4e6f319422
[formerly 14421048af
]]]
Former-commit-id: 8f61c91746184c6dcddeeb270197a75995c2c9d9 [formerly e177b16a88af27dc0abf4496fe58fbe454cfa8c9] [formerly 60f062ea59
[formerly 234ca267ed
]]
Former-commit-id: 60f062ea59
Former-commit-id: 31c94115c7
2013-12-04 16:47:59 -05:00
Steve Harris
780ebc3871
14.1.1-4 baseline
...
Former-commit-id: c3693c792e
[formerly cb3b53f205
] [formerly 82dec19b6a
] [formerly 82dec19b6a
[formerly bd95bb6a4e
]] [formerly c3693c792e
[formerly cb3b53f205
] [formerly 82dec19b6a
] [formerly 82dec19b6a
[formerly bd95bb6a4e
]] [formerly 99e3707c5b
[formerly 82dec19b6a
[formerly bd95bb6a4e
] [formerly 99e3707c5b
[formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 530f8f1198
[formerly 2039d101ef
] [formerly b60635cd70
] [formerly e8f742116ac7b5dcef62ae15a6ae48ef875ab994 [formerly 2d757fef6618aded3efb26a4e6771f03101fe824] [formerly b60635cd70
[formerly 7590a56e0e
]]]
Former-commit-id: ebd3e0601d59cc8c94018247b3c6a228c41cc169 [formerly 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa] [formerly da4589ec2b
[formerly 98ae84da42
]]
Former-commit-id: da4589ec2b
Former-commit-id: cbf859daf6
2013-10-28 10:55:16 -04:00
Steve Harris
2ca9559de2
14.1.1-3 baseline
...
Former-commit-id: 0cc505a64a
[formerly a0ba2e1252
] [formerly 851f9df229
] [formerly 851f9df229
[formerly 94f24e0d8a
]] [formerly 0cc505a64a
[formerly a0ba2e1252
] [formerly 851f9df229
] [formerly 851f9df229
[formerly 94f24e0d8a
]] [formerly 5739b4f832
[formerly 851f9df229
[formerly 94f24e0d8a
] [formerly 5739b4f832
[formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 6e4187af3c
[formerly 2d30611c6d
] [formerly aa59400b67
] [formerly e5bec8304375023d2850a2bca444926f4925c949 [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19] [formerly aa59400b67
[formerly 4a6a209aea
]]]
Former-commit-id: 04d097d14d16b1e927137c3ca7c25238be8c309d [formerly 9a1c18417dfee86a141522f27e066ec83d4258d5] [formerly 472c0a1a5e
[formerly 8d67ffede4
]]
Former-commit-id: 472c0a1a5e
Former-commit-id: c784003711
2013-10-28 10:46:02 -04:00
Bryan Kowal
c4a2903755
Issue #2033 - windows build updates for etc directory deployment
...
Change-Id: Icfb30220639eeefe01a03479f0a5248dcb5cf928
Former-commit-id: 245a6680ea
[formerly c7ea9ddac2
] [formerly 89c561ad89
] [formerly 89c561ad89
[formerly c5f6540e3c
]] [formerly 245a6680ea
[formerly c7ea9ddac2
] [formerly 89c561ad89
] [formerly 89c561ad89
[formerly c5f6540e3c
]] [formerly 073fd49741
[formerly 89c561ad89
[formerly c5f6540e3c
] [formerly 073fd49741
[formerly d51012b2e5685e547d0d8f3b3ccd0f4c4640b9dc]]]]]
Former-commit-id: 073fd49741
Former-commit-id: 3bc24ee78d
[formerly cc0ed5ee96
] [formerly 42ac7b6bdd
] [formerly 89169aa8674be94092860cf92602bfed163ae049 [formerly 03fce35c4a56e480e55739c7f4bfb5c42b76f678] [formerly 42ac7b6bdd
[formerly e3ad305202
]]]
Former-commit-id: abb94a8042689fb4fe82612c2cdf29c1fb8bd76b [formerly d34c434b98be92df3170f3a3e4e3928556e2e1b2] [formerly 9d045d3c92
[formerly cef35754ca
]]
Former-commit-id: 9d045d3c92
Former-commit-id: 6838bff38e
2013-10-07 18:41:49 -05:00
Bryan Kowal
d7c99d36a5
Revert "Issue #2033 - msi build updates"
...
Undo copying localization into etc at build time.
This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef1
] [formerly d1a67f1b42
[formerly 50d9790e17
] [formerly 3bf9b72f52
] [formerly 3bf9b72f52
[formerly 7208eadbfb
]] [formerly d1a67f1b42
[formerly 50d9790e17
] [formerly 3bf9b72f52
] [formerly 3bf9b72f52
[formerly 7208eadbfb
]] [formerly e46254cef1
[formerly 3bf9b72f52
[formerly 7208eadbfb
] [formerly e46254cef1
[formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]]]].
Former-commit-id: 3ed7babac4
[formerly 28e14d1520
] [formerly 1632c72103
] [formerly 1632c72103
[formerly 02e1055f19
]] [formerly 3ed7babac4
[formerly 28e14d1520
] [formerly 1632c72103
] [formerly 1632c72103
[formerly 02e1055f19
]] [formerly 3d6ff3f0fa
[formerly 1632c72103
[formerly 02e1055f19
] [formerly 3d6ff3f0fa
[formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]]]]
Former-commit-id: 3d6ff3f0fa
Former-commit-id: ab51915cc7
[formerly 1b450afc35
] [formerly a29a8b8d0e
] [formerly cbad3223c2875150037607cef3cec16d2d45c22e [formerly cf942de33b8e2634ee81bb98c9f6b239e1f435b7] [formerly a29a8b8d0e
[formerly ac0b2bd9eb
]]]
Former-commit-id: 109c6cf6fb184fcf24b7ed4e66ddf8c5a9bf5551 [formerly 2829b85519ed488a07adf58fb2aa8d2956d7f337] [formerly 0ad325f534
[formerly b72e77fdc0
]]
Former-commit-id: 0ad325f534
Former-commit-id: b767da74f2
2013-10-04 09:47:59 -05:00
Bryan Kowal
4e10f2d410
Issue #2033 - msi build updates
...
Former-commit-id: d1a67f1b42
[formerly 50d9790e17
] [formerly 3bf9b72f52
] [formerly 3bf9b72f52
[formerly 7208eadbfb
]] [formerly d1a67f1b42
[formerly 50d9790e17
] [formerly 3bf9b72f52
] [formerly 3bf9b72f52
[formerly 7208eadbfb
]] [formerly e46254cef1
[formerly 3bf9b72f52
[formerly 7208eadbfb
] [formerly e46254cef1
[formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]]]]
Former-commit-id: e46254cef1
Former-commit-id: 833677aab5
[formerly f3d50a7986
] [formerly 93ff6ab60d
] [formerly 685b2e62f9ed9642852133494edc3f73edb75bdc [formerly 51e6108a23287dd44038da5afa85240716815ba7] [formerly 93ff6ab60d
[formerly e76c20007a
]]]
Former-commit-id: 4fba949778a69293c1e953caa3df70ad2e237a43 [formerly fcd0e86f16a56a19a3cc744fffd66eb77a9afa96] [formerly 6056aed708
[formerly 8660d4b9e7
]]
Former-commit-id: 6056aed708
Former-commit-id: 4666acc492
2013-09-30 16:18:37 -05:00
Steve Harris
78fa433ae5
13.5.2-4 baseline
...
Former-commit-id: 040c4124bb
[formerly 3d0b711ccf
] [formerly 595e7bc0d9
] [formerly 595e7bc0d9
[formerly e3c935d48b
]] [formerly 040c4124bb
[formerly 3d0b711ccf
] [formerly 595e7bc0d9
] [formerly 595e7bc0d9
[formerly e3c935d48b
]] [formerly 58c6821427
[formerly 595e7bc0d9
[formerly e3c935d48b
] [formerly 58c6821427
[formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]]
Former-commit-id: 58c6821427
Former-commit-id: f4ef004589
[formerly a8201afb82
] [formerly 4c6790f10f
] [formerly f603a85fa17afd8be4279bd4b5029267b6d1c303 [formerly 1a01e9adff02825a5599659ed7c17823430819bc] [formerly 4c6790f10f
[formerly abed443b59
]]]
Former-commit-id: 01c858ce0ecb6e00047191c9c3e8ac37aad43008 [formerly d4668ee6901a6bb072be3a88eaad320aed699c0f] [formerly 609926f1f4
[formerly e2398f74e5
]]
Former-commit-id: c08fa78094759339283c3d6ff760b9abaeb50173 [formerly 609926f1f4
]
Former-commit-id: 3a21a9eb6c
2013-09-12 11:13:59 -04:00
Steve Harris
a1fd6f1d34
13.5.2-2 baseline
...
Former-commit-id: 9fa5d97e32
[formerly 8dcd159377
] [formerly 8cde3b2b54
] [formerly 8cde3b2b54
[formerly 4a47fb97c5
]] [formerly 9fa5d97e32
[formerly 8dcd159377
] [formerly 8cde3b2b54
] [formerly 8cde3b2b54
[formerly 4a47fb97c5
]] [formerly 9e4bf0cf2e
[formerly 8cde3b2b54
[formerly 4a47fb97c5
] [formerly 9e4bf0cf2e
[formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]]]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 59dfd97742
[formerly c10c39b5d6
] [formerly 12b0ab91fd
] [formerly 3a25440d935b940ea9008ecab1bb6415eeb0211f [formerly 8411cf39c13b7f63f746f4a1b8806ba15bfa7510] [formerly 12b0ab91fd
[formerly 5de6d566f0
]]]
Former-commit-id: 16b06f38b899994da8b5446e37792e8aa27b3edb [formerly ac9d4632081685ff126231e5a993f8fb95aba22d] [formerly db64b2e2d9
[formerly 180e042b5d
]]
Former-commit-id: db64b2e2d9
Former-commit-id: 7c47939632
2013-08-29 15:01:29 -04:00
Bryan Kowal
fa605221ef
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: 0ec2392c24
[formerly 3fa97d7819
] [formerly 6b9ca89bbc
] [formerly 6b9ca89bbc
[formerly f5c3b89dd2
]] [formerly 0ec2392c24
[formerly 3fa97d7819
] [formerly 6b9ca89bbc
] [formerly 6b9ca89bbc
[formerly f5c3b89dd2
]] [formerly e1415e3689
[formerly 6b9ca89bbc
[formerly f5c3b89dd2
] [formerly e1415e3689
[formerly 1edbb1847a9dfda4fa7562972b70c8ca3f83f246]]]]]
Former-commit-id: e1415e3689
Former-commit-id: 0bb97b1788
[formerly 1659386a9c
] [formerly 5b58abe854
] [formerly 7333f116358a0fec4ac92d4c73b8b1862bac6e28 [formerly 47dedaefabeda6c6ca4ce57a08b9555bae5e9e89] [formerly 5b58abe854
[formerly 5458f6956b
]]]
Former-commit-id: f1335171a0249097405a83c2f546dc5041acbb3d [formerly caf5ae2a02e399f6e14aeaac73826d152ff92803] [formerly 1ae985d556
[formerly 029369f3d5
]]
Former-commit-id: 1ae985d556
Former-commit-id: 30286d2f79
2013-08-26 12:43:43 -05:00
Bryan Kowal
7941c48397
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: f3487404ff
[formerly 3e9c78b9e0
] [formerly 013ba62af1
] [formerly 013ba62af1
[formerly a1fccaa598
]] [formerly f3487404ff
[formerly 3e9c78b9e0
] [formerly 013ba62af1
] [formerly 013ba62af1
[formerly a1fccaa598
]] [formerly 21cfeb1b83
[formerly 013ba62af1
[formerly a1fccaa598
] [formerly 21cfeb1b83
[formerly c1c6cd087a493f052a66fbc6e7b608cd959f7905]]]]]
Former-commit-id: 21cfeb1b83
Former-commit-id: 22a0e86c31
[formerly c350450024
] [formerly eec811c3b1
] [formerly 222937c8fdbfca11fd9a4286ec583181c39ae8a5 [formerly 28e6522f39684a2c80f4e36f7968404f94210af4] [formerly eec811c3b1
[formerly 6cf776926c
]]]
Former-commit-id: 0b1dff681f2adedf130dab4030cc8bce1c6a1b03 [formerly d4152ca5536158bbd4ab18c8cc1af71b6f8ede23] [formerly 8503422d36
[formerly 433efe1982
]]
Former-commit-id: 8503422d36
Former-commit-id: eb05558a87
2013-08-20 13:56:07 -05:00
Steve Harris
98b3f1481d
13.5.1-1 baseline
...
Former-commit-id: 2f344da22c
[formerly 5d99df9969
] [formerly 6384018950
] [formerly 6384018950
[formerly 998961612c
]] [formerly 2f344da22c
[formerly 5d99df9969
] [formerly 6384018950
] [formerly 6384018950
[formerly 998961612c
]] [formerly fe872355a7
[formerly 6384018950
[formerly 998961612c
] [formerly fe872355a7
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]]
Former-commit-id: fe872355a7
Former-commit-id: 7da64307e2
[formerly 43b7a9b410
] [formerly 0aab285b8a
] [formerly cb6ae479723283672da81805b842b8f452f65ad4 [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69] [formerly 0aab285b8a
[formerly 30ba1d634e
]]]
Former-commit-id: 846a8749d39dba5372665179e09a90710c861d92 [formerly 83a711e54bdd8cabc147e6ca5222939082f46f9c] [formerly 859965fc9d
[formerly 146c5e8940
]]
Former-commit-id: 859965fc9d
Former-commit-id: 97a4c59662
2013-06-10 15:17:17 -04:00
Steve Harris
2827d6bd6e
13.1.2-2 baseline
...
Former-commit-id: e380aa2f8f
[formerly e8f4a2f031
] [formerly 51208e5515
] [formerly 51208e5515
[formerly c0c1d56f3a
]] [formerly e380aa2f8f
[formerly e8f4a2f031
] [formerly 51208e5515
] [formerly 51208e5515
[formerly c0c1d56f3a
]] [formerly 4ba416aeb3
[formerly 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 771913b0c7
[formerly 82cdde8491
] [formerly cd4185ef5c
] [formerly 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c
[formerly 941337c553
]]]
Former-commit-id: 5cd56308fe7c05824700e702851648ed30cdff6e [formerly c69e1900269e630aefc061c2464bc8fea1c9776a] [formerly f52ec0b0a0
[formerly b6fa9b4858
]]
Former-commit-id: f52ec0b0a0
Former-commit-id: 745f2c6409
2013-01-06 14:32:24 -06:00
Steve Harris
26b250dbd1
12.4.1-4 baseline
...
Former-commit-id: 779a297bc5
[formerly 4767b0e069
] [formerly 750b7543dd
] [formerly 750b7543dd
[formerly 67a5a68300
]] [formerly 779a297bc5
[formerly 4767b0e069
] [formerly 750b7543dd
] [formerly 750b7543dd
[formerly 67a5a68300
]] [formerly 2a216f333c
[formerly 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 6456a7f75f
[formerly 98d8b3f188
] [formerly a2a6a18fae
] [formerly 8177a31ae65520dcaf2978b703dc497369e03cf1 [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b] [formerly a2a6a18fae
[formerly a4e519f3cd
]]]
Former-commit-id: a5e6e414f62a4ad9f7e0da4037f64ad5885e2f16 [formerly 816045b74a6ddb3791f4e241a6f25a4d4ab3391a] [formerly 74b66d9683
[formerly 8cd5974f4c
]]
Former-commit-id: 74b66d9683
Former-commit-id: 5b35d8a6e0
2012-04-18 15:18:16 -05:00
Bryan Kowal
b2bf33ecc5
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
...
Former-commit-id: f5bd0c98df
[formerly f522b77248
] [formerly be61ec82b0
] [formerly be61ec82b0
[formerly 48b420cbb2
]] [formerly f5bd0c98df
[formerly f522b77248
] [formerly be61ec82b0
] [formerly be61ec82b0
[formerly 48b420cbb2
]] [formerly ff44a81ceb
[formerly be61ec82b0
[formerly 48b420cbb2
] [formerly ff44a81ceb
[formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]]]
Former-commit-id: ff44a81ceb
Former-commit-id: 20c10bd6f1
[formerly 5368408482
] [formerly bddafa475a
] [formerly c610b5ecde7fcc0d566937aa33e85a3ae27ac88f [formerly 68d481a3d913cffc25e47fc6f2eae8a4f8628bf1] [formerly bddafa475a
[formerly 5eb9afeb98
]]]
Former-commit-id: 57021e05747d6ea34ecf500ee44caacbddef49d1 [formerly b43548f0f51b0647e84191cf2451632da3f62170] [formerly 28028b9ad3
[formerly dd1c5cdee4
]]
Former-commit-id: 45f6020a7ab51ce4bdc33a155aeee35e7b379fd3 [formerly 28028b9ad3
]
Former-commit-id: 7e2690ee90
2012-01-23 12:36:13 -06:00