Commit graph

7117 commits

Author SHA1 Message Date
Brian Clements
3207d12d51 Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 6d6d3d26e6 [formerly 3a12ab9bdf [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]
Former-commit-id: 3a12ab9bdf
Former-commit-id: 78c2aa3650
2014-10-13 16:32:41 -05:00
Richard Peter
eb68a84c26 Merge "Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid" into omaha_14.4.1
Former-commit-id: 360114be70 [formerly d2909b6e08 [formerly a7b644d5e831bc38f0442efc16f681fd5ff317d7]]
Former-commit-id: d2909b6e08
Former-commit-id: ef5fcfe852
2014-10-13 12:37:28 -05:00
Brian Clements
7d4dbd204e Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

Former-commit-id: 2a7feaebfe [formerly dfb43fda31 [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]]
Former-commit-id: dfb43fda31
Former-commit-id: c33a5ad562
2014-10-13 11:11:32 -05:00
Nate Jensen
325a15e08f Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59

Former-commit-id: 3eada560b7 [formerly b24faf99cd [formerly 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c]]
Former-commit-id: b24faf99cd
Former-commit-id: 5ae522c32a
2014-10-13 09:34:22 -05:00
Nate Jensen
0ad0f650b5 Merge "Omaha #3711 Allow configuration of how chat lines will display" into omaha_14.4.1
Former-commit-id: 8ccb625dc4 [formerly 190a85c872 [formerly f36afc27474267133b414d13951c271c5217f4dd]]
Former-commit-id: 190a85c872
Former-commit-id: 3b54d07fa2
2014-10-10 14:45:54 -05:00
Mark Peters
4660b63394 Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f

Former-commit-id: fb6131869c [formerly 5d87f3d22d [formerly b929d424107b0a2495f4305fd2500e362cccce4e]]
Former-commit-id: 5d87f3d22d
Former-commit-id: f8e3c8412b
2014-10-10 14:25:38 -05:00
Nathan Bowler
74275e8715 Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba

Former-commit-id: 33e141dd38 [formerly 1df2418409 [formerly e1470cb4ce03b49ac85936760469a22786195a99]]
Former-commit-id: 1df2418409
Former-commit-id: db82cdbdfe
2014-10-10 13:20:04 -04:00
Nate Jensen
0eb32c3d0c Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1
Former-commit-id: e7d524c06a [formerly 70561d721a [formerly bcc0d1c4f9516e90205d4c140ede99910d1af3b9]]
Former-commit-id: 70561d721a
Former-commit-id: 404a87b2c9
2014-10-10 11:47:32 -05:00
Richard Peter
01eb1572dc Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: b41be59fd6 [formerly e7fbc0c012 [formerly d3fa6c45ca179e5196af8078ae45ccb4a883804e]]
Former-commit-id: e7fbc0c012
Former-commit-id: f0243b5e5f
2014-10-10 11:13:12 -05:00
Nathan Bowler
b8e8e83a6f Omaha #3595 Fix sed call and man/sigw indices for proper comparison.
Change-Id: Iee0ce15d06e2c84ac8bb4f5a3cf82a3c237222d2

Former-commit-id: 27cdd53ea8 [formerly 36d77f1098 [formerly 97555449ae12eab272ef3307297b89145b97363b]]
Former-commit-id: 36d77f1098
Former-commit-id: 453cca2ee0
2014-10-10 12:05:16 -04:00
Benjamin Phillippe
7e7b270f68 Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734

Former-commit-id: df6b3b3832 [formerly 825aa0d5b2 [formerly f7c7fe2f7b845563335559839a832b26c2ad2b2a]]
Former-commit-id: 825aa0d5b2
Former-commit-id: a7d5db57d8
2014-10-10 10:59:16 -05:00
Nathan Bowler
544b2f9fbc Omaha #3595 Adding original, unmodified raobs scripts.
Change-Id: I466b5b89790bff9887022a35deda7c9f9871bc80

Former-commit-id: 4241eab8ac [formerly 104b47daa2 [formerly d6793fc17662a0ea0d5814524f4e641e1524ebde]]
Former-commit-id: 104b47daa2
Former-commit-id: 5e5256fca1
2014-10-10 11:33:07 -04:00
Nate Jensen
81aab98b59 Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e

Former-commit-id: b638e6e0f6 [formerly afb64bc4bb [formerly 4a5b66b00fbb53b4fcb4340366347ae4b08e6992]]
Former-commit-id: afb64bc4bb
Former-commit-id: 974113a995
2014-10-10 09:01:29 -05:00
Nate Jensen
5ca72c6d2a Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: ee51fe1977 [formerly 3cc3b38539 [formerly 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc]]
Former-commit-id: 3cc3b38539
Former-commit-id: d10d25e425
2014-10-09 18:30:33 -05:00
Nate Jensen
0e35dfff77 Merge "Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml." into omaha_14.4.1
Former-commit-id: 22fce26b0e [formerly 13f4746613 [formerly 7751e4e17ac543ba18abbd3ba7f2355c13c81d4e]]
Former-commit-id: 13f4746613
Former-commit-id: f70c9deacb
2014-10-09 15:32:38 -05:00
Mark Peters
94364ab115 Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27

Former-commit-id: 6bb4f5dbdf [formerly cf1bff0d02 [formerly 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea]]
Former-commit-id: cf1bff0d02
Former-commit-id: c20d19a2d3
2014-10-09 15:30:23 -05:00
Mark Peters
99b25a3031 Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513

Former-commit-id: 63069f5adc [formerly 087dabe3bb [formerly e0330ab61d027ee3b8512230b64000bb7f3d71f1]]
Former-commit-id: 087dabe3bb
Former-commit-id: 7f3eb45256
2014-10-09 11:17:53 -05:00
Richard Peter
fddf14712a Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 26e4c16da4 [formerly ed2bd7a261 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]]
Former-commit-id: ed2bd7a261
Former-commit-id: db0e85e501
2014-10-09 11:09:32 -05:00
Brian Clements
2112fb8e60 Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631

