Commit graph

7121 commits

Author SHA1 Message Date
Mark Peters
153cf12248 Omaha #3720 Remove dataURI from redbook plugin
Change-Id: Iaeef7a259a51840fa51e1256ed8dc1c5b3df3a49

Former-commit-id: 5d3c2eb58fce655b25bf4db2a2045e9007ca58f8
2014-10-14 17:13:23 -05:00
Nate Jensen
0105b3bacf Merge "Omaha #3708 fixed possible NPE in SiteConfigurationManager" into omaha_14.4.1
Former-commit-id: 876038997360dfef757f2864558de06e54fc8b45
2014-10-14 15:53:22 -05:00
Brian Clements
180696a594 Omaha #3708 fixed possible NPE in SiteConfigurationManager
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab

Former-commit-id: 21924a6b536409681073f65d769bef53db049102
2014-10-14 15:49:36 -05:00
Mark Peters
e7388847d6 Omaha #3722 Remove dataURI from taf plugin
Change-Id: I214772ee74989ab9f91423c2bad4ee7d58b3eba4

Former-commit-id: 3a0cc08b25395cb168c8344c00fb17fb016aae36
2014-10-14 11:13:03 -05:00
Brian Clements
3a12ab9bdf Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 84a91d7b11790d4a37abc9b0a5c2d64952321b52
2014-10-13 16:32:41 -05:00
Richard Peter
d2909b6e08 Merge "Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid" into omaha_14.4.1
Former-commit-id: a7b644d5e831bc38f0442efc16f681fd5ff317d7
2014-10-13 12:37:28 -05:00
Brian Clements
dfb43fda31 Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

Former-commit-id: 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78
2014-10-13 11:11:32 -05:00
Nate Jensen
b24faf99cd Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59

Former-commit-id: 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c
2014-10-13 09:34:22 -05:00
Nate Jensen
190a85c872 Merge "Omaha #3711 Allow configuration of how chat lines will display" into omaha_14.4.1
Former-commit-id: f36afc27474267133b414d13951c271c5217f4dd
2014-10-10 14:45:54 -05:00
Mark Peters
5d87f3d22d Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f

Former-commit-id: b929d424107b0a2495f4305fd2500e362cccce4e
2014-10-10 14:25:38 -05:00
Nathan Bowler
1df2418409 Omaha #3595 Register two more fields. Replace UEngine with DAF and properly call the script
Change-Id: I3dac64f0537877858f9cf0bbf9e394e0e56075ba

Former-commit-id: e1470cb4ce03b49ac85936760469a22786195a99
2014-10-10 13:20:04 -04:00
Nate Jensen
70561d721a Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1
Former-commit-id: bcc0d1c4f9516e90205d4c140ede99910d1af3b9
2014-10-10 11:47:32 -05:00
Richard Peter
e7fbc0c012 Merge "Omaha #3718 Restored data delivery subscription backup web page" into omaha_14.4.1
Former-commit-id: d3fa6c45ca179e5196af8078ae45ccb4a883804e
2014-10-10 11:13:12 -05:00
Nathan Bowler
36d77f1098 Omaha #3595 Fix sed call and man/sigw indices for proper comparison.
Change-Id: Iee0ce15d06e2c84ac8bb4f5a3cf82a3c237222d2

Former-commit-id: 97555449ae12eab272ef3307297b89145b97363b
2014-10-10 12:05:16 -04:00
Benjamin Phillippe
825aa0d5b2 Omaha #3718 Restored data delivery subscription backup web page
Change-Id: I87c40d3476068eef80cee8bdb47b41fa96539734

Former-commit-id: f7c7fe2f7b845563335559839a832b26c2ad2b2a
2014-10-10 10:59:16 -05:00
Nathan Bowler
104b47daa2 Omaha #3595 Adding original, unmodified raobs scripts.
Change-Id: I466b5b89790bff9887022a35deda7c9f9871bc80

Former-commit-id: d6793fc17662a0ea0d5814524f4e641e1524ebde
2014-10-10 11:33:07 -04:00
Nate Jensen
afb64bc4bb Omaha #3549 remove unnecessary @Column annotations from TextRecord
Change-Id: I5f36baf0c7b697782379bef0dd5c28d8cb60e77e

Former-commit-id: 4a5b66b00fbb53b4fcb4340366347ae4b08e6992
2014-10-10 09:01:29 -05:00
Nate Jensen
3cc3b38539 Merge "Omaha #3644 Remove dataURI from ccfp plugin" into omaha_14.4.1
Former-commit-id: 8a0cf09901a2ffec4b67bc1d993a4c545bffa8bc
2014-10-09 18:30:33 -05:00
Nate Jensen
13f4746613 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: 7751e4e17ac543ba18abbd3ba7f2355c13c81d4e
2014-10-09 15:32:38 -05:00
Mark Peters
cf1bff0d02 Omaha #3644 Remove dataURI from ccfp plugin
Change-Id: I35e2e9239e6059f64c444d173b0a745d889abc27

Former-commit-id: 3eaa3fa11068cbf6d1a58d4eb414f52f243bbaea
2014-10-09 15:30:23 -05:00
Mark Peters
087dabe3bb Omaha #3629 Fix null pointer exceptions from matchElement() replacements
Change-Id: I9fcf81c5179f099c1813f0fa1086c85bdcff4513

