xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
42850 commits 31 branches 40 tags 3.8 GiB
Commit graph

313 commits

Author SHA1 Message Date
mjames-upc
e2d9ba9a4c merge unidata_15.1.1 to unidata_16.1.4 
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
 2016-03-25 13:09:32 -05:00
mjames-upc
bf687306d0 RequiredExecutionEnvironment: JavaSE-1.7 
Former-commit-id: 5b6bc2ace8
 2016-02-03 21:45:47 -06:00
mjames-upc
fcd3be25ac remnant leftovers from merge corrected for local build 
Former-commit-id: 0eb1228273
 2016-01-26 15:17:19 -07:00
mjames-upc
194adffea5 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n 
Former-commit-id: f25e918e50
Former-commit-id: c921ec69d6
 2015-09-03 15:48:53 -06:00
Mark Peters
e37e8f93b4 Omaha #4316 Include seconds in logs of collaboration messages. 
Change-Id: Iace196e567f36b0be700f707c9352a680a9b3d32

Former-commit-id: 66778ffd5d3bb702a783f6450b58a5be63187e96
 2015-07-08 16:19:15 -05:00
Steve Harris
9b3d8a8443 Merge tag 'OB_15.1.1-12' into omaha_16.1.1 
15.1.1-12

 Conflicts:
	build/deploy.edex.awips2/esb/bin/setup.env
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py


Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
 2015-05-20 11:25:45 -05:00
Mark Peters
3a252033ff Omaha #4469 Some files are missing from plugins' build.properties 
Change-Id: Ib36f309d1cce20ad908b32a8a1d1218fde6863d7

Former-commit-id: 4e596c0cde3e6e04a92a3766224b153989feb676
 2015-05-19 11:47:40 -05:00
Shawn.Hooper
48e06c41ad ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33 
Merge 14.4.1-33 into 15.1.1-8

Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c

Former-commit-id: 1f63e395c67afa5106bde7b96b72d4b3111221d3
 2015-05-01 16:12:48 -04:00
David Lovely
fabd87afb4 Omaha #4392 Fixed broker address substitution 
Change-Id: Ib7ea0577e8d020ad2d94aa7ddbaa08459c9fa433

Former-commit-id: f2a6c66c50 [formerly b60b0e763e [formerly 3b2a545d77] [formerly f2a6c66c50 [formerly 6043b5052225fee426940fa8f32f54d8a265fba2]]]
Former-commit-id: b60b0e763e [formerly 3b2a545d77]
Former-commit-id: b60b0e763e
Former-commit-id: 00a34f5d56
 2015-04-22 12:04:54 -05:00
David Lovely
b43dc9ad17 Omaha #4392 Removed un-used JMX port configuration 
Former-commit-id: 41a03c3a1d [formerly 701f6c96cb [formerly 42ce2e6521] [formerly 41a03c3a1d [formerly f119953ea5cdecdf853301cd0b253ce734244942]]]
Former-commit-id: 701f6c96cb [formerly 42ce2e6521]
Former-commit-id: 701f6c96cb
Former-commit-id: e5019a23c9
 2015-04-20 13:46:01 -05:00
David Lovely
d060215476 Omaha #4392 Updates to configure new QPID json file. 
Former-commit-id: 9f488920a1 [formerly f2e5ab25dc [formerly 531944303c] [formerly 9f488920a1 [formerly ef2c2f94c7dc30fb0313ce8df295c52ea3c22e85]]]
Former-commit-id: f2e5ab25dc [formerly 531944303c]
Former-commit-id: f2e5ab25dc
Former-commit-id: 118bca680a
 2015-04-16 09:03:21 -05:00
Greg Armendariz
1a3ca4f8df Omaha #3299 - Updated deploy-install to find features 
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2

Former-commit-id: a25d39959ccdc41ab99e0eaf4ad87559adfcb362
 2015-02-25 09:51:49 -06:00