Former-commit-id: fbabf6f18d [formerly 119b2bff17 [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]]
Former-commit-id: 119b2bff17
Former-commit-id: 8d58b8d524
2014-10-09 11:04:49 -05:00
Nate Jensen
91ba36db75 Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 1a24808709 [formerly f6601e4ee1 [formerly 05a008ed69414e3977998cca45516a736181d5b6]]
Former-commit-id: f6601e4ee1
Former-commit-id: 550b269370
2014-10-09 09:38:27 -05:00
Nate Jensen
d36751c260 Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: 98518f4cb6 [formerly 0d33e661f2 [formerly 5ae10ba1a54ec5b20d1569d6c78c2762015c35de]]
Former-commit-id: 0d33e661f2
Former-commit-id: 87d33ff6ca
2014-10-09 09:02:36 -05:00
Brian Clements
abb6b1f258 Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818

Former-commit-id: f0921db20c [formerly 87964cb500 [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]
Former-commit-id: 87964cb500
Former-commit-id: 1a6624d5d7
2014-10-09 08:38:45 -05:00
Brian Clements
84217692bf Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f

Former-commit-id: 577b3a5e11 [formerly 8a4cda892f [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]
Former-commit-id: 8a4cda892f
Former-commit-id: 4a824111ec
2014-10-08 16:47:10 -05:00
Robert Blum
da4f5de40f Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008

Former-commit-id: f8661bdb73 [formerly 9bef0b91f8 [formerly 8c609041f3cabc11588d282b0a91b514a569073a]]
Former-commit-id: 9bef0b91f8
Former-commit-id: caee4eba19
2014-10-08 13:05:23 -05:00
Ben Steffensmeier
9d233500c8 Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: b865762b4f [formerly b7c0eb89ad [formerly e0ec387c62e64a19a4d598578f18ee17686f312a]]
Former-commit-id: b7c0eb89ad
Former-commit-id: 314014503f
2014-10-08 12:21:03 -05:00
Richard Peter
a4fd6b8a09 Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: fa15d4ff21 [formerly e8bc97501b [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]
Former-commit-id: e8bc97501b
Former-commit-id: 04bf8666b3
2014-10-08 12:02:17 -05:00
Nate Jensen
5886518b3b Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 5cf1821a6a [formerly 4e582d0bde [formerly 87f49d9bcc07d2178a535fc934d02cab36063894]]
Former-commit-id: 4e582d0bde
Former-commit-id: 2502976504
2014-10-08 11:36:44 -05:00
Nate Jensen
460a7e917f Merge "Omaha #3594 Update profiler script to use DAF." into omaha_14.4.1
Former-commit-id: ea23c651a1 [formerly aa9567ccbe [formerly 617994f10079a9b905f37c1bf1c1b83e6a210e61]]
Former-commit-id: aa9567ccbe
Former-commit-id: f2db612cd3
2014-10-07 17:18:51 -05:00
Richard Peter
8ffa01471a Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

Former-commit-id: a9562d992c [formerly a4bfd2d28b [formerly 110499cec453532545431a6fa05057f47af66ed2]]
Former-commit-id: a4bfd2d28b
Former-commit-id: f5dd25c8e4
2014-10-07 16:32:48 -05:00
Richard Peter
1038af1901 Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: 1bc24c3be2 [formerly 1adac05f5a [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]
Former-commit-id: 1adac05f5a
Former-commit-id: ee86734625
2014-10-07 15:13:11 -05:00
Nathan Bowler
1c7dbefc31 Omaha #3594 Update profiler script to use DAF.
Change-Id: Id0553c1c8745ae4371776fcdb4ec610f8f142ab0

Former-commit-id: e7f86f19c1 [formerly 1fd0ece81a [formerly 3c55fd78ca42a04ee0b0a9bbb88034c83f30e583]]
Former-commit-id: 1fd0ece81a
Former-commit-id: 8e3ef542bf
2014-10-07 15:23:38 -04:00
Nate Jensen
92caee5227 Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: 6d0d6c2a96 [formerly 70521e80f8 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]]
Former-commit-id: 70521e80f8
Former-commit-id: 0bfc7514a4
2014-10-07 13:54:08 -05:00
Nate Jensen
056dbe465d Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: 726eea342f [formerly 11f460f876 [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]]
Former-commit-id: 11f460f876
Former-commit-id: affc326eb7
2014-10-07 13:53:43 -05:00
Nate Jensen
3e4434f708 Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: b0f025c0df [formerly c066e8264d [formerly 60155e8f96ba20204c6049206ef35a840f64a767]]
Former-commit-id: c066e8264d
Former-commit-id: e63de52465
2014-10-07 13:53:33 -05:00
Nate Jensen
860f584065 Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 09cf5de2dd [formerly 1e16abcfcd [formerly 747f8fc91e2ff977724f634b6e610c96150cb4ad]]
Former-commit-id: 1e16abcfcd
Former-commit-id: e3a1adb7f2
2014-10-07 13:52:36 -05:00
Nathan Bowler
bcc339a859 Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9

Former-commit-id: b84fee6aed [formerly ab2e0edb82 [formerly e57506f274da8a2d917c6cf061e789e50993b5c3]]
Former-commit-id: ab2e0edb82
Former-commit-id: adecc6efa4
2014-10-07 14:40:49 -04:00
Steve Harris
c0c1ce7700 Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: c9e37bf440 [formerly ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]
Former-commit-id: ad4393bea3
Former-commit-id: 39b2199cec
2014-10-07 13:35:58 -05:00
Brian Clements
0cd0db130c Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac

Former-commit-id: 42cefd3655 [formerly 66705190b5 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]]
Former-commit-id: 66705190b5
Former-commit-id: 48352e964d
2014-10-07 13:28:34 -05:00
Mark Peters
41a0fa9bfe Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e

Former-commit-id: 5ed537572a [formerly 3464751716 [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]
Former-commit-id: 3464751716
Former-commit-id: dc27d9252c
2014-10-07 11:42:44 -05:00
Brian Clements
caaf7f9723 Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407

Former-commit-id: ec37971eff [formerly 773619f741 [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]]
Former-commit-id: 773619f741
Former-commit-id: 2637d1b07f
2014-10-07 10:43:47 -05:00
Brian Clements
c0544fa109 Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701

Former-commit-id: 81c73519c2 [formerly f39ffcc63f [formerly a69773742e571a334ef1fd000ff8311805f9c737]]
Former-commit-id: f39ffcc63f
Former-commit-id: 090a787f8d
2014-10-07 08:37:47 -05:00
Ben Steffensmeier
d5888d403c Omaha #3702 register database plugin to fxa database.
Former-commit-id: 997bfd689d [formerly 6a2b2efb1a [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]]
Former-commit-id: 6a2b2efb1a
Former-commit-id: 3e0a99aed2
2014-10-06 20:00:19 -05:00
Roger Ferrel
50982e8160 Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: d4ef865375 [formerly dfbf07f377 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]
Former-commit-id: dfbf07f377
Former-commit-id: 2f8d5263b9
2014-10-06 15:34:30 -05:00
Steve Harris
53dc9657e2 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 39c5e9c314
Former-commit-id: 06a27b2d3c
2014-10-06 13:57:59 -05:00
Nate Jensen
054947764c Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: de8b9cf0b8 [formerly 87d80afd0b [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]]
Former-commit-id: 87d80afd0b
Former-commit-id: 71efead2db
2014-10-06 11:37:54 -05:00
Nate Jensen
40d5da5e50 Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: 05ae6c5d9b [formerly 28545083c5 [formerly ded3f476047f92d48891613e4c0b78d20858f1ff]]
Former-commit-id: 28545083c5
Former-commit-id: 24bf870977
2014-10-06 09:08:03 -05:00
Nate Jensen
f35c95de02 Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: 23c5ea21e4 [formerly baec32be20 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]
Former-commit-id: baec32be20
Former-commit-id: b544abb498
2014-10-06 09:07:38 -05:00
Richard Peter
1958d9fe38 Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9

Former-commit-id: b5f23b8b98 [formerly 5a0dc20480 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]]
Former-commit-id: 5a0dc20480
Former-commit-id: 2422c00fbd
2014-10-03 14:14:16 -05:00
Brian.Dyke
5da2026d2b Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 92762f46c7 [formerly f440da9c70 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]
Former-commit-id: f440da9c70
Former-commit-id: 85d83aefe0
2014-10-03 14:04:46 -04:00
Steve Harris
fa1fa76dd9 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	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/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]
Former-commit-id: da463c484e
Former-commit-id: f4b771ea72
2014-10-03 10:18:34 -05:00