Former-commit-id: e0330ab61d027ee3b8512230b64000bb7f3d71f1
2014-10-09 11:17:53 -05:00
Richard Peter
ed2bd7a261 Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: 5977e37b7368487867aca1cfdd362943633f92eb
2014-10-09 11:09:32 -05:00
Brian Clements
119b2bff17 Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631

Former-commit-id: 6bc42c58541363bee9be1607b1bdf2aca6f5a000
2014-10-09 11:04:49 -05:00
Nate Jensen
f6601e4ee1 Merge "Omaha #3705 added collaboration public room search, bookmarking" into omaha_14.4.1
Former-commit-id: 05a008ed69414e3977998cca45516a736181d5b6
2014-10-09 09:38:27 -05:00
Nate Jensen
0d33e661f2 Merge "Omaha #3672 moved aviation advisory plugins to separate feature" into omaha_14.4.1
Former-commit-id: 5ae10ba1a54ec5b20d1569d6c78c2762015c35de
2014-10-09 09:02:36 -05:00
Brian Clements
87964cb500 Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818

Former-commit-id: 919c816ba7af2082b9dcb0308128fa1b228475d2
2014-10-09 08:38:45 -05:00
Brian Clements
8a4cda892f Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f

Former-commit-id: 771e06df242b0fe7b4eec1e7c3099dfd316182ce
2014-10-08 16:47:10 -05:00
Robert Blum
9bef0b91f8 Omaha #3706 Adding auto-generated python files to gain region lookup functionality by using regions.xml.
Change-Id: Ifee9297729b814983634d438bff355f6eddb0008

Former-commit-id: 8c609041f3cabc11588d282b0a91b514a569073a
2014-10-08 13:05:23 -05:00
Ben Steffensmeier
b7c0eb89ad Omaha #3674 Fix a few viirs projection bugs.
Former-commit-id: e0ec387c62e64a19a4d598578f18ee17686f312a
2014-10-08 12:21:03 -05:00
Richard Peter
e8bc97501b Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: 157588d388b9033424ddc46a22d74ccc302eea85
2014-10-08 12:02:17 -05:00
Nate Jensen
4e582d0bde Merge "Omaha #3398 moved user and userid to core" into omaha_14.4.1
Former-commit-id: 87f49d9bcc07d2178a535fc934d02cab36063894
2014-10-08 11:36:44 -05:00
Nate Jensen
aa9567ccbe Merge "Omaha #3594 Update profiler script to use DAF." into omaha_14.4.1
Former-commit-id: 617994f10079a9b905f37c1bf1c1b83e6a210e61
2014-10-07 17:18:51 -05:00
Richard Peter
a4bfd2d28b Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

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

Former-commit-id: 3c55fd78ca42a04ee0b0a9bbb88034c83f30e583
2014-10-07 15:23:38 -04:00
Nate Jensen
70521e80f8 Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: a75ecea2121d1c030a7acb4ba50095a6d2769c01
2014-10-07 13:54:08 -05:00
Nate Jensen
11f460f876 Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: cdeea610953d82fe2b380341b3059b15b6ecd1ff
2014-10-07 13:53:43 -05:00
Nate Jensen
c066e8264d Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: 60155e8f96ba20204c6049206ef35a840f64a767
2014-10-07 13:53:33 -05:00
Nate Jensen
1e16abcfcd Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: 747f8fc91e2ff977724f634b6e610c96150cb4ad
2014-10-07 13:52:36 -05:00
Nathan Bowler
ab2e0edb82 Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9

Former-commit-id: e57506f274da8a2d917c6cf061e789e50993b5c3
2014-10-07 14:40:49 -04:00
Steve Harris
ad4393bea3 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: 6bb7a7312a22a9585d2f5981d873751879082cb1
2014-10-07 13:35:58 -05:00
Brian Clements
66705190b5 Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac

Former-commit-id: ccd1d646a175e6a2493def2fb3a22d7109e225a7
2014-10-07 13:28:34 -05:00
Mark Peters
3464751716 Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e

Former-commit-id: 5f22815ea1ca5a1fbd010f642afe6a83778f6f58
2014-10-07 11:42:44 -05:00
Brian Clements
773619f741 Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407

Former-commit-id: a758b7aff6b30194a3180fddffcefa5d019f2ee5
2014-10-07 10:43:47 -05:00
Brian Clements
f39ffcc63f Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701

Former-commit-id: a69773742e571a334ef1fd000ff8311805f9c737
2014-10-07 08:37:47 -05:00
Ben Steffensmeier
6a2b2efb1a Omaha #3702 register database plugin to fxa database.
Former-commit-id: 7fa6925c27330262dd0a70afcb77c589718cf1f7
2014-10-06 20:00:19 -05:00
Roger Ferrel
dfbf07f377 Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: be87967bf65bc07af5f89c13bf4cfd8eff9b4db6
2014-10-06 15:34:30 -05:00
Steve Harris
39c5e9c314 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
2014-10-06 13:57:59 -05:00
Nate Jensen
87d80afd0b Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 45140e7bd5ac2dcc51351d74dc87119aeac98f3b
2014-10-06 11:37:54 -05:00
Nate Jensen
28545083c5 Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: ded3f476047f92d48891613e4c0b78d20858f1ff
2014-10-06 09:08:03 -05:00