Greg Armendariz
f74a9a2360 Omaha #3299 - Updated deploy-install to find features 
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2

Former-commit-id: 1a3ca4f8df [formerly 2fd4ace0a2 [formerly 6a5463ab87] [formerly 1a3ca4f8df [formerly a25d39959ccdc41ab99e0eaf4ad87559adfcb362]]]
Former-commit-id: 2fd4ace0a2 [formerly 6a5463ab87]
Former-commit-id: 2fd4ace0a2
Former-commit-id: fe5cf3f8e6
 2015-02-25 09:51:49 -06:00
Greg Armendariz
af72fd3775 Omaha #3299 - Fix collaboration RPM build issue 
Former-commit-id: 9132eff524289c5df48c682cd3ff226fe14cdf1b
 2015-02-06 11:37:47 -06:00
Greg Armendariz
79ee776aff Omaha #3299 - Fix collaboration RPM build issue 
Former-commit-id: af72fd3775 [formerly 6fed5e21e7 [formerly b88c8da164] [formerly af72fd3775 [formerly 9132eff524289c5df48c682cd3ff226fe14cdf1b]]]
Former-commit-id: 6fed5e21e7 [formerly b88c8da164]
Former-commit-id: 6fed5e21e7
Former-commit-id: d237c346e8
 2015-02-06 11:37:47 -06:00
Greg Armendariz
7db73d7d73 Omaha #3299 - Fix collaboration RPM build issue 
Former-commit-id: 79ee776aff [formerly d237c346e8] [formerly 6fed5e21e7] [formerly 6fed5e21e7 [formerly b88c8da164]] [formerly 79ee776aff [formerly d237c346e8] [formerly 6fed5e21e7] [formerly 6fed5e21e7 [formerly b88c8da164]] [formerly af72fd3775 [formerly 6fed5e21e7 [formerly b88c8da164] [formerly af72fd3775 [formerly 9132eff524289c5df48c682cd3ff226fe14cdf1b]]]]]
Former-commit-id: af72fd3775
Former-commit-id: 1b6d86f91c [formerly 2569f921ef] [formerly d27e4b416e] [formerly fe6bf566078b7303a776f60647517f7f87674768 [formerly 63f866aa8ca54a568af639578ac0d35936abe337] [formerly d27e4b416e [formerly 483ed63a57]]]
Former-commit-id: 3040a8c5d4b266021959cfbeb98f081bfe1230a9 [formerly b19bd39f67e51dfc93fc9bc3ee5e0807b059f4de] [formerly 2f8b5d32eb [formerly 3463c00928]]
Former-commit-id: 2f8b5d32eb
Former-commit-id: 49575f9b1a
 2015-02-06 11:37:47 -06:00
Bryan Kowal
48ec32e595 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 
Former-commit-id: f6a3317e329728080f8efe8db545e3324161986e
 2014-12-05 09:20:23 -06:00
