83680 2012-04-11 01:00:43 -0700 Web Inspector: fix category -> type refactoring implications. 2012-04-11 01:38:52 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 600118 0 pfeldman 2012-04-11 01:00:43 -0700 Couple of bugs squeezed in: catefory filter title and the style naming (was category name, now title name). 600125 1 136643 pfeldman 2012-04-11 01:20:36 -0700 Created attachment 136643 Patch 600129 2 136643 apavlov 2012-04-11 01:25:49 -0700 Comment on attachment 136643 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136643&action=review Looks good. Make sure you have fixed all the occurrences. > Source/WebCore/ChangeLog:8 > + We are now using type identifiers (single) as opposed to category identifier (plurals) in the style. single -> singulars 600132 3 pfeldman 2012-04-11 01:38:52 -0700 Committed r113835: <http://trac.webkit.org/changeset/113835> 136643 2012-04-11 01:20:36 -0700 2012-04-11 01:34:29 -0700 Patch bug-83680-20120411122034.patch text/plain 22604 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzODMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWU2OTY4OGYzM2IyZGQ4 MzNkZWYxNzIwNzU5MzU5ZTQ3MDhlYWQ3Ny4uMWQ5Y2NlM2JjNmIwY2RlZGQ3ZGM3ZDgzZjUyNTNl YTAzZjJmOWNhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYzIEBACisyMDEyLTA0LTExICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGZpeCBjYXRlZ29yeSAtPiB0eXBlIHJlZmFjdG9yaW5nIGltcGxpY2F0aW9ucy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzNjgwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgYXJlIG5vdyB1c2lu ZyB0eXBlIGlkZW50aWZpZXJzIChzaW5nbGUpIGFzIG9wcG9zZWQgdG8gY2F0ZWdvcnkgaWRlbnRp ZmllciAocGx1cmFscykgaW4gdGhlIHN0eWxlLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1Zp ZXcucHJvdG90eXBlLl9jcmVhdGVGaWx0ZXJTdGF0dXNCYXJJdGVtcy5jcmVhdGVGaWx0ZXJFbGVt ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUuX2Ny ZWF0ZUZpbHRlclN0YXR1c0Jhckl0ZW1zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3Jr TG9nVmlldy5wcm90b3R5cGUuX3Nob3dDYXRlZ29yeSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlLl9oaWRlQ2F0ZWdvcnkpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZS5fZmlsdGVyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZS5yZWZyZXNoUmVzb3VyY2UpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBlLnJlZnJl c2hHcmFwaCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVudCk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrTG9nVmlldy5jc3M6CisgICAgICAgICgubmV0 d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQgLm5ldHdvcmstdHlwZS1zY3JpcHQgLmljb24pOgorICAg ICAgICAoLm5ldHdvcmstbG9nLWdyaWQuZGF0YS1ncmlkLnNtYWxsIC5uZXR3b3JrLXR5cGUtc2Ny aXB0IC5pY29uKToKKyAgICAgICAgKC5uZXR3b3JrLWxvZy1ncmlkLmRhdGEtZ3JpZCAubmV0d29y ay10eXBlLWRvY3VtZW50IC5pY29uKToKKyAgICAgICAgKC5uZXR3b3JrLWxvZy1ncmlkLmRhdGEt Z3JpZC5zbWFsbCAubmV0d29yay10eXBlLWRvY3VtZW50IC5pY29uKToKKyAgICAgICAgKC5uZXR3 b3JrLWxvZy1ncmlkLmRhdGEtZ3JpZCAubmV0d29yay10eXBlLXN0eWxlc2hlZXQgLmljb24pOgor ICAgICAgICAoLm5ldHdvcmstbG9nLWdyaWQuZGF0YS1ncmlkLnNtYWxsIC5uZXR3b3JrLXR5cGUt c3R5bGVzaGVldCAuaWNvbik6CisgICAgICAgICgubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQg Lm5ldHdvcmstdHlwZS1pbWFnZSAuaWNvbik6CisgICAgICAgICgubmV0d29yay1sb2ctZ3JpZC5k YXRhLWdyaWQuc21hbGwgLm5ldHdvcmstdHlwZS1pbWFnZSAuaWNvbik6CisgICAgICAgICgubmV0 d29yay10eXBlLWRvY3VtZW50IC5uZXR3b3JrLWdyYXBoLWJhcik6CisgICAgICAgICgubmV0d29y ay10eXBlLWRvY3VtZW50LnJlc291cmNlLWNhY2hlZCAubmV0d29yay1ncmFwaC1iYXIpOgorICAg ICAgICAoLm5ldHdvcmstdHlwZS1zdHlsZXNoZWV0IC5uZXR3b3JrLWdyYXBoLWJhcik6CisgICAg ICAgICgubmV0d29yay10eXBlLXN0eWxlc2hlZXQucmVzb3VyY2UtY2FjaGVkIC5uZXR3b3JrLWdy YXBoLWJhcik6CisgICAgICAgICgubmV0d29yay10eXBlLWltYWdlIC5uZXR3b3JrLWdyYXBoLWJh cik6CisgICAgICAgICgubmV0d29yay10eXBlLWltYWdlLnJlc291cmNlLWNhY2hlZCAubmV0d29y ay1ncmFwaC1iYXIpOgorICAgICAgICAoLm5ldHdvcmstdHlwZS1mb250IC5uZXR3b3JrLWdyYXBo LWJhcik6CisgICAgICAgICgubmV0d29yay10eXBlLWZvbnQucmVzb3VyY2UtY2FjaGVkIC5uZXR3 b3JrLWdyYXBoLWJhcik6CisgICAgICAgICgubmV0d29yay10eXBlLXNjcmlwdCAubmV0d29yay1n cmFwaC1iYXIpOgorICAgICAgICAoLm5ldHdvcmstdHlwZS1zY3JpcHQucmVzb3VyY2UtY2FjaGVk IC5uZXR3b3JrLWdyYXBoLWJhcik6CisgICAgICAgICgubmV0d29yay10eXBlLXhociAubmV0d29y ay1ncmFwaC1iYXIpOgorICAgICAgICAoLm5ldHdvcmstdHlwZS14aHIucmVzb3VyY2UtY2FjaGVk IC5uZXR3b3JrLWdyYXBoLWJhcik6CisgICAgICAgICgubmV0d29yay10eXBlLXdlYnNvY2tldCAu bmV0d29yay1ncmFwaC1iYXIpOgorICAgICAgICAoLm5ldHdvcmstdHlwZS13ZWJzb2NrZXQucmVz b3VyY2UtY2FjaGVkIC5uZXR3b3JrLWdyYXBoLWJhcik6CisgICAgICAgICgubmV0d29yay1sb2ct Z3JpZC5kYXRhLWdyaWQuZmlsdGVyLW90aGVyIHRhYmxlLmRhdGEgdHIucmV2ZWFsZWQubmV0d29y ay10eXBlLW90aGVyKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3Jlc291cmNlc1Bh bmVsLmNzczoKKyAgICAgICAgKC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMt dHlwZS1pbWFnZSAuaWNvbik6CisgICAgICAgICgucmVzb3VyY2VzLXR5cGUtaW1hZ2UgLmltYWdl LXJlc291cmNlLWljb24tcHJldmlldyk6CisgICAgICAgICguY2hpbGRyZW4uc21hbGwgLnJlc291 cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy10eXBlLWltYWdlIC5pY29uKToKKyAgICAg ICAgKC5jaGlsZHJlbi5zbWFsbCAucmVzb3VyY2VzLXR5cGUtaW1hZ2UgLmltYWdlLXJlc291cmNl LWljb24tcHJldmlldyk6CisgICAgICAgICgucmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW0ucmVz b3VyY2VzLXR5cGUtZG9jdW1lbnQgLmljb24pOgorICAgICAgICAoLmNoaWxkcmVuLnNtYWxsIC5y ZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtdHlwZS1kb2N1bWVudCAuaWNvbik6 CisgICAgICAgICgucmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW0ucmVzb3VyY2VzLXR5cGUtc3R5 bGVzaGVldCAuaWNvbik6CisgICAgICAgICguY2hpbGRyZW4uc21hbGwgLnJlc291cmNlLXNpZGVi YXItdHJlZS1pdGVtLnJlc291cmNlcy10eXBlLXN0eWxlc2hlZXQgLmljb24pOgorICAgICAgICAo LnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy10eXBlLWZvbnQgLmljb24pOgor ICAgICAgICAoLmNoaWxkcmVuLnNtYWxsIC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNv dXJjZXMtdHlwZS1mb250IC5pY29uKToKKyAgICAgICAgKC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUt aXRlbS5yZXNvdXJjZXMtdHlwZS1zY3JpcHQgLmljb24pOgorICAgICAgICAoLmNoaWxkcmVuLnNt YWxsIC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtdHlwZS1zY3JpcHQgLmlj b24pOgorICAgICAgICAoLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy10eXBl LXhociAuaWNvbik6CisgICAgICAgICguY2hpbGRyZW4uc21hbGwgLnJlc291cmNlLXNpZGViYXIt dHJlZS1pdGVtLnJlc291cmNlcy10eXBlLXhociAuaWNvbik6CisKIDIwMTItMDQtMTEgIE5vZWwg R29yZG9uICA8bm9lbC5nb3Jkb25AZ21haWwuY29tPgogCiAgICAgICAgIFtHVEtdIEltYWdlQnVm ZmVyOiBDYW5vbmljYWwgbWltZVR5cGUgZm9yIGVuY29kaW5nIGltcGxpZXMgc3RhcnRzV2l0aCgn aW1hZ2UvJykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUGFuZWwuanMKaW5kZXggYzhkOGU5MzgxZTRiYjRmZmJiNDlmMjQ3M2Q4MmZmZjIzYTMzZmU4 Mi4uNWNkNDU3NjNhYmE4MThiN2ViZmZkNjI3YWZlZGZhMDIxYmY3NzRiMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTUx LDggKzUxLDYgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3ID0gZnVuY3Rpb24oKQogICAg IHRoaXMuX21hdGNoZWRSZXNvdXJjZXNNYXAgPSB7fTsKICAgICB0aGlzLl9jdXJyZW50TWF0Y2hl ZFJlc291cmNlSW5kZXggPSAtMTsKIAotICAgIHRoaXMuX2NhdGVnb3JpZXMgPSBXZWJJbnNwZWN0 b3IucmVzb3VyY2VUeXBlczsKLQogICAgIHRoaXMuX2NyZWF0ZVN0YXR1c2JhckJ1dHRvbnMoKTsK ICAgICB0aGlzLl9jcmVhdGVGaWx0ZXJTdGF0dXNCYXJJdGVtcygpOwogICAgIHRoaXMuX2xpbmtp ZmllciA9IFdlYkluc3BlY3Rvci5kZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmNyZWF0ZUxpbmtp ZmllcigpOwpAQCAtMzM2LDExICszMzQsMTUgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgICAgZmlsdGVyQmFyRWxlbWVudC5jbGFzc05hbWUgPSAic2Nv cGUtYmFyIHN0YXR1cy1iYXItaXRlbSI7CiAgICAgICAgIGZpbHRlckJhckVsZW1lbnQuaWQgPSAi bmV0d29yay1maWx0ZXIiOwogCi0gICAgICAgIGZ1bmN0aW9uIGNyZWF0ZUZpbHRlckVsZW1lbnQo Y2F0ZWdvcnksIGxhYmVsKQorICAgICAgICAvKioKKyAgICAgICAgICogQHBhcmFtIHtzdHJpbmd9 IHR5cGVOYW1lCisgICAgICAgICAqIEBwYXJhbSB7c3RyaW5nfSBsYWJlbAorICAgICAgICAgKi8K KyAgICAgICAgZnVuY3Rpb24gY3JlYXRlRmlsdGVyRWxlbWVudCh0eXBlTmFtZSwgbGFiZWwpCiAg ICAgICAgIHsKICAgICAgICAgICAgIHZhciBjYXRlZ29yeUVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJsaSIpOwotICAgICAgICAgICAgY2F0ZWdvcnlFbGVtZW50LmNhdGVnb3J5ID0g Y2F0ZWdvcnk7Ci0gICAgICAgICAgICBjYXRlZ29yeUVsZW1lbnQuY2xhc3NOYW1lID0gY2F0ZWdv cnk7CisgICAgICAgICAgICBjYXRlZ29yeUVsZW1lbnQudHlwZU5hbWUgPSB0eXBlTmFtZTsKKyAg ICAgICAgICAgIGNhdGVnb3J5RWxlbWVudC5jbGFzc05hbWUgPSB0eXBlTmFtZTsKICAgICAgICAg ICAgIGNhdGVnb3J5RWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShs YWJlbCkpOwogICAgICAgICAgICAgY2F0ZWdvcnlFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgdGhpcy5fdXBkYXRlRmlsdGVyLmJpbmQodGhpcyksIGZhbHNlKTsKICAgICAgICAgICAg IGZpbHRlckJhckVsZW1lbnQuYXBwZW5kQ2hpbGQoY2F0ZWdvcnlFbGVtZW50KTsKQEAgLTM1NSw4 ICszNTcsMTAgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgZGl2aWRlckVsZW1lbnQuYWRkU3R5bGVDbGFzcygic2NvcGUtYmFyLWRpdmlkZXIiKTsK ICAgICAgICAgZmlsdGVyQmFyRWxlbWVudC5hcHBlbmRDaGlsZChkaXZpZGVyRWxlbWVudCk7CiAK LSAgICAgICAgZm9yICh2YXIgY2F0ZWdvcnkgaW4gdGhpcy5fY2F0ZWdvcmllcykKLSAgICAgICAg ICAgIGNyZWF0ZUZpbHRlckVsZW1lbnQuY2FsbCh0aGlzLCBjYXRlZ29yeSwgdGhpcy5fY2F0ZWdv cmllc1tjYXRlZ29yeV0uY2F0ZWdvcnlUaXRsZSk7CisgICAgICAgIGZvciAodmFyIHR5cGVJZCBp biBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcykgeworICAgICAgICAgICAgdmFyIHR5cGUgPSBX ZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlc1t0eXBlSWRdOworICAgICAgICAgICAgY3JlYXRlRmls dGVyRWxlbWVudC5jYWxsKHRoaXMsIHR5cGUubmFtZSgpLCB0eXBlLmNhdGVnb3J5VGl0bGUoKSk7 CisgICAgICAgIH0KICAgICAgICAgdGhpcy5fZmlsdGVyQmFyRWxlbWVudCA9IGZpbHRlckJhckVs ZW1lbnQ7CiAgICAgfSwKIApAQCAtNDI1LDE2ICs0MjksMTYgQEAgV2ViSW5zcGVjdG9yLk5ldHdv cmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fc3VtbWFyeUJhckVsZW1lbnQu dGV4dENvbnRlbnQgPSB0ZXh0OwogICAgIH0sCiAKLSAgICBfc2hvd0NhdGVnb3J5OiBmdW5jdGlv bihjYXRlZ29yeSkKKyAgICBfc2hvd0NhdGVnb3J5OiBmdW5jdGlvbih0eXBlTmFtZSkKICAgICB7 Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiZmlsdGVyLSIg KyBjYXRlZ29yeSk7Ci0gICAgICAgIGRlbGV0ZSB0aGlzLl9oaWRkZW5DYXRlZ29yaWVzW2NhdGVn b3J5XTsKKyAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJmaWx0 ZXItIiArIHR5cGVOYW1lKTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2hpZGRlbkNhdGVnb3JpZXNb dHlwZU5hbWVdOwogICAgIH0sCiAKLSAgICBfaGlkZUNhdGVnb3J5OiBmdW5jdGlvbihjYXRlZ29y eSkKKyAgICBfaGlkZUNhdGVnb3J5OiBmdW5jdGlvbih0eXBlTmFtZSkKICAgICB7Ci0gICAgICAg IHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiZmlsdGVyLSIgKyBjYXRl Z29yeSk7Ci0gICAgICAgIHRoaXMuX2hpZGRlbkNhdGVnb3JpZXNbY2F0ZWdvcnldID0gdHJ1ZTsK KyAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJmaWx0ZXIt IiArIHR5cGVOYW1lKTsKKyAgICAgICAgdGhpcy5faGlkZGVuQ2F0ZWdvcmllc1t0eXBlTmFtZV0g PSB0cnVlOwogICAgIH0sCiAKICAgICBfdXBkYXRlRmlsdGVyOiBmdW5jdGlvbihlKQpAQCAtNDU4 LDE1ICs0NjIsMTUgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsK ICAgICAgICAgewogICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9maWx0ZXJC YXJFbGVtZW50LmNoaWxkTm9kZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgICAgICB2YXIg Y2hpbGQgPSB0aGlzLl9maWx0ZXJCYXJFbGVtZW50LmNoaWxkTm9kZXNbaV07Ci0gICAgICAgICAg ICAgICAgaWYgKCFjaGlsZC5jYXRlZ29yeSkKKyAgICAgICAgICAgICAgICBpZiAoIWNoaWxkLnR5 cGVOYW1lKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgICAg IGNoaWxkLnJlbW92ZVN0eWxlQ2xhc3MoInNlbGVjdGVkIik7Ci0gICAgICAgICAgICAgICAgdGhp cy5faGlkZUNhdGVnb3J5KGNoaWxkLmNhdGVnb3J5KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9o aWRlQ2F0ZWdvcnkoY2hpbGQudHlwZU5hbWUpOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAK LSAgICAgICAgaWYgKHRhcmdldC5jYXRlZ29yeSA9PT0gdGhpcy5fZmlsdGVyQWxsRWxlbWVudCkg eworICAgICAgICBpZiAodGFyZ2V0ID09PSB0aGlzLl9maWx0ZXJBbGxFbGVtZW50KSB7CiAgICAg ICAgICAgICBpZiAodGFyZ2V0Lmhhc1N0eWxlQ2xhc3MoInNlbGVjdGVkIikpIHsKICAgICAgICAg ICAgICAgICAvLyBXZSBjYW4ndCB1bnNlbGVjdCBBbGwsIHNvIHdlIGJyZWFrIGVhcmx5IGhlcmUK ICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC00ODgsNyArNDkyLDcgQEAgV2ViSW5zcGVjdG9y Lk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHVuc2VsZWN0QWxsLmNh bGwodGhpcyk7CiAKICAgICAgICAgICAgIHRhcmdldC5hZGRTdHlsZUNsYXNzKCJzZWxlY3RlZCIp OwotICAgICAgICAgICAgdGhpcy5fc2hvd0NhdGVnb3J5KHRhcmdldC5jYXRlZ29yeSk7CisgICAg ICAgICAgICB0aGlzLl9zaG93Q2F0ZWdvcnkodGFyZ2V0LnR5cGVOYW1lKTsKICAgICAgICAgICAg IHRoaXMuX3VwZGF0ZU9mZnNjcmVlblJvd3MoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQpAQCAtNDk3LDEyICs1MDEsMTIgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgICAgIC8vIElmIHNlbGVjdE11bHRpcGxlIGlzIHR1cm5lZCBv biwgYW5kIHdlIHdlcmUgc2VsZWN0ZWQsIHdlIGp1c3QKICAgICAgICAgICAgIC8vIHdhbnQgdG8g dW5zZWxlY3Qgb3Vyc2VsdmVzLgogICAgICAgICAgICAgdGFyZ2V0LnJlbW92ZVN0eWxlQ2xhc3Mo InNlbGVjdGVkIik7Ci0gICAgICAgICAgICB0aGlzLl9oaWRlQ2F0ZWdvcnkodGFyZ2V0LmNhdGVn b3J5KTsKKyAgICAgICAgICAgIHRoaXMuX2hpZGVDYXRlZ29yeSh0YXJnZXQudHlwZU5hbWUpOwog ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gSWYgc2VsZWN0TXVsdGlwbGUgaXMgdHVy bmVkIG9uLCBhbmQgd2Ugd2VyZW4ndCBzZWxlY3RlZCwgd2UganVzdAogICAgICAgICAgICAgLy8g d2FudCB0byBzZWxlY3Qgb3Vyc2VsdmVzLgogICAgICAgICAgICAgdGFyZ2V0LmFkZFN0eWxlQ2xh c3MoInNlbGVjdGVkIik7Ci0gICAgICAgICAgICB0aGlzLl9zaG93Q2F0ZWdvcnkodGFyZ2V0LmNh dGVnb3J5KTsKKyAgICAgICAgICAgIHRoaXMuX3Nob3dDYXRlZ29yeSh0YXJnZXQudHlwZU5hbWUp OwogICAgICAgICB9CiAgICAgICAgIHRoaXMuX3VwZGF0ZU9mZnNjcmVlblJvd3MoKTsKICAgICB9 LApAQCAtMTgwOSw5ICsxODEzLDkgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUu cHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fZ3JhcGhFbGVtZW50LmFkZFN0eWxlQ2xh c3MoInJlc291cmNlLWNhY2hlZCIpOwogCiAgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkU3R5bGVD bGFzcygibmV0d29yay1pdGVtIik7Ci0gICAgICAgIGlmICghdGhpcy5fZWxlbWVudC5oYXNTdHls ZUNsYXNzKCJuZXR3b3JrLWNhdGVnb3J5LSIgKyB0aGlzLl9yZXNvdXJjZS50eXBlLm5hbWUoKSkp IHsKLSAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQucmVtb3ZlTWF0Y2hpbmdTdHlsZUNsYXNzZXMo Im5ldHdvcmstY2F0ZWdvcnktXFx3KyIpOwotICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRT dHlsZUNsYXNzKCJuZXR3b3JrLWNhdGVnb3J5LSIgKyB0aGlzLl9yZXNvdXJjZS50eXBlLm5hbWUo KSk7CisgICAgICAgIGlmICghdGhpcy5fZWxlbWVudC5oYXNTdHlsZUNsYXNzKCJuZXR3b3JrLXR5 cGUtIiArIHRoaXMuX3Jlc291cmNlLnR5cGUubmFtZSgpKSkgeworICAgICAgICAgICAgdGhpcy5f ZWxlbWVudC5yZW1vdmVNYXRjaGluZ1N0eWxlQ2xhc3NlcygibmV0d29yay10eXBlLVxcdysiKTsK KyAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkU3R5bGVDbGFzcygibmV0d29yay10eXBlLSIg KyB0aGlzLl9yZXNvdXJjZS50eXBlLm5hbWUoKSk7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC0x OTc3LDkgKzE5ODEsOSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5 cGUgPSB7CiAKICAgICAgICAgdGhpcy5fYmFyQXJlYUVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygi aGlkZGVuIik7CiAKLSAgICAgICAgaWYgKCF0aGlzLl9ncmFwaEVsZW1lbnQuaGFzU3R5bGVDbGFz cygibmV0d29yay1jYXRlZ29yeS0iICsgdGhpcy5fcmVzb3VyY2UudHlwZS5uYW1lKCkpKSB7Ci0g ICAgICAgICAgICB0aGlzLl9ncmFwaEVsZW1lbnQucmVtb3ZlTWF0Y2hpbmdTdHlsZUNsYXNzZXMo Im5ldHdvcmstY2F0ZWdvcnktXFx3KyIpOwotICAgICAgICAgICAgdGhpcy5fZ3JhcGhFbGVtZW50 LmFkZFN0eWxlQ2xhc3MoIm5ldHdvcmstY2F0ZWdvcnktIiArIHRoaXMuX3Jlc291cmNlLnR5cGUu bmFtZSgpKTsKKyAgICAgICAgaWYgKCF0aGlzLl9ncmFwaEVsZW1lbnQuaGFzU3R5bGVDbGFzcygi bmV0d29yay10eXBlLSIgKyB0aGlzLl9yZXNvdXJjZS50eXBlLm5hbWUoKSkpIHsKKyAgICAgICAg ICAgIHRoaXMuX2dyYXBoRWxlbWVudC5yZW1vdmVNYXRjaGluZ1N0eWxlQ2xhc3NlcygibmV0d29y ay10eXBlLVxcdysiKTsKKyAgICAgICAgICAgIHRoaXMuX2dyYXBoRWxlbWVudC5hZGRTdHlsZUNs YXNzKCJuZXR3b3JrLXR5cGUtIiArIHRoaXMuX3Jlc291cmNlLnR5cGUubmFtZSgpKTsKICAgICAg ICAgfQogCiAgICAgICAgIHRoaXMuX2JhckxlZnRFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJs ZWZ0IiwgcGVyY2VudGFnZXMuc3RhcnQgKyAiJSIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggYzIzNzU4MjI4N2Q0 MzNlOTVkMmZlY2YzOWMxMDQ1NzlhMjI4OTVhYy4uZmZmNzc4NWVmZjQ3Y2RiOTBkNTkzNWM4ODFk YTRiNmEyYjczMjE1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0xMTg5LDcgKzExODksNyBAQCBXZWJJbnNwZWN0 b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLkJh c2VTdG9yYWdlVHJlZQogICovCiBXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50 ID0gZnVuY3Rpb24oc3RvcmFnZVBhbmVsLCByZXNvdXJjZSkKIHsKLSAgICBXZWJJbnNwZWN0b3Iu QmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgcmVzb3VyY2Us IHJlc291cmNlLmRpc3BsYXlOYW1lLCBbInJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtIiwgInJl c291cmNlcy1jYXRlZ29yeS0iICsgcmVzb3VyY2UudHlwZS5uYW1lKCldKTsKKyAgICBXZWJJbnNw ZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgcmVz b3VyY2UsIHJlc291cmNlLmRpc3BsYXlOYW1lLCBbInJlc291cmNlLXNpZGViYXItdHJlZS1pdGVt IiwgInJlc291cmNlcy10eXBlLSIgKyByZXNvdXJjZS50eXBlLm5hbWUoKV0pOwogICAgIHRoaXMu X3Jlc291cmNlID0gcmVzb3VyY2U7CiAgICAgdGhpcy5fcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnRzLk1lc3NhZ2VBZGRlZCwgdGhpcy5fY29uc29s ZU1lc3NhZ2VBZGRlZCwgdGhpcyk7CiAgICAgdGhpcy5fcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnRzLk1lc3NhZ2VzQ2xlYXJlZCwgdGhpcy5fY29u c29sZU1lc3NhZ2VzQ2xlYXJlZCwgdGhpcyk7CkBAIC0yMDA2LDcgKzIwMDYsNyBAQCBXZWJJbnNw ZWN0b3IuQXBwbGljYXRpb25DYWNoZUZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3RvcgogV2ViSW5zcGVjdG9yLlJlc291cmNlUmV2aXNpb25UcmVlRWxlbWVu dCA9IGZ1bmN0aW9uKHN0b3JhZ2VQYW5lbCwgcmV2aXNpb24pCiB7CiAgICAgdmFyIHRpdGxlID0g cmV2aXNpb24udGltZXN0YW1wID8gcmV2aXNpb24udGltZXN0YW1wLnRvTG9jYWxlVGltZVN0cmlu ZygpIDogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIob3JpZ2luYWwpIik7Ci0gICAgV2ViSW5zcGVj dG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCBzdG9yYWdlUGFuZWwsIHJldmlz aW9uLCB0aXRsZSwgWyJyZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbSIsICJyZXNvdXJjZXMtY2F0 ZWdvcnktIiArIHJldmlzaW9uLnJlc291cmNlLnR5cGUubmFtZSgpXSk7CisgICAgV2ViSW5zcGVj dG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQuY2FsbCh0aGlzLCBzdG9yYWdlUGFuZWwsIHJldmlz aW9uLCB0aXRsZSwgWyJyZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbSIsICJyZXNvdXJjZXMtdHlw ZS0iICsgcmV2aXNpb24ucmVzb3VyY2UudHlwZS5uYW1lKCldKTsKICAgICBpZiAocmV2aXNpb24u dGltZXN0YW1wKQogICAgICAgICB0aGlzLnRvb2x0aXAgPSByZXZpc2lvbi50aW1lc3RhbXAudG9M b2NhbGVTdHJpbmcoKTsKICAgICB0aGlzLl9yZXZpc2lvbiA9IHJldmlzaW9uOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrTG9nVmlldy5jc3Mg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL25ldHdvcmtMb2dWaWV3LmNzcwpp bmRleCAyMDJlOGI0M2RmZjcyN2EwNjFmNTQ3YTIxZmJkNmMwZGVjZGQwNDBjLi44MjJlYzI2NjJl OWVhZTg3OTVlYzU0NGZkYTA3MDA5ODhkOWQxZjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL25ldHdvcmtMb2dWaWV3LmNzcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL25ldHdvcmtMb2dWaWV3LmNzcwpAQCAtMTU0LDM4ICsx NTQsMzggQEAKICAgICBjb250ZW50OiB1cmwoSW1hZ2VzL3Jlc291cmNlUGxhaW5JY29uU21hbGwu cG5nKTsKIH0KIAotLm5ldHdvcmstbG9nLWdyaWQuZGF0YS1ncmlkIC5uZXR3b3JrLWNhdGVnb3J5 LXNjcmlwdHMgLmljb24geworLm5ldHdvcmstbG9nLWdyaWQuZGF0YS1ncmlkIC5uZXR3b3JrLXR5 cGUtc2NyaXB0IC5pY29uIHsKICAgICBjb250ZW50OiB1cmwoSW1hZ2VzL3Jlc291cmNlSlNJY29u LnBuZyk7CiB9CiAKLS5uZXR3b3JrLWxvZy1ncmlkLmRhdGEtZ3JpZC5zbWFsbCAubmV0d29yay1j YXRlZ29yeS1zY3JpcHRzIC5pY29uIHsKKy5uZXR3b3JrLWxvZy1ncmlkLmRhdGEtZ3JpZC5zbWFs bCAubmV0d29yay10eXBlLXNjcmlwdCAuaWNvbiB7CiAgICAgY29udGVudDogdXJsKEltYWdlcy9y ZXNvdXJjZURvY3VtZW50SWNvblNtYWxsLnBuZyk7CiB9CiAKLS5uZXR3b3JrLWxvZy1ncmlkLmRh dGEtZ3JpZCAubmV0d29yay1jYXRlZ29yeS1kb2N1bWVudHMgLmljb24geworLm5ldHdvcmstbG9n LWdyaWQuZGF0YS1ncmlkIC5uZXR3b3JrLXR5cGUtZG9jdW1lbnQgLmljb24gewogICAgIGNvbnRl bnQ6IHVybChJbWFnZXMvcmVzb3VyY2VEb2N1bWVudEljb24ucG5nKTsKIH0KIAotLm5ldHdvcmst bG9nLWdyaWQuZGF0YS1ncmlkLnNtYWxsIC5uZXR3b3JrLWNhdGVnb3J5LWRvY3VtZW50cyAuaWNv biB7CisubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQuc21hbGwgLm5ldHdvcmstdHlwZS1kb2N1 bWVudCAuaWNvbiB7CiAgICAgY29udGVudDogdXJsKEltYWdlcy9yZXNvdXJjZURvY3VtZW50SWNv blNtYWxsLnBuZyk7CiB9CiAKLS5uZXR3b3JrLWxvZy1ncmlkLmRhdGEtZ3JpZCAubmV0d29yay1j YXRlZ29yeS1zdHlsZXNoZWV0cyAuaWNvbiB7CisubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQg Lm5ldHdvcmstdHlwZS1zdHlsZXNoZWV0IC5pY29uIHsKICAgICBjb250ZW50OiB1cmwoSW1hZ2Vz L3Jlc291cmNlQ1NTSWNvbi5wbmcpOwogfQogCi0ubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQu c21hbGwgLm5ldHdvcmstY2F0ZWdvcnktc3R5bGVzaGVldHMgLmljb24geworLm5ldHdvcmstbG9n LWdyaWQuZGF0YS1ncmlkLnNtYWxsIC5uZXR3b3JrLXR5cGUtc3R5bGVzaGVldCAuaWNvbiB7CiAg ICAgY29udGVudDogdXJsKEltYWdlcy9yZXNvdXJjZURvY3VtZW50SWNvblNtYWxsLnBuZyk7CiB9 CiAKLS5uZXR3b3JrLWxvZy1ncmlkLmRhdGEtZ3JpZCAubmV0d29yay1jYXRlZ29yeS1pbWFnZXMg Lmljb24geworLm5ldHdvcmstbG9nLWdyaWQuZGF0YS1ncmlkIC5uZXR3b3JrLXR5cGUtaW1hZ2Ug Lmljb24gewogICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiB1 cmwoSW1hZ2VzL3Jlc291cmNlUGxhaW5JY29uLnBuZyk7CiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6 IG5vLXJlcGVhdDsKICAgICBjb250ZW50OiAiIjsKIH0KIAotLm5ldHdvcmstbG9nLWdyaWQuZGF0 YS1ncmlkLnNtYWxsIC5uZXR3b3JrLWNhdGVnb3J5LWltYWdlcyAuaWNvbiB7CisubmV0d29yay1s b2ctZ3JpZC5kYXRhLWdyaWQuc21hbGwgLm5ldHdvcmstdHlwZS1pbWFnZSAuaWNvbiB7CiAgICAg YmFja2dyb3VuZC1pbWFnZTogdXJsKEltYWdlcy9yZXNvdXJjZVBsYWluSWNvblNtYWxsLnBuZyk7 CiAgICAgY29udGVudDogIiI7CiB9CkBAIC0zMjgsNTkgKzMyOCw1OSBAQAogICAgIC13ZWJraXQt Ym9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lSG9sbG93UGlsbEdyYXkucG5nKSA3IDcg NyA3OwogfQogCi0ubmV0d29yay1jYXRlZ29yeS1kb2N1bWVudHMgLm5ldHdvcmstZ3JhcGgtYmFy IHsKKy5uZXR3b3JrLXR5cGUtZG9jdW1lbnQgLm5ldHdvcmstZ3JhcGgtYmFyIHsKICAgICAtd2Vi a2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxCbHVlLnBuZykgNyA3IDcg NzsKIH0KIAotLm5ldHdvcmstY2F0ZWdvcnktZG9jdW1lbnRzLnJlc291cmNlLWNhY2hlZCAubmV0 d29yay1ncmFwaC1iYXIgeworLm5ldHdvcmstdHlwZS1kb2N1bWVudC5yZXNvdXJjZS1jYWNoZWQg Lm5ldHdvcmstZ3JhcGgtYmFyIHsKICAgICAtd2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdl cy90aW1lbGluZUhvbGxvd1BpbGxCbHVlLnBuZykgNyA3IDcgNzsKIH0KIAotLm5ldHdvcmstY2F0 ZWdvcnktc3R5bGVzaGVldHMgLm5ldHdvcmstZ3JhcGgtYmFyIHsKKy5uZXR3b3JrLXR5cGUtc3R5 bGVzaGVldCAubmV0d29yay1ncmFwaC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1 cmwoSW1hZ2VzL3RpbWVsaW5lUGlsbEdyZWVuLnBuZykgNyA3IDcgNzsKIH0KIAotLm5ldHdvcmst Y2F0ZWdvcnktc3R5bGVzaGVldHMucmVzb3VyY2UtY2FjaGVkIC5uZXR3b3JrLWdyYXBoLWJhciB7 CisubmV0d29yay10eXBlLXN0eWxlc2hlZXQucmVzb3VyY2UtY2FjaGVkIC5uZXR3b3JrLWdyYXBo LWJhciB7CiAgICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6IHVybChJbWFnZXMvdGltZWxpbmVIb2xs b3dQaWxsR3JlZW4ucG5nKSA3IDcgNyA3OwogfQogCi0ubmV0d29yay1jYXRlZ29yeS1pbWFnZXMg Lm5ldHdvcmstZ3JhcGgtYmFyIHsKKy5uZXR3b3JrLXR5cGUtaW1hZ2UgLm5ldHdvcmstZ3JhcGgt YmFyIHsKICAgICAtd2Via2l0LWJvcmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxQ dXJwbGUucG5nKSA2IDcgNiA3OwogfQogCi0ubmV0d29yay1jYXRlZ29yeS1pbWFnZXMucmVzb3Vy Y2UtY2FjaGVkIC5uZXR3b3JrLWdyYXBoLWJhciB7CisubmV0d29yay10eXBlLWltYWdlLnJlc291 cmNlLWNhY2hlZCAubmV0d29yay1ncmFwaC1iYXIgewogICAgIGJvcmRlci1pbWFnZTogdXJsKElt YWdlcy90aW1lbGluZUhvbGxvd1BpbGxQdXJwbGUucG5nKSA3IDcgNyA3OwogfQogCi0ubmV0d29y ay1jYXRlZ29yeS1mb250cyAubmV0d29yay1ncmFwaC1iYXIgeworLm5ldHdvcmstdHlwZS1mb250 IC5uZXR3b3JrLWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6IHVybChJbWFn ZXMvdGltZWxpbmVQaWxsUmVkLnBuZykgNyA3IDcgNzsKIH0KIAotLm5ldHdvcmstY2F0ZWdvcnkt Zm9udHMucmVzb3VyY2UtY2FjaGVkIC5uZXR3b3JrLWdyYXBoLWJhciB7CisubmV0d29yay10eXBl LWZvbnQucmVzb3VyY2UtY2FjaGVkIC5uZXR3b3JrLWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1i b3JkZXItaW1hZ2U6IHVybChJbWFnZXMvdGltZWxpbmVIb2xsb3dQaWxsUmVkLnBuZykgNyA3IDcg NzsKIH0KIAotLm5ldHdvcmstY2F0ZWdvcnktc2NyaXB0cyAubmV0d29yay1ncmFwaC1iYXIgewor Lm5ldHdvcmstdHlwZS1zY3JpcHQgLm5ldHdvcmstZ3JhcGgtYmFyIHsKICAgICAtd2Via2l0LWJv cmRlci1pbWFnZTogdXJsKEltYWdlcy90aW1lbGluZVBpbGxPcmFuZ2UucG5nKSA3IDcgNyA3Owog fQogCi0ubmV0d29yay1jYXRlZ29yeS1zY3JpcHRzLnJlc291cmNlLWNhY2hlZCAubmV0d29yay1n cmFwaC1iYXIgeworLm5ldHdvcmstdHlwZS1zY3JpcHQucmVzb3VyY2UtY2FjaGVkIC5uZXR3b3Jr LWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1ib3JkZXItaW1hZ2U6IHVybChJbWFnZXMvdGltZWxp bmVIb2xsb3dQaWxsT3JhbmdlLnBuZykgNyA3IDcgNzsKIH0KIAotLm5ldHdvcmstY2F0ZWdvcnkt eGhyIC5uZXR3b3JrLWdyYXBoLWJhciB7CisubmV0d29yay10eXBlLXhociAubmV0d29yay1ncmFw aC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5lUGls bFllbGxvdy5wbmcpIDcgNyA3IDc7CiB9CiAKLS5uZXR3b3JrLWNhdGVnb3J5LXhoci5yZXNvdXJj ZS1jYWNoZWQgLm5ldHdvcmstZ3JhcGgtYmFyIHsKKy5uZXR3b3JrLXR5cGUteGhyLnJlc291cmNl LWNhY2hlZCAubmV0d29yay1ncmFwaC1iYXIgewogICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1 cmwoSW1hZ2VzL3RpbWVsaW5lSG9sbG93UGlsbFllbGxvdy5wbmcpIDcgNyA3IDc7CiB9CiAKLS5u ZXR3b3JrLWNhdGVnb3J5LXdlYnNvY2tldHMgLm5ldHdvcmstZ3JhcGgtYmFyIHsKKy5uZXR3b3Jr LXR5cGUtd2Vic29ja2V0IC5uZXR3b3JrLWdyYXBoLWJhciB7CiAgICAgLXdlYmtpdC1ib3JkZXIt aW1hZ2U6IHVybChJbWFnZXMvdGltZWxpbmVQaWxsR3JheS5wbmcpIDcgNyA3IDc7CiB9CiAKLS5u ZXR3b3JrLWNhdGVnb3J5LXdlYnNvY2tldHMucmVzb3VyY2UtY2FjaGVkIC5uZXR3b3JrLWdyYXBo LWJhciB7CisubmV0d29yay10eXBlLXdlYnNvY2tldC5yZXNvdXJjZS1jYWNoZWQgLm5ldHdvcmst Z3JhcGgtYmFyIHsKICAgIC13ZWJraXQtYm9yZGVyLWltYWdlOiB1cmwoSW1hZ2VzL3RpbWVsaW5l SG9sbG93UGlsbEdyYXkucG5nKSA3IDcgNyA3OwogfQogCkBAIC00NzQsMTQgKzQ3NCwxNCBAQAog fQogCiAubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQuZmlsdGVyLWFsbCB0YWJsZS5kYXRhIHRy LnJldmVhbGVkLm5ldHdvcmstaXRlbSwKLS5uZXR3b3JrLWxvZy1ncmlkLmRhdGEtZ3JpZC5maWx0 ZXItZG9jdW1lbnRzIHRhYmxlLmRhdGEgdHIucmV2ZWFsZWQubmV0d29yay1jYXRlZ29yeS1kb2N1 bWVudHMsCi0ubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQuZmlsdGVyLXN0eWxlc2hlZXRzIHRh YmxlLmRhdGEgdHIucmV2ZWFsZWQubmV0d29yay1jYXRlZ29yeS1zdHlsZXNoZWV0cywKLS5uZXR3 b3JrLWxvZy1ncmlkLmRhdGEtZ3JpZC5maWx0ZXItaW1hZ2VzIHRhYmxlLmRhdGEgdHIucmV2ZWFs ZWQubmV0d29yay1jYXRlZ29yeS1pbWFnZXMsCi0ubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQu ZmlsdGVyLXNjcmlwdHMgdGFibGUuZGF0YSB0ci5yZXZlYWxlZC5uZXR3b3JrLWNhdGVnb3J5LXNj cmlwdHMsCi0ubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQuZmlsdGVyLXhociB0YWJsZS5kYXRh IHRyLnJldmVhbGVkLm5ldHdvcmstY2F0ZWdvcnkteGhyLAotLm5ldHdvcmstbG9nLWdyaWQuZGF0 YS1ncmlkLmZpbHRlci1mb250cyB0YWJsZS5kYXRhIHRyLnJldmVhbGVkLm5ldHdvcmstY2F0ZWdv cnktZm9udHMsCi0ubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQuZmlsdGVyLXdlYnNvY2tldHMg dGFibGUuZGF0YSB0ci5yZXZlYWxlZC5uZXR3b3JrLWNhdGVnb3J5LXdlYnNvY2tldHMsCi0ubmV0 d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQuZmlsdGVyLW90aGVyIHRhYmxlLmRhdGEgdHIucmV2ZWFs ZWQubmV0d29yay1jYXRlZ29yeS1vdGhlciB7CisubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQu ZmlsdGVyLWRvY3VtZW50IHRhYmxlLmRhdGEgdHIucmV2ZWFsZWQubmV0d29yay10eXBlLWRvY3Vt ZW50LAorLm5ldHdvcmstbG9nLWdyaWQuZGF0YS1ncmlkLmZpbHRlci1zdHlsZXNoZWV0IHRhYmxl LmRhdGEgdHIucmV2ZWFsZWQubmV0d29yay10eXBlLXN0eWxlc2hlZXQsCisubmV0d29yay1sb2ct Z3JpZC5kYXRhLWdyaWQuZmlsdGVyLWltYWdlIHRhYmxlLmRhdGEgdHIucmV2ZWFsZWQubmV0d29y ay10eXBlLWltYWdlLAorLm5ldHdvcmstbG9nLWdyaWQuZGF0YS1ncmlkLmZpbHRlci1zY3JpcHQg dGFibGUuZGF0YSB0ci5yZXZlYWxlZC5uZXR3b3JrLXR5cGUtc2NyaXB0LAorLm5ldHdvcmstbG9n LWdyaWQuZGF0YS1ncmlkLmZpbHRlci14aHIgdGFibGUuZGF0YSB0ci5yZXZlYWxlZC5uZXR3b3Jr LXR5cGUteGhyLAorLm5ldHdvcmstbG9nLWdyaWQuZGF0YS1ncmlkLmZpbHRlci1mb250IHRhYmxl LmRhdGEgdHIucmV2ZWFsZWQubmV0d29yay10eXBlLWZvbnQsCisubmV0d29yay1sb2ctZ3JpZC5k YXRhLWdyaWQuZmlsdGVyLXdlYnNvY2tldCB0YWJsZS5kYXRhIHRyLnJldmVhbGVkLm5ldHdvcmst dHlwZS13ZWJzb2NrZXQsCisubmV0d29yay1sb2ctZ3JpZC5kYXRhLWdyaWQuZmlsdGVyLW90aGVy IHRhYmxlLmRhdGEgdHIucmV2ZWFsZWQubmV0d29yay10eXBlLW90aGVyIHsKICAgICBkaXNwbGF5 OiB0YWJsZS1yb3c7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvcmVzb3VyY2VzUGFuZWwuY3NzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9yZXNvdXJjZXNQYW5lbC5jc3MKaW5kZXggYTJiM2FkM2I1YmY0NDI3MzVjYWY2Zjg5 YmYyNjQwZDE0ODZiYzMxNi4uNGQ2Y2EyYjEyOWQ1M2Y2NTI0ZDViYmY2ZmRiZDA5YWMxMmFjMGJk NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9yZXNvdXJj ZXNQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9yZXNv dXJjZXNQYW5lbC5jc3MKQEAgLTIwMCwxNCArMjAwLDE0IEBAIGxpLnNlbGVjdGVkIC5iYXNlLXN0 b3JhZ2UtdHJlZS1lbGVtZW50LXN1YnRpdGxlIHsKICAgICBjb250ZW50OiB1cmwoSW1hZ2VzL3Jl c291cmNlUGxhaW5JY29uU21hbGwucG5nKTsKIH0KIAotLnJlc291cmNlLXNpZGViYXItdHJlZS1p dGVtLnJlc291cmNlcy1jYXRlZ29yeS1pbWFnZXMgLmljb24geworLnJlc291cmNlLXNpZGViYXIt dHJlZS1pdGVtLnJlc291cmNlcy10eXBlLWltYWdlIC5pY29uIHsKICAgICBwb3NpdGlvbjogcmVs YXRpdmU7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKEltYWdlcy9yZXNvdXJjZVBsYWluSWNv bi5wbmcpOwogICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7CiAgICAgY29udGVudDog IiI7CiB9CiAKLS5yZXNvdXJjZXMtY2F0ZWdvcnktaW1hZ2VzIC5pbWFnZS1yZXNvdXJjZS1pY29u LXByZXZpZXcgeworLnJlc291cmNlcy10eXBlLWltYWdlIC5pbWFnZS1yZXNvdXJjZS1pY29uLXBy ZXZpZXcgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICBtYXJnaW46IGF1dG87CiAgICAg dG9wOiAzcHg7CkBAIC0yMjAsMTIgKzIyMCwxMiBAQCBsaS5zZWxlY3RlZCAuYmFzZS1zdG9yYWdl LXRyZWUtZWxlbWVudC1zdWJ0aXRsZSB7CiAgICAgbWluLWhlaWdodDogMXB4OwogfQogCi0uY2hp bGRyZW4uc21hbGwgLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRlZ29y eS1pbWFnZXMgLmljb24geworLmNoaWxkcmVuLnNtYWxsIC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUt aXRlbS5yZXNvdXJjZXMtdHlwZS1pbWFnZSAuaWNvbiB7CiAgICAgYmFja2dyb3VuZC1pbWFnZTog dXJsKEltYWdlcy9yZXNvdXJjZVBsYWluSWNvblNtYWxsLnBuZyk7CiAgICAgY29udGVudDogIiI7 CiB9CiAKLS5jaGlsZHJlbi5zbWFsbCAucmVzb3VyY2VzLWNhdGVnb3J5LWltYWdlcyAuaW1hZ2Ut cmVzb3VyY2UtaWNvbi1wcmV2aWV3IHsKKy5jaGlsZHJlbi5zbWFsbCAucmVzb3VyY2VzLXR5cGUt aW1hZ2UgLmltYWdlLXJlc291cmNlLWljb24tcHJldmlldyB7CiAgICAgdG9wOiAycHg7CiAgICAg Ym90dG9tOiAxcHg7CiAgICAgbGVmdDogM3B4OwpAQCAtMjM0LDU1ICsyMzQsNTUgQEAgbGkuc2Vs ZWN0ZWQgLmJhc2Utc3RvcmFnZS10cmVlLWVsZW1lbnQtc3VidGl0bGUgewogICAgIG1heC1oZWln aHQ6IDExcHg7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtY2F0 ZWdvcnktZG9jdW1lbnRzIC5pY29uIHsKKy5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNv dXJjZXMtdHlwZS1kb2N1bWVudCAuaWNvbiB7CiAgICAgY29udGVudDogdXJsKEltYWdlcy9yZXNv dXJjZURvY3VtZW50SWNvbi5wbmcpOwogfQogCi0uY2hpbGRyZW4uc21hbGwgLnJlc291cmNlLXNp ZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRlZ29yeS1kb2N1bWVudHMgLmljb24geworLmNo aWxkcmVuLnNtYWxsIC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtdHlwZS1k b2N1bWVudCAuaWNvbiB7CiAgICAgY29udGVudDogdXJsKEltYWdlcy9yZXNvdXJjZURvY3VtZW50 SWNvblNtYWxsLnBuZyk7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJj ZXMtY2F0ZWdvcnktc3R5bGVzaGVldHMgLmljb24geworLnJlc291cmNlLXNpZGViYXItdHJlZS1p dGVtLnJlc291cmNlcy10eXBlLXN0eWxlc2hlZXQgLmljb24gewogICAgIGNvbnRlbnQ6IHVybChJ bWFnZXMvcmVzb3VyY2VDU1NJY29uLnBuZyk7CiB9CiAKLS5jaGlsZHJlbi5zbWFsbCAucmVzb3Vy Y2Utc2lkZWJhci10cmVlLWl0ZW0ucmVzb3VyY2VzLWNhdGVnb3J5LXN0eWxlc2hlZXRzIC5pY29u IHsKKy5jaGlsZHJlbi5zbWFsbCAucmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW0ucmVzb3VyY2Vz LXR5cGUtc3R5bGVzaGVldCAuaWNvbiB7CiAgICAgY29udGVudDogdXJsKEltYWdlcy9yZXNvdXJj ZURvY3VtZW50SWNvblNtYWxsLnBuZyk7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRl bS5yZXNvdXJjZXMtY2F0ZWdvcnktaW1hZ2VzIC5pY29uIHsKKy5yZXNvdXJjZS1zaWRlYmFyLXRy ZWUtaXRlbS5yZXNvdXJjZXMtdHlwZS1pbWFnZSAuaWNvbiB7CiAgICAgcG9zaXRpb246IHJlbGF0 aXZlOwogICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybChJbWFnZXMvcmVzb3VyY2VQbGFpbkljb24u cG5nKTsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwogICAgIGNvbnRlbnQ6ICIi OwogfQogCi0uY2hpbGRyZW4uc21hbGwgLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291 cmNlcy1jYXRlZ29yeS1pbWFnZXMgLmljb24geworLmNoaWxkcmVuLnNtYWxsIC5yZXNvdXJjZS1z aWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtdHlwZS1pbWFnZSAuaWNvbiB7CiAgICAgYmFja2dy b3VuZC1pbWFnZTogdXJsKEltYWdlcy9yZXNvdXJjZVBsYWluSWNvblNtYWxsLnBuZyk7CiAgICAg Y29udGVudDogIiI7CiB9CiAKLS5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMt Y2F0ZWdvcnktZm9udHMgLmljb24geworLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291 cmNlcy10eXBlLWZvbnQgLmljb24gewogICAgIGNvbnRlbnQ6IHVybChJbWFnZXMvcmVzb3VyY2VQ bGFpbkljb24ucG5nKTsKIH0KIAotLmNoaWxkcmVuLnNtYWxsIC5yZXNvdXJjZS1zaWRlYmFyLXRy ZWUtaXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnktZm9udHMgLmljb24geworLmNoaWxkcmVuLnNtYWxs IC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtdHlwZS1mb250IC5pY29uIHsK ICAgICBjb250ZW50OiB1cmwoSW1hZ2VzL3Jlc291cmNlUGxhaW5JY29uU21hbGwucG5nKTsKIH0K IAotLnJlc291cmNlLXNpZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy1jYXRlZ29yeS1zY3JpcHRz IC5pY29uIHsKKy5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtdHlwZS1zY3Jp cHQgLmljb24gewogICAgIGNvbnRlbnQ6IHVybChJbWFnZXMvcmVzb3VyY2VKU0ljb24ucG5nKTsK IH0KIAotLmNoaWxkcmVuLnNtYWxsIC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJj ZXMtY2F0ZWdvcnktc2NyaXB0cyAuaWNvbiB7CisuY2hpbGRyZW4uc21hbGwgLnJlc291cmNlLXNp ZGViYXItdHJlZS1pdGVtLnJlc291cmNlcy10eXBlLXNjcmlwdCAuaWNvbiB7CiAgICAgY29udGVu dDogdXJsKEltYWdlcy9yZXNvdXJjZURvY3VtZW50SWNvblNtYWxsLnBuZyk7CiB9CiAKLS5yZXNv dXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnkteGhyIC5pY29uIHsKKy5y ZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtdHlwZS14aHIgLmljb24gewogICAg IGNvbnRlbnQ6IHVybChJbWFnZXMvcmVzb3VyY2VQbGFpbkljb24ucG5nKTsKIH0KIAotLmNoaWxk cmVuLnNtYWxsIC5yZXNvdXJjZS1zaWRlYmFyLXRyZWUtaXRlbS5yZXNvdXJjZXMtY2F0ZWdvcnkt eGhyIC5pY29uIHsKKy5jaGlsZHJlbi5zbWFsbCAucmVzb3VyY2Utc2lkZWJhci10cmVlLWl0ZW0u cmVzb3VyY2VzLXR5cGUteGhyIC5pY29uIHsKICAgICBjb250ZW50OiB1cmwoSW1hZ2VzL3Jlc291 cmNlRG9jdW1lbnRJY29uU21hbGwucG5nKTsKIH0KIAo=