Commit graph

27 commits

Author SHA1 Message Date
Brian.Dyke
a08db8d73d 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 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
2014-08-27 11:19:19 -04:00
Nate Jensen
6907c5a1cf Issue #3524 ensure apache httpclient always sends credentials with https
requests

Change-Id: Ia3fef0d2236167c8b48c0107848f7e8a925acc1c

Former-commit-id: 9ddde59743 [formerly 843a3b51f2fd90275149d0d814f280ed64247a2c]
Former-commit-id: 5bcddf1af1
2014-08-15 09:15:11 -05:00
Brian Clements
9d0b02e0a4 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]
Former-commit-id: ce24bd1018
2014-02-28 16:15:17 -06:00
Richard Peter
7bd6a07913 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 0e25ae35c1
2014-02-27 15:18:26 -06:00
Brian Clements
f0c89ef6c6 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]
Former-commit-id: f6b2827434
2014-02-18 10:03:12 -06:00
Nate Jensen
c28085118f Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]
Former-commit-id: 75ca70fba6
2014-02-10 16:48:29 -06:00
Benjamin Phillippe
178e073cf3 Issue #1538 Federated registry fixes/modifications
Change-Id: Iedc048fe42687bec17385f0aacf0af0141df2146

Former-commit-id: b10ecfa19c [formerly 05e0a84c1ef3d04256884b81219f643e8f38187d]
Former-commit-id: a96764e900
2013-08-28 11:41:06 -05:00
Richard Peter
bf99d8fd4d Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: 8ba840f1d9 [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]
Former-commit-id: 359ee5d1af
2013-07-26 14:36:46 -05:00
Steve Harris
12248cade1 Merge branch 'omaha_13.5.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: 532d41787b [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]
Former-commit-id: 43316cbff9
2013-06-17 15:29:01 -05:00
Dave Hladky
292a7a49dc Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03

Former-commit-id: 5512104d86 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]
Former-commit-id: 776bbbba21
2013-06-13 22:13:49 -05:00
Nate Jensen
f55b3cbdbe Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: 0f6d897ff3 [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]
Former-commit-id: c2faa0e3bf
2013-06-13 11:39:30 -05:00
Steve Harris
99f4569650 13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]
Former-commit-id: d33e5861aa
2013-05-02 10:00:38 -05:00
Steve Harris
f95e0ad10b 13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]
Former-commit-id: 2f517b7713
2013-04-24 17:15:55 -05:00
Mike Duff
ad08e0a6ac Issue #1786 - fix null pointer
Change-Id: Ie7bf3aa9afe6a8dcd9d288afc0e6dc537fdf043d

Former-commit-id: 7701902083 [formerly 6f14dfd04a696c71e2b2c9d12b86549287e7f0de]
Former-commit-id: 6b909c7902
2013-04-16 14:21:28 -05:00
Mike Duff
f584e17aa7 Issue #1786 - Initial checkin of https for thin client
Code review comments

Change-Id: I1fde9a276ecca44d87603be08a99232a5d7b441e

Former-commit-id: 0a33734e6f [formerly 6f206dad8ffbbd7b793b92b8a23bbce74a5b0017]
Former-commit-id: b9abbcdf37
2013-04-10 10:29:33 -05:00
Steve Harris
be96282207 13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
2013-03-25 13:27:13 -05:00
Steve Harris
48d1aa7732 13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]
Former-commit-id: 9771dfae6b
2013-01-23 11:13:03 -05:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Steve Harris
c2839cc86d 12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e4bd20a515
2012-11-07 12:41:20 -06:00
Steve Harris
362d6ffaca 12.11.1-5 baseline
Former-commit-id: a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]
Former-commit-id: 03f3f3c36a
2012-10-18 15:46:42 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
27871051e3 12.9.1-2 baseline
Former-commit-id: a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]
Former-commit-id: d1d877d319
2012-08-15 14:12:24 -05:00
Steve Harris
8309193ce9 12.9.1-1 baseline
Former-commit-id: 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 31ae7ea218
2012-08-15 13:59:00 -05:00
Steve Harris
2653ddc2e3 12.8.1-5 baseline
Former-commit-id: cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: fd2abfb6f1
2012-08-01 10:45:37 -05:00
Steve Harris
8552902906 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00