Bryan Kowal
0f1c84b46e Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 
Former-commit-id: 48ec32e595 [formerly 289689e774 [formerly 19f6551c88] [formerly 48ec32e595 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]
Former-commit-id: 289689e774 [formerly 19f6551c88]
Former-commit-id: 289689e774
Former-commit-id: 4aaf636e18
 2014-12-05 09:20:23 -06:00
Bryan Kowal
40199ea8d0 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 
Former-commit-id: 0f1c84b46e [formerly 4aaf636e18] [formerly 289689e774] [formerly 289689e774 [formerly 19f6551c88]] [formerly 0f1c84b46e [formerly 4aaf636e18] [formerly 289689e774] [formerly 289689e774 [formerly 19f6551c88]] [formerly 48ec32e595 [formerly 289689e774 [formerly 19f6551c88] [formerly 48ec32e595 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]]]
Former-commit-id: 48ec32e595
Former-commit-id: bbb1e67206 [formerly 0e79d9e7a8] [formerly aba4679eb6] [formerly ea0e9d37d6d11e1e8d4379a55dc0bf98106f91c5 [formerly 39a25df1c5ea9e51a812bdbf1ec764e207623861] [formerly aba4679eb6 [formerly 9f5297504d]]]
Former-commit-id: 0df49c9e4329a09327147fbfcfd17daf40ce8689 [formerly 53663102c30f8e33519ac669cb7464894a692105] [formerly 258f7a93ca [formerly ec8371db52]]
Former-commit-id: 258f7a93ca
Former-commit-id: 4b83570666
 2014-12-05 09:20:23 -06:00
Greg Armendariz
b229adbf38 Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1 
Former-commit-id: 2a4e26c1be0118f71e18a2c5bfa8777163a97d30
 2014-09-02 10:40:13 -05:00
Greg Armendariz
156492de63 Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1 
Former-commit-id: b229adbf38 [formerly a9f6d3528c [formerly 33b0ac3811] [formerly b229adbf38 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]]]
Former-commit-id: a9f6d3528c [formerly 33b0ac3811]
Former-commit-id: a9f6d3528c
Former-commit-id: 964ad44a4d
 2014-09-02 10:40:13 -05:00
Greg Armendariz
a0121d2c4e Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1 
Former-commit-id: 156492de63 [formerly 964ad44a4d] [formerly a9f6d3528c] [formerly a9f6d3528c [formerly 33b0ac3811]] [formerly 156492de63 [formerly 964ad44a4d] [formerly a9f6d3528c] [formerly a9f6d3528c [formerly 33b0ac3811]] [formerly b229adbf38 [formerly a9f6d3528c [formerly 33b0ac3811] [formerly b229adbf38 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]]]]]
Former-commit-id: b229adbf38
Former-commit-id: 321b7d3795 [formerly 937866d9fc] [formerly d63a9da4d6] [formerly 3269b075a843708f316250da3a27facc841cd429 [formerly 3425e01542aa3ace9515c5168fc3318fc6f9f911] [formerly d63a9da4d6 [formerly edb50956c8]]]
Former-commit-id: a6d18dede1adaa786c86bab7dc033c4474f1711f [formerly 22848ce1b68d7e8f411bd8a4e15a3940e1ef4a36] [formerly 8566996f06 [formerly a2aa3fa6ff]]
Former-commit-id: 8566996f06
Former-commit-id: a38bb1fdd3
 2014-09-02 10:40:13 -05:00
Brian Clements
23f1f7b2b6 Omaha #3573 fixed clean in collaboration dataserver ant script 
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a

Former-commit-id: d2bfe367c9753fc4a2db181c7966179a20713a02
 2014-09-02 10:04:39 -05:00
Brian Clements
d0386fe056 Omaha #3573 fixed clean in collaboration dataserver ant script 
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a

Former-commit-id: 23f1f7b2b6 [formerly eb84b255b0 [formerly 9fe49043e7] [formerly 23f1f7b2b6 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]]]
Former-commit-id: eb84b255b0 [formerly 9fe49043e7]
Former-commit-id: eb84b255b0
Former-commit-id: 051344f98f
 2014-09-02 10:04:39 -05:00
Brian Clements
8bcb8bdca5 Omaha #3573 fixed clean in collaboration dataserver ant script 
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a

Former-commit-id: d0386fe056 [formerly 051344f98f] [formerly eb84b255b0] [formerly eb84b255b0 [formerly 9fe49043e7]] [formerly d0386fe056 [formerly 051344f98f] [formerly eb84b255b0] [formerly eb84b255b0 [formerly 9fe49043e7]] [formerly 23f1f7b2b6 [formerly eb84b255b0 [formerly 9fe49043e7] [formerly 23f1f7b2b6 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]]]]]
Former-commit-id: 23f1f7b2b6
Former-commit-id: 0429e9df5d [formerly efa02bf1b0] [formerly 8da4a4ccf4] [formerly f14b667a87e7bac240ba3f2afb03877e6a2941d8 [formerly c7bdc30721b964ac4e5ff63f21d1f375ed5ec691] [formerly 8da4a4ccf4 [formerly 7a29eef035]]]
Former-commit-id: d73920c4da9e6ef096284746cffd2b179b9edf98 [formerly 73025c41236b9dc6b94fbb2a7c79208b8fbdb4bb] [formerly 54a627e05a [formerly e56c909c26]]
Former-commit-id: 76b6d1435a39ad2e9b433d8508d9d63b347b9901 [formerly 54a627e05a]
Former-commit-id: 26bbbcafc6
 2014-09-02 10:04:39 -05:00
Steve Harris
5d58625abc Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 8793dca41f756ba812206b48391caea6e593a657
 2014-08-29 10:17:52 -05:00
Steve Harris
e31665a400 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 5d58625abc [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: bddf9c0f27 [formerly 793064063b]
Former-commit-id: bddf9c0f27
Former-commit-id: 3619a11a8a
 2014-08-29 10:17:52 -05:00
Steve Harris
aeef8875da Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly e31665a400 [formerly 3619a11a8a] [formerly bddf9c0f27] [formerly bddf9c0f27 [formerly 793064063b]] [formerly 5d58625abc [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]]
Former-commit-id: 5d58625abc
Former-commit-id: bdf54d6c9b [formerly 10070d2762] [formerly 66b485c000] [formerly ae5df07fa69c767a230e2a3c9b71b0100d0048c1 [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54] [formerly 66b485c000 [formerly d984dd538f]]]
Former-commit-id: 529333408e5e144c649cd66c50031cc56795aa1e [formerly ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4] [formerly ecf26b3ac5 [formerly e681e0a457]]
Former-commit-id: e61b05086c2c01b59d4b8382331f85c7ecd4efa2 [formerly ecf26b3ac5]
Former-commit-id: 3c8bfc8160
 2014-08-29 10:17:52 -05:00
Brian Clements
66da9e63b7 Omaha #3562 jetty upgrade change for dataserver 
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663

Former-commit-id: bb90464f68d562105809ef36f88869ff4570095c
 2014-08-27 13:18:13 -05:00
Brian Clements
ebd8cb68ce Omaha #3562 jetty upgrade change for dataserver 
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663

Former-commit-id: 66da9e63b7 [formerly ab4eaee171 [formerly 3595bd2728] [formerly 66da9e63b7 [formerly bb90464f68d562105809ef36f88869ff4570095c]]]
Former-commit-id: ab4eaee171 [formerly 3595bd2728]
Former-commit-id: ab4eaee171
Former-commit-id: 78e961b8f5
 2014-08-27 13:18:13 -05:00
Brian Clements
a1962d1a43 Omaha #3562 jetty upgrade change for dataserver 
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663

Former-commit-id: ebd8cb68ce [formerly 78e961b8f5] [formerly ab4eaee171] [formerly ab4eaee171 [formerly 3595bd2728]] [formerly ebd8cb68ce [formerly 78e961b8f5] [formerly ab4eaee171] [formerly ab4eaee171 [formerly 3595bd2728]] [formerly 66da9e63b7 [formerly ab4eaee171 [formerly 3595bd2728] [formerly 66da9e63b7 [formerly bb90464f68d562105809ef36f88869ff4570095c]]]]]
Former-commit-id: 66da9e63b7
Former-commit-id: 7b6700b7af [formerly c6644cbe46] [formerly aa4dc98be0] [formerly db731ba11a0d7e3ab6e440e0352f65a512dc1725 [formerly dfcfb1b1cb51f20136796b65cef53843ab441829] [formerly aa4dc98be0 [formerly 3efcaa6a8e]]]
Former-commit-id: cb17e472cc6f05713a675d356b9385a3cde3a8dd [formerly 9192075886511cdbd6d226a5edab1da735fd7fc9] [formerly 0efea299ab [formerly 7a990efc0c]]
Former-commit-id: 0efea299ab
Former-commit-id: 8df5ce6b51
 2014-08-27 13:18:13 -05:00
Brian.Dyke
aa83bf804f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
 2014-08-27 11:19:19 -04:00
Brian.Dyke
f13953059a Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: a08db8d73d [formerly e654318431]
Former-commit-id: a08db8d73d
Former-commit-id: 0a5ddf7457
 2014-08-27 11:19:19 -04:00
Brian.Dyke
d238fe909f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly f13953059a [formerly 0a5ddf7457] [formerly a08db8d73d] [formerly a08db8d73d [formerly e654318431]] [formerly aa83bf804f [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]]
Former-commit-id: aa83bf804f
Former-commit-id: a19455a35a [formerly 4a56b6f6e1] [formerly f90649d7e7] [formerly 68463cb724c8468f8978b5fb07a99445cf027313 [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3] [formerly f90649d7e7 [formerly f7f16ff9eb]]]
Former-commit-id: 44ca35c910c7065b51dd3a76485e002ac8fcb63b [formerly 2b5f667a78842762d60c8ab0ba442f22b9229095] [formerly 7e4ab705cc [formerly c0dc594eda]]
Former-commit-id: 1cde9cd7bdfb3330564a42c1fce83730b50bbe4c [formerly 7e4ab705cc]
Former-commit-id: 2da6c7b93b
 2014-08-27 11:19:19 -04:00
Steve Harris
28e88dfe7e Omaha #3368 - Move ohd plugin to new repository 
Former-commit-id: 56dfed379b0e41c435a3226c3f02b9bc5232b4fd
 2014-08-21 11:04:08 -05:00
Steve Harris
e2db60d44f Omaha #3368 - Move ohd plugin to new repository 
Former-commit-id: 28e88dfe7e [formerly aec275dc31 [formerly 8c467a9fa5] [formerly 28e88dfe7e [formerly 56dfed379b0e41c435a3226c3f02b9bc5232b4fd]]]
Former-commit-id: aec275dc31 [formerly 8c467a9fa5]
Former-commit-id: aec275dc31
Former-commit-id: 849aac396b
 2014-08-21 11:04:08 -05:00
Steve Harris
cdfe8f2cfc Omaha #3368 - Move ohd plugin to new repository 
Former-commit-id: e2db60d44f [formerly 849aac396b] [formerly aec275dc31] [formerly aec275dc31 [formerly 8c467a9fa5]] [formerly e2db60d44f [formerly 849aac396b] [formerly aec275dc31] [formerly aec275dc31 [formerly 8c467a9fa5]] [formerly 28e88dfe7e [formerly aec275dc31 [formerly 8c467a9fa5] [formerly 28e88dfe7e [formerly 56dfed379b0e41c435a3226c3f02b9bc5232b4fd]]]]]
Former-commit-id: 28e88dfe7e
Former-commit-id: 6657b1f575 [formerly 3817d55f4a] [formerly 7542fda9a7] [formerly 75903276acdf359dccfb6246e50e0dbc03b5993d [formerly 6e302d243960bc6d456c0a8ce5cc4c8891246175] [formerly 7542fda9a7 [formerly 675dbe0c21]]]
Former-commit-id: 00d65fcb1975de8913479cc8d480137392ee1086 [formerly 15f723fbc32e09f2baa8e6d7cb52f891299ff62a] [formerly 1d59bbc93f [formerly b5f3fe44ed]]
Former-commit-id: 1d59bbc93f
Former-commit-id: 96e8c6acb9
 2014-08-21 11:04:08 -05:00
Bryan Kowal
fec755cc93 Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters 
that are no longer required by EDEX.

Change-Id: If0387c4f87054bbec898d8371d1b182a146c4c3f

Former-commit-id: e4623ff1a31816aefd717d2ae494e81441710b79
 2014-08-14 10:39:09 -05:00
Bryan Kowal
dfa6fbbca6 Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters 
that are no longer required by EDEX.

Change-Id: If0387c4f87054bbec898d8371d1b182a146c4c3f

Former-commit-id: fec755cc93 [formerly ce78f461a3 [formerly a61c35fcb5] [formerly fec755cc93 [formerly e4623ff1a31816aefd717d2ae494e81441710b79]]]
Former-commit-id: ce78f461a3 [formerly a61c35fcb5]
Former-commit-id: ce78f461a3
Former-commit-id: 53f036b5a5
 2014-08-14 10:39:09 -05:00
Bryan Kowal
e364fd7b4a Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters 
that are no longer required by EDEX.

Change-Id: If0387c4f87054bbec898d8371d1b182a146c4c3f

Former-commit-id: dfa6fbbca6 [formerly 53f036b5a5] [formerly ce78f461a3] [formerly ce78f461a3 [formerly a61c35fcb5]] [formerly dfa6fbbca6 [formerly 53f036b5a5] [formerly ce78f461a3] [formerly ce78f461a3 [formerly a61c35fcb5]] [formerly fec755cc93 [formerly ce78f461a3 [formerly a61c35fcb5] [formerly fec755cc93 [formerly e4623ff1a31816aefd717d2ae494e81441710b79]]]]]
Former-commit-id: fec755cc93
Former-commit-id: 5fbe670376 [formerly 395122dc26] [formerly 601726b27c] [formerly 679ac36acf01d5744eedaf8e6f89a8dcfb07655e [formerly eee6fef1c421700ddb8ab1f81c3a13446011c87e] [formerly 601726b27c [formerly 4f82e0ba7d]]]
Former-commit-id: c924f43196276609568f2de993f09ea0a9825309 [formerly 165dde9fcc7c2bb71d3b8fd1bacfd80915ecba7a] [formerly e5b68c6ae3 [formerly e78304e1a7]]
Former-commit-id: e5b68c6ae3
Former-commit-id: 90df3831bf
 2014-08-14 10:39:09 -05:00
Bryan Kowal
b568c25e10 Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional 
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: d11649deb78aa356f27a22f33b38f7238513576c
 2014-08-07 16:27:46 -05:00
Bryan Kowal
07563e7f91 Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional 
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: b568c25e10 [formerly 09442217cd [formerly a9b4b4124a] [formerly b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]
Former-commit-id: 09442217cd [formerly a9b4b4124a]
Former-commit-id: 09442217cd
Former-commit-id: 632e493332
 2014-08-07 16:27:46 -05:00
Bryan Kowal
2e5a05e74b Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional 
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: 07563e7f91 [formerly 632e493332] [formerly 09442217cd] [formerly 09442217cd [formerly a9b4b4124a]] [formerly 07563e7f91 [formerly 632e493332] [formerly 09442217cd] [formerly 09442217cd [formerly a9b4b4124a]] [formerly b568c25e10 [formerly 09442217cd [formerly a9b4b4124a] [formerly b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]]]
Former-commit-id: b568c25e10
Former-commit-id: ed8e35815b [formerly fbc1786ab1] [formerly b0c94a2d61] [formerly b16853fe31f52b312142a087ba8a1161db03e2c9 [formerly 74192b218460ef7622e9a89c78967d022d36f146] [formerly b0c94a2d61 [formerly 1d6eb95f9f]]]
Former-commit-id: df69c9a1925207ea8b0825454c1b39bfc3ad11d1 [formerly 76739f9f732ad2b41a7cdf0ad838c5a360a6cc9b] [formerly 0a3fcc0c91 [formerly 25fd6f379f]]
Former-commit-id: 0a3fcc0c91
Former-commit-id: 8ba34e138a
 2014-08-07 16:27:46 -05:00
Richard Peter
96a1821753 Issue #3470 Update wrapper to call wrapperCapture.sh on process restart 
Former-commit-id: e537db61848adeea0cef18e6a769597d746d6620
 2014-08-07 14:01:54 -05:00
Richard Peter
ed8c442352 Issue #3470 Update wrapper to call wrapperCapture.sh on process restart 
Former-commit-id: 96a1821753 [formerly fc6aae3c3c [formerly 477119b739] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]
Former-commit-id: fc6aae3c3c [formerly 477119b739]
Former-commit-id: fc6aae3c3c
Former-commit-id: d3ba2f19bf
 2014-08-07 14:01:54 -05:00
Richard Peter
e223c1f50d Issue #3470 Update wrapper to call wrapperCapture.sh on process restart 
Former-commit-id: ed8c442352 [formerly d3ba2f19bf] [formerly fc6aae3c3c] [formerly fc6aae3c3c [formerly 477119b739]] [formerly ed8c442352 [formerly d3ba2f19bf] [formerly fc6aae3c3c] [formerly fc6aae3c3c [formerly 477119b739]] [formerly 96a1821753 [formerly fc6aae3c3c [formerly 477119b739] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]]]
Former-commit-id: 96a1821753
Former-commit-id: bb4008cee3 [formerly 6bb571bc37] [formerly bc7d8bfe6d] [formerly 5a27e66a244460faec856b4274c52f7c2ef30ac6 [formerly 98331407f735241458d85aae0c3f5b6e298efa12] [formerly bc7d8bfe6d [formerly f7e0a6cf11]]]
Former-commit-id: e8709dcd40f81dda9f07dc5c29890dd54e8b2ab9 [formerly 04049b9d4b9e515e807702c87328284991445618] [formerly 83c71feeff [formerly fd18b7a134]]
Former-commit-id: f822f8cf294d2a0dbcc428f5238dfc5c128a4688 [formerly 83c71feeff]
Former-commit-id: 9f90398239
 2014-08-07 14:01:54 -05:00
Bryan Kowal
3b080e7c36 Issue #3470 - finished TODO in yajsw ShellScript.java 
Former-commit-id: 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514
 2014-08-06 16:34:35 -05:00
Bryan Kowal
67e65b45c1 Issue #3470 - finished TODO in yajsw ShellScript.java 
Former-commit-id: 3b080e7c36 [formerly dd7ae1f7d3 [formerly dd00d2fe38] [formerly 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]
Former-commit-id: dd7ae1f7d3 [formerly dd00d2fe38]
Former-commit-id: dd7ae1f7d3
Former-commit-id: 51cf294761
 2014-08-06 16:34:35 -05:00
Bryan Kowal
d72b7b8cf4 Issue #3470 - finished TODO in yajsw ShellScript.java 
Former-commit-id: 67e65b45c1 [formerly 51cf294761] [formerly dd7ae1f7d3] [formerly dd7ae1f7d3 [formerly dd00d2fe38]] [formerly 67e65b45c1 [formerly 51cf294761] [formerly dd7ae1f7d3] [formerly dd7ae1f7d3 [formerly dd00d2fe38]] [formerly 3b080e7c36 [formerly dd7ae1f7d3 [formerly dd00d2fe38] [formerly 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]]]
Former-commit-id: 3b080e7c36
Former-commit-id: 0d615a05df [formerly 6a9bfbd79b] [formerly e1e6244b57] [formerly 8130a9d79e056e1068a024567dee26eb7ff23bb1 [formerly 6ec8397ba5668e78293c9747af09f6ddbe896496] [formerly e1e6244b57 [formerly 8576c55443]]]
Former-commit-id: e6624f1440a24014e93bf3109c92cd857a492967 [formerly 1418e0fe6ccbbc6cfa6a472d836d6367b444f12c] [formerly ab26a99200 [formerly 12be1442f1]]
Former-commit-id: ab26a99200
Former-commit-id: 5e18599cf4
 2014-08-06 16:34:35 -05:00
Steve Harris
436ce72db9 Omaha #3275 - moving developer tools to separate repository 
Former-commit-id: da96ff215e03ffdad7e7d157f6f5539663ad47ce
 2014-06-25 16:16:03 -05:00